This is a partial model for models that describe the bi-directional
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/BaseClasses/powerLaw.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/BaseClasses/powerLaw.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/BaseClasses/powerLaw.mo" 2021-09-16 11:15:38.326780829 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/BaseClasses/powerLaw.mo" 2021-09-16 11:19:13.118064059 +0200
@@ -1,13 +1,13 @@
within Buildings.Airflow.Multizone.BaseClasses;
function powerLaw "Power law used in orifice equations"
input Real k "Flow coefficient, k = V_flow/ dp^m";
- input Modelica.SIunits.PressureDifference dp(displayUnit="Pa") "Pressure difference";
+ input Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") "Pressure difference";
input Real m(min=0.5, max=1)
"Flow exponent, m=0.5 for turbulent, m=1 for laminar";
- input Modelica.SIunits.PressureDifference dp_turbulent(min=0,
+ input Modelica.Units.SI.PressureDifference dp_turbulent(min=0,
displayUnit="Pa")=0.001
"Pressure difference where regularization starts";
- output Modelica.SIunits.VolumeFlowRate V_flow "Volume flow rate";
+ output Modelica.Units.SI.VolumeFlowRate V_flow "Volume flow rate";
protected
constant Real gamma(min=1) = 1.5
"Normalized flow rate where dphi(0)/dpi intersects phi(1)";
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/BaseClasses/powerLawFixedM.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/BaseClasses/powerLawFixedM.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/BaseClasses/powerLawFixedM.mo" 2021-09-16 11:15:38.326780829 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/BaseClasses/powerLawFixedM.mo" 2021-09-16 11:19:13.102064113 +0200
@@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/BaseClasses/windPressureLowRise.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/BaseClasses/windPressureLowRise.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/BaseClasses/windPressureLowRise.mo" 2021-09-16 11:15:38.326780829 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/BaseClasses/windPressureLowRise.mo" 2021-09-16 11:19:13.090064154 +0200
@@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/DoorDiscretizedOperable.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/DoorDiscretizedOperable.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/DoorDiscretizedOperable.mo" 2021-09-16 11:15:38.326780829 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/DoorDiscretizedOperable.mo" 2021-09-16 11:19:13.062064248 +0200
@@ -3,7 +3,7 @@
"Door model using discretization along height coordinate"
extends Buildings.Airflow.Multizone.BaseClasses.DoorDiscretized;
- parameter Modelica.SIunits.PressureDifference dpCloRat(min=0,
+ parameter Modelica.Units.SI.PressureDifference dpCloRat(min=0,
displayUnit="Pa") = 4
"Pressure drop at rating condition of closed door"
annotation (Dialog(group="Rating conditions"));
@@ -12,7 +12,7 @@
"Discharge coefficient at rating conditions of closed door"
annotation (Dialog(group="Rating conditions"));
- parameter Modelica.SIunits.Area LClo(min=0)
+ parameter Modelica.Units.SI.Area LClo(min=0)
"Effective leakage area of closed door"
annotation (Dialog(group="Closed door"));
@@ -30,8 +30,8 @@
"Opening signal, 0=closed, 1=open"
annotation (Placement(transformation(extent={{-120,-10},{-100,10}}), iconTransformation(extent={{-120,-10},{-100,10}})));
protected
- parameter Modelica.SIunits.Area AOpe=wOpe*hOpe "Open aperture area";
- parameter Modelica.SIunits.Area AClo(fixed=false) "Closed aperture area";
+ parameter Modelica.Units.SI.Area AOpe=wOpe*hOpe "Open aperture area";
+ parameter Modelica.Units.SI.Area AClo(fixed=false) "Closed aperture area";
Real kOpe "Open aperture flow coefficient, k = V_flow/ dp^m";
Real kClo "Closed aperture flow coefficient, k = V_flow/ dp^m";
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/EffectiveAirLeakageArea.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/EffectiveAirLeakageArea.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/EffectiveAirLeakageArea.mo" 2021-09-16 11:15:38.326780829 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/EffectiveAirLeakageArea.mo" 2021-09-16 11:19:13.042064316 +0200
@@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/Examples/ClosedDoors.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/Examples/ClosedDoors.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/Examples/ClosedDoors.mo" 2021-09-16 11:15:38.326780829 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/Examples/ClosedDoors.mo" 2021-09-16 11:19:12.970064559 +0200
@@ -27,7 +27,7 @@
annotation (Placement(transformation(extent={{40,40},{60,60}})));
Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow PrescribedHeatFlow1
annotation (Placement(transformation(extent={{4,40},{24,60}})));
- Modelica.Blocks.Sources.Sine Sine1(freqHz=1/3600) annotation (Placement(
+ Modelica.Blocks.Sources.Sine Sine1(f =1/3600) annotation (Placement(
transformation(extent={{-68,40},{-48,60}})));
Modelica.Blocks.Math.Gain Gain1(k=100) annotation (Placement(transformation(
extent={{-28,40},{-8,60}})));
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo" 2021-09-16 11:15:38.326780829 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo" 2021-09-16 11:19:12.766065246 +0200
@@ -21,7 +21,7 @@
annotation (Placement(transformation(extent={{70,20},{90,40}})));
Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow preHeaFlo
annotation (Placement(transformation(extent={{0,20},{20,40}})));
- Modelica.Blocks.Sources.Sine Sine1(freqHz=1/3600) annotation (Placement(
+ Modelica.Blocks.Sources.Sine Sine1(f =1/3600) annotation (Placement(
transformation(extent={{-80,20},{-60,40}})));
Modelica.Blocks.Math.Gain Gain1(k=100) annotation (Placement(transformation(
extent={{-40,20},{-20,40}})));
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/Examples/OneOpenDoor.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/Examples/OneOpenDoor.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/Examples/OneOpenDoor.mo" 2021-09-16 11:15:38.326780829 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/Examples/OneOpenDoor.mo" 2021-09-16 11:19:12.742065327 +0200
@@ -26,7 +26,7 @@
annotation (Placement(transformation(extent={{60,60},{80,80}})));
Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow preHeaFlo
annotation (Placement(transformation(extent={{14,60},{34,80}})));
- Modelica.Blocks.Sources.Sine heaSou(freqHz=1/3600) annotation (Placement(
+ Modelica.Blocks.Sources.Sine heaSou(f =1/3600) annotation (Placement(
transformation(extent={{-60,60},{-40,80}})));
Modelica.Blocks.Math.Gain Gain1(k=100) annotation (Placement(transformation(
extent={{-20,60},{0,80}})));
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/Examples/ZonalFlow.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/Examples/ZonalFlow.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/Examples/ZonalFlow.mo" 2021-09-16 11:15:38.326780829 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/Examples/ZonalFlow.mo" 2021-09-16 11:19:12.634065691 +0200
@@ -2,8 +2,8 @@
model ZonalFlow "Model with prescribed air exchange between two volumes"
extends Modelica.Icons.Example;
package Medium = Buildings.Media.Air;
- parameter Modelica.SIunits.Volume volA=100 "Volume of room A";
- parameter Modelica.SIunits.Volume volB=1 "Volume of room B";
+ parameter Modelica.Units.SI.Volume volA=100 "Volume of room A";
+ parameter Modelica.Units.SI.Volume volB=1 "Volume of room B";
Buildings.Fluid.MixingVolumes.MixingVolume rooA(
V=volA,
redeclare package Medium = Medium,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/MediumColumn.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/MediumColumn.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/MediumColumn.mo" 2021-09-16 11:15:38.326780829 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/MediumColumn.mo" 2021-09-16 11:19:12.606065785 +0200
@@ -7,7 +7,7 @@
annotation (choices(
choice(redeclare package Medium = Buildings.Media.Air "Moist air")));
- parameter Modelica.SIunits.Length h(min=0) = 3 "Height of shaft";
+ parameter Modelica.Units.SI.Length h(min=0) = 3 "Height of shaft";
parameter Buildings.Airflow.Multizone.Types.densitySelection densitySelection
"Select how to pick density" annotation (Evaluate=true);
@@ -24,13 +24,13 @@
"Fluid connector b (positive design flow direction is from port_a to port_b)"
annotation (Placement(transformation(extent={{10,-110},{-10,-90}}), iconTransformation(extent={{10,-110},{-10,-90}})));
- Modelica.SIunits.VolumeFlowRate V_flow
+ Modelica.Units.SI.VolumeFlowRate V_flow
"Volume flow rate at inflowing port (positive when flow from port_a to port_b)";
- Modelica.SIunits.MassFlowRate m_flow
+ Modelica.Units.SI.MassFlowRate m_flow
"Mass flow rate from port_a to port_b (m_flow > 0 is design flow direction)";
- Modelica.SIunits.PressureDifference dp(displayUnit="Pa")
+ Modelica.Units.SI.PressureDifference dp(displayUnit="Pa")
"Pressure difference between port_a and port_b";
- Modelica.SIunits.Density rho "Density in medium column";
+ Modelica.Units.SI.Density rho "Density in medium column";
protected
Medium.ThermodynamicState sta_a=Medium.setState_phX(
port_a.p,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/MediumColumnDynamic.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/MediumColumnDynamic.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/MediumColumnDynamic.mo" 2021-09-16 11:15:38.326780829 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/MediumColumnDynamic.mo" 2021-09-16 11:19:12.574065893 +0200
@@ -8,7 +8,7 @@
annotation (choices(
choice(redeclare package Medium = Buildings.Media.Air "Moist air")));
- parameter Modelica.SIunits.Length h(min=0) = 3 "Height of shaft";
+ parameter Modelica.Units.SI.Length h(min=0) = 3 "Height of shaft";
Modelica.Fluid.Interfaces.FluidPort_a port_a(
redeclare final package Medium = Medium,
@@ -22,7 +22,7 @@
"Fluid connector b (positive design flow direction is from port_a to port_b)"
annotation (Placement(transformation(extent={{10,-110},{-10,-90}}), iconTransformation(extent={{10,-110},{-10,-90}})));
- parameter Modelica.SIunits.Volume V "Volume in medium shaft";
+ parameter Modelica.Units.SI.Volume V "Volume in medium shaft";
// Heat transfer through boundary
parameter Boolean use_HeatTransfer = false
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/Orifice.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/Orifice.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/Orifice.mo" 2021-09-16 11:15:38.326780829 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/Orifice.mo" 2021-09-16 11:19:12.550065974 +0200
@@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/ZonalFlow_ACS.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/ZonalFlow_ACS.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/ZonalFlow_ACS.mo" 2021-09-16 11:15:38.326780829 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Airflow/Multizone/ZonalFlow_ACS.mo" 2021-09-16 11:19:12.470066244 +0200
@@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/ChillerStage.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/ChillerStage.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/ChillerStage.mo" 2021-09-16 11:15:38.326780829 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/ChillerStage.mo" 2021-09-16 11:19:12.410066446 +0200
@@ -2,16 +2,16 @@
model ChillerStage "Chiller staging control logic"
extends Modelica.Blocks.Icons.Block;
- parameter Modelica.SIunits.Time tWai "Waiting time";
- parameter Modelica.SIunits.Power QEva_nominal
+ parameter Modelica.Units.SI.Time tWai "Waiting time";
+ parameter Modelica.Units.SI.Power QEva_nominal
"Nominal cooling capaciaty(Negative means cooling)";
- parameter Modelica.SIunits.Power criPoiLoa = 0.55*QEva_nominal
+ parameter Modelica.Units.SI.Power criPoiLoa = 0.55*QEva_nominal
"Critical point of cooling load for switching one chiller on or off";
- parameter Modelica.SIunits.Power dQ = 0.25*QEva_nominal
+ parameter Modelica.Units.SI.Power dQ = 0.25*QEva_nominal
"Deadband for critical point of cooling load";
- parameter Modelica.SIunits.Temperature criPoiTem = 279.15
+ parameter Modelica.Units.SI.Temperature criPoiTem = 279.15
"Critical point of temperature for switching one chiller on or off";
- parameter Modelica.SIunits.TemperatureDifference dT = 1
+ parameter Modelica.Units.SI.TemperatureDifference dT = 1
"Deadband width for critical point of switching temperature";
Modelica.Blocks.Interfaces.IntegerInput cooMod
@@ -45,12 +45,12 @@
extent={{-10,10},{10,-10}},
rotation=-90,
origin={-50,10})));
- Modelica.StateGraph.InitialStep off(nIn=1) "Free cooling mode"
+ Modelica.StateGraph.InitialStep off(nOut = 1, nIn = 1) "Free cooling mode"
annotation (Placement(transformation(
extent={{-10,10},{10,-10}},
rotation=-90,
origin={-50,70})));
- Modelica.StateGraph.StepWithSignal twoOn "Two chillers are commanded on"
+ Modelica.StateGraph.StepWithSignal twoOn(nIn = 1, nOut = 1) "Two chillers are commanded on"
annotation (Placement(transformation(
extent={{-10,10},{10,-10}},
rotation=-90,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/ConstantSpeedPumpStage.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/ConstantSpeedPumpStage.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/ConstantSpeedPumpStage.mo" 2021-09-16 11:15:38.326780829 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/ConstantSpeedPumpStage.mo" 2021-09-16 11:19:12.378066554 +0200
@@ -2,7 +2,7 @@
model ConstantSpeedPumpStage "Staging control for constant speed pumps"
extends Modelica.Blocks.Icons.Block;
- parameter Modelica.SIunits.Time tWai "Waiting time";
+ parameter Modelica.Units.SI.Time tWai "Waiting time";
Modelica.Blocks.Interfaces.IntegerInput cooMod
"Cooling mode - 0:off, 1: free cooling mode; 2: partially mechanical cooling; 3: fully mechanical cooling"
@@ -32,12 +32,12 @@
extent={{-10,10},{10,-10}},
rotation=-90,
origin={-40,10})));
- Modelica.StateGraph.InitialStep off(nIn=1) "Free cooling mode"
+ Modelica.StateGraph.InitialStep off(nOut = 1, nIn = 1) "Free cooling mode"
annotation (Placement(transformation(
extent={{-10,10},{10,-10}},
rotation=-90,
origin={-40,70})));
- Modelica.StateGraph.StepWithSignal twoOn "Two chillers are commanded on"
+ Modelica.StateGraph.StepWithSignal twoOn(nIn = 1, nOut = 1) "Two chillers are commanded on"
annotation (Placement(transformation(
extent={{-10,10},{10,-10}},
rotation=-90,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/CoolingMode.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/CoolingMode.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/CoolingMode.mo" 2021-09-16 11:15:38.326780829 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/CoolingMode.mo" 2021-09-16 11:19:12.346066662 +0200
@@ -3,14 +3,14 @@
"Mode controller for integrated waterside economizer and chiller"
extends Modelica.Blocks.Icons.Block;
- parameter Modelica.SIunits.Time tWai "Waiting time";
- parameter Modelica.SIunits.TemperatureDifference deaBan1
+ parameter Modelica.Units.SI.Time tWai "Waiting time";
+ parameter Modelica.Units.SI.TemperatureDifference deaBan1
"Dead band width 1 for switching chiller on ";
- parameter Modelica.SIunits.TemperatureDifference deaBan2
+ parameter Modelica.Units.SI.TemperatureDifference deaBan2
"Dead band width 2 for switching waterside economizer off";
- parameter Modelica.SIunits.TemperatureDifference deaBan3
+ parameter Modelica.Units.SI.TemperatureDifference deaBan3
"Dead band width 3 for switching waterside economizer on ";
- parameter Modelica.SIunits.TemperatureDifference deaBan4
+ parameter Modelica.Units.SI.TemperatureDifference deaBan4
"Dead band width 4 for switching chiller off";
Modelica.Blocks.Interfaces.RealInput TCHWRetWSE(
@@ -54,12 +54,12 @@
extent={{-10,10},{10,-10}},
rotation=-90,
origin={-10,8})));
- Modelica.StateGraph.InitialStepWithSignal freCoo(nIn=1) "Free cooling mode"
+ Modelica.StateGraph.InitialStepWithSignal freCoo(nOut = 1, nIn = 1) "Free cooling mode"
annotation (Placement(transformation(
extent={{-10,10},{10,-10}},
rotation=-90,
origin={-10,70})));
- Modelica.StateGraph.StepWithSignal fulMecCoo "Fully mechanical cooling mode"
+ Modelica.StateGraph.StepWithSignal fulMecCoo(nIn = 1, nOut = 1) "Fully mechanical cooling mode"
annotation (Placement(transformation(
extent={{-10,10},{10,-10}},
rotation=-90,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/CoolingModeNonIntegrated.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/CoolingModeNonIntegrated.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/CoolingModeNonIntegrated.mo" 2021-09-16 11:15:38.326780829 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/CoolingModeNonIntegrated.mo" 2021-09-16 11:19:12.314066770 +0200
@@ -3,11 +3,11 @@
"Cooling mode controller in the chilled water system with a non-integrated waterside economizer"
extends Modelica.Blocks.Icons.Block;
- parameter Modelica.SIunits.TemperatureDifference deaBan
+ parameter Modelica.Units.SI.TemperatureDifference deaBan
"Dead band width for switching waterside economizer off ";
- parameter Modelica.SIunits.Temperature TSwi
+ parameter Modelica.Units.SI.Temperature TSwi
"Temperature transition to free cooling mode";
- parameter Modelica.SIunits.Time tWai
+ parameter Modelica.Units.SI.Time tWai
"Waiting time";
Modelica.Blocks.Interfaces.IntegerInput numOnChi
@@ -34,13 +34,13 @@
"Cooling mode signal (1: free cooling mode, 3: fully mechanical cooling)"
annotation (Placement(transformation(extent={{100,-10},{120,10}})));
- Modelica.StateGraph.InitialStepWithSignal freCoo(nIn=1)
+ Modelica.StateGraph.InitialStepWithSignal freCoo(nOut = 1, nIn = 1)
"Free cooling mode"
annotation (Placement(transformation(
extent={{-10,10},{10,-10}},
rotation=-90,
origin={-20,58})));
- Modelica.StateGraph.StepWithSignal fulMecCoo
+ Modelica.StateGraph.StepWithSignal fulMecCoo(nIn = 1, nOut = 1)
"Fully mechanical cooling mode"
annotation (Placement(transformation(
extent={{-10,10},{10,-10}},
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/CoolingTowerSpeed.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/CoolingTowerSpeed.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/CoolingTowerSpeed.mo" 2021-09-16 11:15:38.326780829 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/CoolingTowerSpeed.mo" 2021-09-16 11:19:12.290066851 +0200
@@ -9,12 +9,12 @@
parameter Real k(min=0, unit="1") = 1
"Gain of controller"
annotation(Dialog(tab="Controller"));
- parameter Modelica.SIunits.Time Ti(min=Modelica.Constants.small)=0.5
+ parameter Modelica.Units.SI.Time Ti(min=Modelica.Constants.small)=0.5
"Time constant of integrator block"
annotation (Dialog(enable=
(controllerType == Modelica.Blocks.Types.SimpleController.PI or
controllerType == Modelica.Blocks.Types.SimpleController.PID),tab="Controller"));
- parameter Modelica.SIunits.Time Td(min=0)=0.1
+ parameter Modelica.Units.SI.Time Td(min=0)=0.1
"Time constant of derivative block"
annotation (Dialog(enable=
(controllerType == Modelica.Blocks.Types.SimpleController.PD or
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/Reheat.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/Reheat.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/Reheat.mo" 2021-09-16 11:15:38.326780829 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/Reheat.mo" 2021-09-16 11:19:12.254066973 +0200
@@ -5,11 +5,11 @@
"Switch point for valve signal";
parameter Real yValDeaBan(min=0, max=1, unit="1")
"Deadband for valve signal";
- parameter Modelica.SIunits.TemperatureDifference dTSwi
+ parameter Modelica.Units.SI.TemperatureDifference dTSwi
"Switch point for temperature difference";
- parameter Modelica.SIunits.TemperatureDifference dTDeaBan
+ parameter Modelica.Units.SI.TemperatureDifference dTDeaBan
"Deadband for temperature difference";
- parameter Modelica.SIunits.Time tWai
+ parameter Modelica.Units.SI.Time tWai
"Waiting time";
Modelica.Blocks.Interfaces.RealInput yVal(
@@ -28,13 +28,13 @@
"On and off signal for the reheater"
annotation (Placement(transformation(extent={{100,-10},{120,10}})));
- Modelica.StateGraph.InitialStepWithSignal off "Off"
+ Modelica.StateGraph.InitialStepWithSignal off(nIn = 1, nOut = 1) "Off"
annotation (Placement(
transformation(
extent={{10,10},{-10,-10}},
rotation=180,
origin={-50,30})));
- Modelica.StateGraph.StepWithSignal on "On"
+ Modelica.StateGraph.StepWithSignal on(nIn = 1, nOut = 1) "On"
annotation (Placement(
transformation(
extent={{10,10},{-10,-10}},
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/Validation/CoolingModeNonIntegrated.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/Validation/CoolingModeNonIntegrated.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/Validation/CoolingModeNonIntegrated.mo" 2021-09-16 11:15:38.326780829 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/Validation/CoolingModeNonIntegrated.mo" 2021-09-16 11:19:12.026067742 +0200
@@ -17,7 +17,7 @@
annotation (Placement(transformation(extent={{-60,-40},{-40,-20}})));
Modelica.Blocks.Sources.Sine TWetBub(
amplitude=4,
- freqHz=1/300,
+f =1/300,
offset=273.15 + 8)
"Wet bulb temperature"
annotation (Placement(transformation(extent={{-60,20},{-40,40}})));
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/Validation/CoolingTowerSpeed.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/Validation/CoolingTowerSpeed.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/Validation/CoolingTowerSpeed.mo" 2021-09-16 11:15:38.326780829 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/Validation/CoolingTowerSpeed.mo" 2021-09-16 11:19:12.006067809 +0200
@@ -10,12 +10,12 @@
parameter Real k(min=0, unit="1") = 1
"Gain of controller"
annotation(Dialog(tab="Controller"));
- parameter Modelica.SIunits.Time Ti(min=Modelica.Constants.small)=0.5
+ parameter Modelica.Units.SI.Time Ti(min=Modelica.Constants.small)=0.5
"Time constant of integrator block"
annotation (Dialog(enable=
(controllerType == Modelica.Blocks.Types.SimpleController.PI or
controllerType == Modelica.Blocks.Types.SimpleController.PID),tab="Controller"));
- parameter Modelica.SIunits.Time Td(min=0)=0.1
+ parameter Modelica.Units.SI.Time Td(min=0)=0.1
"Time constant of derivative block"
annotation (Dialog(enable=
(controllerType == Modelica.Blocks.Types.SimpleController.PD or
@@ -33,7 +33,7 @@
annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
Modelica.Blocks.Sources.Sine CHWST(
amplitude=2,
- freqHz=1/360,
+f =1/360,
offset=273.15 + 5)
"Chilled water supply temperature"
annotation (Placement(transformation(extent={{-60,-80},{-40,-60}})));
@@ -42,7 +42,7 @@
annotation (Placement(transformation(extent={{-60,70},{-40,90}})));
Modelica.Blocks.Sources.Sine CWST(
amplitude=5,
- freqHz=1/360,
+f =1/360,
offset=273.15 + 20)
"Condenser water supply temperature"
annotation (Placement(transformation(extent={{-60,-40},{-40,-20}})));
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/Validation/Reheat.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/Validation/Reheat.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/Validation/Reheat.mo" 2021-09-16 11:15:38.326780829 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/Validation/Reheat.mo" 2021-09-16 11:19:11.986067876 +0200
@@ -12,13 +12,13 @@
Modelica.Blocks.Sources.Sine sig1(
amplitude=0.3,
offset=0.3,
- freqHz=1/1200)
+f =1/1200)
"Signal 1"
annotation (Placement(transformation(extent={{-80,40},{-60,60}})));
Modelica.Blocks.Sources.Sine sig2(
amplitude=3,
offset=273.15 + 15,
- freqHz=1/1200,
+f =1/1200,
phase=1.0471975511966)
"Signal 2"
annotation (Placement(transformation(extent={{-80,-38},{-60,-18}})));
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/Validation/VariableSpeedPumpStage.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/Validation/VariableSpeedPumpStage.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/Validation/VariableSpeedPumpStage.mo" 2021-09-16 11:15:38.326780829 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/Validation/VariableSpeedPumpStage.mo" 2021-09-16 11:19:11.970067930 +0200
@@ -2,7 +2,7 @@
model VariableSpeedPumpStage
"Test the model ChillerWSE.Examples.BaseClasses.VariableSpeedPumpStageControl"
extends Modelica.Icons.Example;
- parameter Modelica.SIunits.MassFlowRate m_flow_nominal=100 "Nominal mass flowrate";
+ parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=100 "Nominal mass flowrate";
Buildings.Applications.DataCenters.ChillerCooled.Controls.VariableSpeedPumpStage
varSpePumSta(tWai=30, m_flow_nominal=m_flow_nominal,
@@ -16,7 +16,7 @@
annotation (Placement(transformation(extent={{-60,-30},{-40,-10}})));
Modelica.Blocks.Sources.Sine masFlo(
offset=0.5*m_flow_nominal,
- freqHz=1/360,
+f =1/360,
amplitude=0.5*m_flow_nominal)
"Mass flowrate"
annotation (Placement(transformation(extent={{-60,30},{-40,50}})));
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/VariableSpeedPumpStage.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/VariableSpeedPumpStage.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/VariableSpeedPumpStage.mo" 2021-09-16 11:15:38.326780829 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Controls/VariableSpeedPumpStage.mo" 2021-09-16 11:19:11.954067984 +0200
@@ -2,14 +2,14 @@
model VariableSpeedPumpStage "Staging control for variable speed pumps"
extends Modelica.Blocks.Icons.Block;
- parameter Modelica.SIunits.Time tWai "Waiting time";
- parameter Modelica.SIunits.MassFlowRate m_flow_nominal
+ parameter Modelica.Units.SI.Time tWai "Waiting time";
+ parameter Modelica.Units.SI.MassFlowRate m_flow_nominal
"Nominal mass flow rate of the identical variable-speed pumps";
parameter Real minSpe(unit="1",min=0,max=1) = 0.05
"Minimum speed ratio required by variable speed pumps";
- parameter Modelica.SIunits.MassFlowRate criPoiFlo = 0.7*m_flow_nominal
+ parameter Modelica.Units.SI.MassFlowRate criPoiFlo = 0.7*m_flow_nominal
"Critcal point of flowrate for switch pump on or off";
- parameter Modelica.SIunits.MassFlowRate deaBanFlo = 0.1*m_flow_nominal
+ parameter Modelica.Units.SI.MassFlowRate deaBanFlo = 0.1*m_flow_nominal
"Deadband for critical point of flowrate";
parameter Real criPoiSpe = 0.5
"Critical point of speed signal for switching on or off";
@@ -42,13 +42,13 @@
extent={{-10,10},{10,-10}},
rotation=-90,
origin={-50,10})));
- Modelica.StateGraph.InitialStep off(nIn=1)
+ Modelica.StateGraph.InitialStep off(nOut = 1, nIn = 1)
"Free cooling mode"
annotation (Placement(transformation(
extent={{-10,10},{10,-10}},
rotation=-90,
origin={-50,70})));
- Modelica.StateGraph.StepWithSignal twoOn
+ Modelica.StateGraph.StepWithSignal twoOn(nIn = 1, nOut = 1)
"Two chillers are commanded on"
annotation (Placement(transformation(
extent={{-10,10},{10,-10}},
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/AHUParameters.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/AHUParameters.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/AHUParameters.mo" 2021-09-16 11:15:38.326780829 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/AHUParameters.mo" 2021-09-16 11:19:11.906068146 +0200
@@ -1,19 +1,19 @@
within Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses;
partial model AHUParameters "Essential parameters for air handling unit"
- parameter Modelica.SIunits.ThermalConductance UA_nominal
+ parameter Modelica.Units.SI.ThermalConductance UA_nominal
"Thermal conductance at nominal flow for sensible heat, used to compute time constant"
annotation (Dialog(group="Cooling coil"));
parameter Real r_nominal=2/3
"Ratio between air-side and water-side convective heat transfer coefficient"
annotation (Dialog(group="Cooling coil"));
- parameter Modelica.SIunits.Time tau1 = 20 "Time constant at nominal flow of medium 1"
+ parameter Modelica.Units.SI.Time tau1 = 20 "Time constant at nominal flow of medium 1"
annotation (Dialog(group="Cooling coil",
enable=not (energyDynamics==Modelica.Fluid.Types.Dynamics.SteadyState)));
- parameter Modelica.SIunits.Time tau2 = 1 "Time constant at nominal flow of medium 2"
+ parameter Modelica.Units.SI.Time tau2 = 1 "Time constant at nominal flow of medium 2"
annotation (Dialog(group="Cooling coil",
enable=not (energyDynamics==Modelica.Fluid.Types.Dynamics.SteadyState)));
- parameter Modelica.SIunits.Time tau_m(min=0) = 20
+ parameter Modelica.Units.SI.Time tau_m(min=0) = 20
"Time constant of metal at nominal UA value"
annotation(Dialog(tab="General", group="Cooling coil"));
parameter Integer nEle(min=1) = 4
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/FourPortResistanceChillerWSE.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/FourPortResistanceChillerWSE.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/FourPortResistanceChillerWSE.mo" 2021-09-16 11:15:38.326780829 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/FourPortResistanceChillerWSE.mo" 2021-09-16 11:19:11.894068187 +0200
@@ -10,11 +10,11 @@
"= true, use m_flow = f(dp) else dp = f(m_flow)"
annotation (Evaluate=true, Dialog(enable = computeFlowResistance1,
tab="Flow resistance", group="Medium 1"));
- parameter Modelica.SIunits.PressureDifference dp1_chi_nominal(
+ parameter Modelica.Units.SI.PressureDifference dp1_chi_nominal(
min=0,displayUnit="Pa")
"Pressure difference on medium 1 side in the chillers"
annotation(Dialog(group = "Chiller"));
- parameter Modelica.SIunits.PressureDifference dp1_wse_nominal(
+ parameter Modelica.Units.SI.PressureDifference dp1_wse_nominal(
min=0,displayUnit="Pa")
"Pressure difference on medium 1 side in the watersie economizer"
annotation(Dialog(group = "Waterside economizer"));
@@ -33,11 +33,11 @@
"= true, use m_flow = f(dp) else dp = f(m_flow)"
annotation (Evaluate=true, Dialog(enable = computeFlowResistance2,
tab="Flow resistance", group="Medium 2"));
- parameter Modelica.SIunits.PressureDifference dp2_chi_nominal(
+ parameter Modelica.Units.SI.PressureDifference dp2_chi_nominal(
min=0,displayUnit="Pa")
"Pressure difference on medium 2 side in the chillers"
annotation(Dialog(group = "Chiller"));
- parameter Modelica.SIunits.PressureDifference dp2_wse_nominal(
+ parameter Modelica.Units.SI.PressureDifference dp2_wse_nominal(
min=0,displayUnit="Pa")
"Pressure difference on medium 2 side in the waterside economizer"
annotation(Dialog(group = "Waterside economizer"));
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialChillerWSE.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialChillerWSE.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialChillerWSE.mo" 2021-09-16 11:15:38.326780829 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialChillerWSE.mo" 2021-09-16 11:19:11.878068241 +0200
@@ -40,7 +40,7 @@
annotation(Dialog(tab="Dynamics", group="Filtered opening",enable=use_inputFilter));
//WSE
- parameter Modelica.SIunits.Efficiency eta(min=0,max=1)=0.8
+ parameter Modelica.Units.SI.Efficiency eta(min=0,max=1)=0.8
"Heat exchange effectiveness"
annotation(Dialog(group="Waterside economizer"));
@@ -66,15 +66,15 @@
parameter Modelica.Fluid.Types.Dynamics massDynamics=energyDynamics
"Type of mass balance: dynamic (3 initialization options) or steady state"
annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations"));
- parameter Modelica.SIunits.Time tauChi1 = 30
+ parameter Modelica.Units.SI.Time tauChi1 = 30
"Time constant at nominal flow in chillers"
annotation (Dialog(tab = "Dynamics", group="Chiller",
enable=not energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState));
- parameter Modelica.SIunits.Time tauChi2 = 30
+ parameter Modelica.Units.SI.Time tauChi2 = 30
"Time constant at nominal flow in chillers"
annotation (Dialog(tab = "Dynamics", group="Chiller",
enable=not energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState));
- parameter Modelica.SIunits.Time tauWSE = 10
+ parameter Modelica.Units.SI.Time tauWSE = 10
"Time constant at nominal flow for dynamic energy and momentum balance of the three-way valve"
annotation(Dialog(tab="Dynamics", group="Waterside economizer",
enable= use_controller and not energyDynamics ==
@@ -123,7 +123,7 @@
enable=Medium2.nC > 0));
// Temperature sensor
- parameter Modelica.SIunits.Time tauSenT=1
+ parameter Modelica.Units.SI.Time tauSenT=1
"Time constant at nominal flow rate (use tau=0 for steady-state sensor,
but see user guide for potential problems)"
annotation(Dialog(tab="Dynamics", group="Temperature Sensor",
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialChillerWSEInterface.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialChillerWSEInterface.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialChillerWSEInterface.mo" 2021-09-16 11:15:38.326780829 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialChillerWSEInterface.mo" 2021-09-16 11:19:11.810068470 +0200
@@ -4,16 +4,16 @@
extends Buildings.Fluid.Interfaces.PartialFourPort;
// Nominal conditions
- parameter Modelica.SIunits.MassFlowRate m1_flow_chi_nominal(min=0)
+ parameter Modelica.Units.SI.MassFlowRate m1_flow_chi_nominal(min=0)
"Nominal mass flow rate on the medium 1 side in the chiller"
annotation(Dialog(group = "Chiller"));
- parameter Modelica.SIunits.MassFlowRate m2_flow_chi_nominal(min=0)
+ parameter Modelica.Units.SI.MassFlowRate m2_flow_chi_nominal(min=0)
"Nominal mass flow rate on the medium 2 side in the chiller"
annotation(Dialog(group = "Chiller"));
- parameter Modelica.SIunits.MassFlowRate m1_flow_wse_nominal(min=0)
+ parameter Modelica.Units.SI.MassFlowRate m1_flow_wse_nominal(min=0)
"Nominal mass flow rate on the medium 1 side in the waterside economizer"
annotation(Dialog(group = "Waterside economizer"));
- parameter Modelica.SIunits.MassFlowRate m2_flow_wse_nominal(min=0)
+ parameter Modelica.Units.SI.MassFlowRate m2_flow_wse_nominal(min=0)
"Nominal mass flow rate on the medium 2 side in the waterside economizer"
annotation(Dialog(group = "Waterside economizer"));
@@ -43,12 +43,12 @@
iconTransformation(extent={{-132,60},{-100,92}})));
Medium1.MassFlowRate m1_flow = port_a1.m_flow
"Mass flow rate from port_a1 to port_b1 (m1_flow > 0 is design flow direction)";
- Modelica.SIunits.PressureDifference dp1(displayUnit="Pa") = port_a1.p - port_b1.p
+ Modelica.Units.SI.PressureDifference dp1(displayUnit="Pa") = port_a1.p - port_b1.p
"Pressure difference between port_a1 and port_b1";
Medium2.MassFlowRate m2_flow = port_a2.m_flow
"Mass flow rate from port_a2 to port_b2 (m2_flow > 0 is design flow direction)";
- Modelica.SIunits.PressureDifference dp2(displayUnit="Pa") = port_a2.p - port_b2.p
+ Modelica.Units.SI.PressureDifference dp2(displayUnit="Pa") = port_a2.p - port_b2.p
"Pressure difference between port_a2 and port_b2";
Medium1.ThermodynamicState sta_a1=
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialControllerInterface.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialControllerInterface.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialControllerInterface.mo" 2021-09-16 11:15:38.326780829 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialControllerInterface.mo" 2021-09-16 11:19:11.790068537 +0200
@@ -14,13 +14,13 @@
parameter Real k(min=0, unit="1") = 1
"Gain of controller"
annotation(Dialog(tab="Controller",enable=use_controller));
- parameter Modelica.SIunits.Time Ti(min=Modelica.Constants.small)=0.5
+ parameter Modelica.Units.SI.Time Ti(min=Modelica.Constants.small)=0.5
"Time constant of integrator block"
annotation (Dialog(enable=
(use_controller and
(controllerType == Modelica.Blocks.Types.SimpleController.PI or
controllerType == Modelica.Blocks.Types.SimpleController.PID)),tab="Controller"));
- parameter Modelica.SIunits.Time Td(min=0)=0.1
+ parameter Modelica.Units.SI.Time Td(min=0)=0.1
"Time constant of derivative block"
annotation (Dialog(enable=
use_controller and
@@ -51,8 +51,8 @@
use_controller and
(controllerType==.Modelica.Blocks.Types.SimpleController.PD or
controllerType==.Modelica.Blocks.Types.SimpleController.PID),tab="Controller"));
- parameter Modelica.Blocks.Types.InitPID initType=
- Modelica.Blocks.Types.InitPID.DoNotUse_InitialIntegratorState
+ parameter Modelica.Blocks.Types.Init initType=
+ Modelica.Blocks.Types.Init.InitialState
"Type of initialization (1: no init, 2: steady state, 3: initial state, 4: initial output)"
annotation(Evaluate=true,Dialog(group="Initialization",tab="Controller",enable=use_controller));
parameter Real xi_start=0
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialCoolingCoilHumidifyingHeating.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialCoolingCoilHumidifyingHeating.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialCoolingCoilHumidifyingHeating.mo" 2021-09-16 11:15:38.326780829 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialCoolingCoilHumidifyingHeating.mo" 2021-09-16 11:19:11.766068618 +0200
@@ -58,7 +58,7 @@
parameter Boolean use_inputFilterValve=true
"= true, if opening is filtered with a 2nd order CriticalDamping filter for the water-side valve"
annotation(Dialog(tab="Dynamics", group="Valve"));
- parameter Modelica.SIunits.Time riseTimeValve=120
+ parameter Modelica.Units.SI.Time riseTimeValve=120
"Rise time of the filter for the water-side valve (time to reach 99.6 % of an opening step)"
annotation(Dialog(tab="Dynamics", group="Valve",enable=use_inputFilterValve));
parameter Modelica.Blocks.Types.Init initValve=Modelica.Blocks.Types.Init.InitialOutput
@@ -73,13 +73,13 @@
parameter Boolean addPowerToMedium=true
"Set to false to avoid any power (=heat and flow work) being added to medium (may give simpler equations)"
annotation(Dialog(group="Fan"));
- parameter Modelica.SIunits.Time tauFan = 1
+ parameter Modelica.Units.SI.Time tauFan = 1
"Time constant at nominal flow (if energyDynamics <> SteadyState)"
annotation (Dialog(tab = "Dynamics", group="Fan"));
parameter Boolean use_inputFilterFan=true
"= true, if speed is filtered with a 2nd order CriticalDamping filter"
annotation(Dialog(tab="Dynamics", group="Fan"));
- parameter Modelica.SIunits.Time riseTimeFan=30
+ parameter Modelica.Units.SI.Time riseTimeFan=30
"Rise time of the filter (time to reach 99.6 % of the speed)"
annotation(Dialog(tab="Dynamics", group="Fan",enable=use_inputFilterFan));
parameter Modelica.Blocks.Types.Init initFan=Modelica.Blocks.Types.Init.InitialOutput
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialHeatExchanger.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialHeatExchanger.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialHeatExchanger.mo" 2021-09-16 11:15:38.326780829 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialHeatExchanger.mo" 2021-09-16 11:19:11.730068740 +0200
@@ -14,14 +14,14 @@
constant Boolean homotopyInitialization = true "= true, use homotopy method"
annotation(HideResult=true);
- parameter Modelica.SIunits.Efficiency eta(min=0,max=1,start=0.8)
+ parameter Modelica.Units.SI.Efficiency eta(min=0,max=1,start=0.8)
"constant effectiveness";
// Filter opening
parameter Boolean use_inputFilter=true
"= true, if opening is filtered with a 2nd order CriticalDamping filter"
annotation(Dialog(tab="Dynamics", group="Filtered opening",enable=activate_ThrWayVal));
- parameter Modelica.SIunits.Time riseTime=120
+ parameter Modelica.Units.SI.Time riseTime=120
"Rise time of the filter (time to reach 99.6 % of an opening step)"
annotation(Dialog(tab="Dynamics", group="Filtered opening",
enable=(activate_ThrWayVal and use_inputFilter)));
@@ -35,13 +35,13 @@
enable=(activate_ThrWayVal and use_inputFilter)));
// Time constant
- parameter Modelica.SIunits.Time tauThrWayVal=10
+ parameter Modelica.Units.SI.Time tauThrWayVal=10
"Time constant at nominal flow for dynamic energy and momentum balance of the three-way valve"
annotation(Dialog(tab="Dynamics", group="Nominal condition",
enable=(activate_ThrWayVal and not energyDynamics ==
Modelica.Fluid.Types.Dynamics.SteadyState)));
// Advanced
- parameter Modelica.SIunits.Density rhoStd = Medium2.density_pTX(101325, 273.15+4, Medium2.X_default)
+ parameter Modelica.Units.SI.Density rhoStd = Medium2.density_pTX(101325, 273.15+4, Medium2.X_default)
"Inlet density for which valve coefficients are defined"
annotation(Dialog(group="Nominal condition", tab="Advanced",enable=activate_ThrWayVal));
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialParallelElectricEIR.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialParallelElectricEIR.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialParallelElectricEIR.mo" 2021-09-16 11:15:38.326780829 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialParallelElectricEIR.mo" 2021-09-16 11:19:11.670068942 +0200
@@ -5,11 +5,11 @@
val2(each final dpFixed_nominal=dp2_nominal),
val1(each final dpFixed_nominal=dp1_nominal));
- parameter Modelica.SIunits.Time tau1 = 30
+ parameter Modelica.Units.SI.Time tau1 = 30
"Time constant at nominal flow in chillers"
annotation (Dialog(tab = "Dynamics", group="Nominal condition",
enable=not energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState));
- parameter Modelica.SIunits.Time tau2 = 30
+ parameter Modelica.Units.SI.Time tau2 = 30
"Time constant at nominal flow in chillers"
annotation (Dialog(tab = "Dynamics", group="Nominal condition",
enable=not energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState));
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialPumpParallel.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialPumpParallel.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialPumpParallel.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialPumpParallel.mo" 2021-09-16 11:19:11.606069158 +0200
@@ -19,13 +19,13 @@
parameter Boolean addPowerToMedium=false
"Set to false to avoid any power (=heat and flow work) being added to medium (may give simpler equations)"
annotation(Dialog(group="Pump"));
- parameter Modelica.SIunits.Time tau = 1
+ parameter Modelica.Units.SI.Time tau = 1
"Time constant at nominal flow (if energyDynamics <> SteadyState)"
annotation (Dialog(tab = "Dynamics", group="Pump"));
parameter Boolean use_inputFilter=true
"= true, if speed is filtered with a 2nd order CriticalDamping filter"
annotation(Dialog(tab="Dynamics", group="Pump"));
- parameter Modelica.SIunits.Time riseTimePump= 30
+ parameter Modelica.Units.SI.Time riseTimePump= 30
"Rise time of the filter (time to reach 99.6 % of the speed)"
annotation(Dialog(tab="Dynamics", group="Pump",enable=use_inputFilter));
parameter Modelica.Blocks.Types.Init init=Modelica.Blocks.Types.Init.InitialOutput
@@ -41,7 +41,7 @@
"Flow coefficient of fixed resistance that may be in series with valve,
k=m_flow/sqrt(dp), with unit=(kg.m)^(1/2)."
annotation(Dialog(group="Two-way valve"));
- parameter Modelica.SIunits.Time riseTimeValve = 120
+ parameter Modelica.Units.SI.Time riseTimeValve = 120
"Rise time of the filter (time to reach 99.6 % of the speed)"
annotation(Dialog(tab="Dynamics", group="Valve",enable=use_inputFilter));
parameter Real[num] yValve_start = fill(0,num)
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/SignalFilterParameters.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/SignalFilterParameters.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/SignalFilterParameters.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/SignalFilterParameters.mo" 2021-09-16 11:19:11.558069320 +0200
@@ -5,7 +5,7 @@
parameter Boolean use_inputFilter=true
"= true, if opening is filtered with a 2nd order CriticalDamping filter"
annotation(Dialog(tab="Dynamics", group="Filtered opening"));
- parameter Modelica.SIunits.Time riseTimeValve=120
+ parameter Modelica.Units.SI.Time riseTimeValve=120
"Rise time of the filter (time to reach 99.6 % of an opening step)"
annotation(Dialog(tab="Dynamics", group="Filtered opening",enable=use_inputFilter));
parameter Modelica.Blocks.Types.Init initValve=Modelica.Blocks.Types.Init.InitialOutput
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/ValvesParameters.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/ValvesParameters.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/ValvesParameters.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/ValvesParameters.mo" 2021-09-16 11:19:11.534069401 +0200
@@ -15,7 +15,7 @@
"Cv (US) flow coefficient [USG/min/(psi)^(1/2)]"
annotation(Dialog(group = "Two-way valve",
enable = (CvData==Buildings.Fluid.Types.CvTypes.Cv)));
- parameter Modelica.SIunits.Area[numVal] Av(
+ parameter Modelica.Units.SI.Area[numVal] Av(
each fixed= if CvData==Buildings.Fluid.Types.CvTypes.Av then true else false)
"Av (metric) flow coefficient"
annotation(Dialog(group = "Two-way valve",
@@ -23,10 +23,10 @@
parameter Real deltaM = 0.02
"Fraction of nominal flow rate where linearization starts, if y=1"
annotation(Dialog(group="Pressure-flow linearization"));
- parameter Modelica.SIunits.MassFlowRate[numVal] m_flow_nominal
+ parameter Modelica.Units.SI.MassFlowRate[numVal] m_flow_nominal
"Nominal mass flow rate"
annotation(Dialog(group = "Two-way valve"));
- parameter Modelica.SIunits.PressureDifference[numVal] dpValve_nominal(
+ parameter Modelica.Units.SI.PressureDifference[numVal] dpValve_nominal(
each displayUnit="Pa",
each min=0,
each fixed= if CvData==Buildings.Fluid.Types.CvTypes.OpPoint then true else false)=
@@ -35,7 +35,7 @@
CvData=Buildings.Fluid.Types.CvTypes.OpPoint"
annotation(Dialog(group="Two-way valve",
enable = (CvData==Buildings.Fluid.Types.CvTypes.OpPoint)));
- parameter Modelica.SIunits.Density[numVal] rhoStd
+ parameter Modelica.Units.SI.Density[numVal] rhoStd
"Inlet density for which valve coefficients are defined"
annotation(Dialog(group="Two-way valve", tab="Advanced"));
protected
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/CoolingCoilHumidifyingHeating.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/CoolingCoilHumidifyingHeating.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/CoolingCoilHumidifyingHeating.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/CoolingCoilHumidifyingHeating.mo" 2021-09-16 11:19:11.362069981 +0200
@@ -14,24 +14,24 @@
annotation(Dialog(group="Valve"));
// Parameters for electric heater
- parameter Modelica.SIunits.Time tauEleHea = 10
+ parameter Modelica.Units.SI.Time tauEleHea = 10
"Time constant at nominal flow for electric heater (if energyDynamics <> SteadyState)"
annotation (Dialog(tab = "Dynamics", group="Electric heater",
enable=not (energyDynamics==Modelica.Fluid.Types.Dynamics.SteadyState)));
- parameter Modelica.SIunits.Efficiency etaHea = 1.0
+ parameter Modelica.Units.SI.Efficiency etaHea = 1.0
"Efficiency of electrical heater"
annotation (Dialog(group="Electric heater"));
- parameter Modelica.SIunits.HeatFlowRate QHeaMax_flow(min=0)
+ parameter Modelica.Units.SI.HeatFlowRate QHeaMax_flow(min=0)
"Nominal heating capacity of eletric heater,positive"
annotation (Dialog(group="Electric heater"));
// Parameters for humidifier
- parameter Modelica.SIunits.MassFlowRate mWatMax_flow(min=0)
+ parameter Modelica.Units.SI.MassFlowRate mWatMax_flow(min=0)
"Nominal humidification capacity for humidifier, positive for humidification"
annotation (Dialog(tab="General",group="Humidifier"));
- parameter Modelica.SIunits.Temperature THum = 293.15
+ parameter Modelica.Units.SI.Temperature THum = 293.15
"Temperature of water that is added to the fluid stream by the humidifier"
annotation (Dialog(group="Humidifier"));
- parameter Modelica.SIunits.Time tauHum = 10
+ parameter Modelica.Units.SI.Time tauHum = 10
"Time constant at nominal flow for humidifier(if energyDynamics <> SteadyState)"
annotation (Dialog(tab = "Dynamics", group="Humidifier",
enable=not (energyDynamics==Modelica.Fluid.Types.Dynamics.SteadyState)));
@@ -41,11 +41,11 @@
"Switch point for valve signal";
parameter Real yValDeaBan(min=0, max=1, unit="1")=0.1
"Deadband for valve signal";
- parameter Modelica.SIunits.TemperatureDifference dTSwi=0
+ parameter Modelica.Units.SI.TemperatureDifference dTSwi=0
"Switch point for temperature difference";
- parameter Modelica.SIunits.TemperatureDifference dTDeaBan=0.5
+ parameter Modelica.Units.SI.TemperatureDifference dTDeaBan=0.5
"Deadband for temperature difference";
- parameter Modelica.SIunits.Time tWai=60
+ parameter Modelica.Units.SI.Time tWai=60
"Waiting time";
Modelica.Blocks.Interfaces.RealOutput PHea(
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/ElectricHeater.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/ElectricHeater.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/ElectricHeater.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/ElectricHeater.mo" 2021-09-16 11:19:11.314070143 +0200
@@ -7,19 +7,19 @@
constant Boolean homotopyInitialization = true "= true, use homotopy method"
annotation(HideResult=true);
- parameter Modelica.SIunits.Efficiency eta(max=1) = 1
+ parameter Modelica.Units.SI.Efficiency eta(max=1) = 1
"Effciency of electrical heater";
- parameter Modelica.SIunits.HeatFlowRate QMax_flow(min=0) = Modelica.Constants.inf
+ parameter Modelica.Units.SI.HeatFlowRate QMax_flow(min=0) = Modelica.Constants.inf
"Maximum heat flow rate for heating (positive)"
annotation (Evaluate=true);
- parameter Modelica.SIunits.Temperature T_start=Medium.T_default
+ parameter Modelica.Units.SI.Temperature T_start=Medium.T_default
"Start value of temperature"
annotation(Dialog(tab = "Initialization"));
// Dynamics
parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState
"Type of energy balance: dynamic (3 initialization options) or steady state"
annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations"));
- parameter Modelica.SIunits.Time tau(min=0) = 10
+ parameter Modelica.Units.SI.Time tau(min=0) = 10
"Time constant at nominal flow rate (used
if energyDynamics or massDynamics not equal Modelica.Fluid.Types.Dynamics.SteadyState)"
annotation(Dialog(tab = "Dynamics"));
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/IntegratedPrimaryLoadSide.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/IntegratedPrimaryLoadSide.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/IntegratedPrimaryLoadSide.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/IntegratedPrimaryLoadSide.mo" 2021-09-16 11:19:11.258070331 +0200
@@ -12,7 +12,7 @@
Medium2.density_pTX(101325, 273.15+4, Medium2.X_default)});
//Dynamics
- parameter Modelica.SIunits.Time tauPump = 1
+ parameter Modelica.Units.SI.Time tauPump = 1
"Time constant of fluid volume for nominal flow in pumps, used if energy or mass balance is dynamic"
annotation (Dialog(tab = "Dynamics", group="Pump",
enable=not energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState));
@@ -26,7 +26,7 @@
parameter Boolean addPowerToMedium = true
"Set to false to avoid any power (=heat and flow work) being added to medium (may give simpler equations)"
annotation (Dialog(group="Pump"));
- parameter Modelica.SIunits.Time riseTimePump = 30
+ parameter Modelica.Units.SI.Time riseTimePump = 30
"Rise time of the filter (time to reach 99.6 % of an opening step)"
annotation(Dialog(tab="Dynamics", group="Filtered speed",enable=use_inputFilter));
parameter Modelica.Blocks.Types.Init initPum = initValve
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/IntegratedPrimarySecondary.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/IntegratedPrimarySecondary.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/IntegratedPrimarySecondary.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/IntegratedPrimarySecondary.mo" 2021-09-16 11:19:11.218070466 +0200
@@ -13,7 +13,7 @@
Medium2.density_pTX(101325, 273.15+4, Medium2.X_default)});
// Dynamics
- parameter Modelica.SIunits.Time tauPump = 1
+ parameter Modelica.Units.SI.Time tauPump = 1
"Time constant of fluid volume for nominal flow in pumps, used if energy or mass balance is dynamic"
annotation (Dialog(tab = "Dynamics", group="Pump",
enable=not energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState));
@@ -21,7 +21,7 @@
//Pump
parameter Integer numPum=numChi "Number of pumps"
annotation(Dialog(group="Pump"));
- parameter Modelica.SIunits.MassFlowRate m_flow_pum_nominal(min=0)=m2_flow_chi_nominal
+ parameter Modelica.Units.SI.MassFlowRate m_flow_pum_nominal(min=0)=m2_flow_chi_nominal
"Nominal flow rate of the pump"
annotation (Dialog(group="Pump"));
replaceable parameter Buildings.Fluid.Movers.Data.Generic perPum[numPum]
@@ -31,7 +31,7 @@
parameter Boolean addPowerToMedium=true
"Set to false to avoid any power (=heat and flow work) being added to medium (may give simpler equations)"
annotation (Dialog(group="Pump"));
- parameter Modelica.SIunits.Time riseTimePump = 30
+ parameter Modelica.Units.SI.Time riseTimePump = 30
"Rise time of the filter (time to reach 99.6 % of an opening step)"
annotation(Dialog(tab="Dynamics", group="Filtered flowrate",enable=use_inputFilter));
parameter Modelica.Blocks.Types.Init initPum=initValve
@@ -53,7 +53,7 @@
"Flow coefficient of fixed resistance that may be in series with valve,
k=m_flow/sqrt(dp), with unit=(kg.m)^(1/2)."
annotation(Dialog(group="Pump"));
- parameter Modelica.SIunits.PressureDifference dpValPum_nominal = 6000
+ parameter Modelica.Units.SI.PressureDifference dpValPum_nominal = 6000
"Nominal differential pressure of the shutoff valves for primary pumps"
annotation(Dialog(group="Pump"));
//Valve
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/BaseClasses/PartialAirHandlerControl.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/BaseClasses/PartialAirHandlerControl.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/BaseClasses/PartialAirHandlerControl.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/BaseClasses/PartialAirHandlerControl.mo" 2021-09-16 11:19:11.138070736 +0200
@@ -3,17 +3,17 @@
"Partial model for testing air hanlders with temperature and humidity control"
package Medium1 = Buildings.Media.Water "Medium model for water";
package Medium2 = Buildings.Media.Air "Medium model for air";
- parameter Modelica.SIunits.MassFlowRate m1_flow_nominal(min=0)=2.9
+ parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal(min=0)=2.9
"Nominal mass flow rate";
- parameter Modelica.SIunits.MassFlowRate m2_flow_nominal(min=0)=3.3
+ parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal(min=0)=3.3
"Nominal mass flow rate";
- parameter Modelica.SIunits.Temperature T_a1_nominal=6 + 273.15
+ parameter Modelica.Units.SI.Temperature T_a1_nominal=6 + 273.15
"Nominal water inlet temperature";
- parameter Modelica.SIunits.Temperature T_b1_nominal=11 + 273.15
+ parameter Modelica.Units.SI.Temperature T_b1_nominal=11 + 273.15
"Nominal water outlet temperature";
- parameter Modelica.SIunits.Temperature T_a2_nominal=26 + 273.15
+ parameter Modelica.Units.SI.Temperature T_a2_nominal=26 + 273.15
"Nominal air inlet temperature";
- parameter Modelica.SIunits.Temperature T_b2_nominal=12 + 273.15
+ parameter Modelica.Units.SI.Temperature T_b2_nominal=12 + 273.15
"Nominal air outlet temperature";
Buildings.Fluid.Sources.Boundary_pT sin_2(
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/BaseClasses/PartialAirHandlerMassFlow.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/BaseClasses/PartialAirHandlerMassFlow.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/BaseClasses/PartialAirHandlerMassFlow.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/BaseClasses/PartialAirHandlerMassFlow.mo" 2021-09-16 11:19:11.106070843 +0200
@@ -4,17 +4,17 @@
package Medium1 = Buildings.Media.Water "Medium model for water";
package Medium2 = Buildings.Media.Air "Medium model for air";
- parameter Modelica.SIunits.MassFlowRate m1_flow_nominal(min=0)=2.9
+ parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal(min=0)=2.9
"Nominal mass flow rate";
- parameter Modelica.SIunits.MassFlowRate m2_flow_nominal(min=0)=3.3
+ parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal(min=0)=3.3
"Nominal mass flow rate";
- parameter Modelica.SIunits.Temperature T_a1_nominal=6 + 273.15
+ parameter Modelica.Units.SI.Temperature T_a1_nominal=6 + 273.15
"Nominal water inlet temperature";
- parameter Modelica.SIunits.Temperature T_b1_nominal=11 + 273.15
+ parameter Modelica.Units.SI.Temperature T_b1_nominal=11 + 273.15
"Nominal water outlet temperature";
- parameter Modelica.SIunits.Temperature T_a2_nominal=26 + 273.15
+ parameter Modelica.Units.SI.Temperature T_a2_nominal=26 + 273.15
"Nominal air inlet temperature";
- parameter Modelica.SIunits.Temperature T_b2_nominal=12 + 273.15
+ parameter Modelica.Units.SI.Temperature T_b2_nominal=12 + 273.15
"Nominal air outlet temperature";
Buildings.Fluid.Sources.Boundary_pT sin_2(
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/BaseClasses/PartialPlant.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/BaseClasses/PartialPlant.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/BaseClasses/PartialPlant.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/BaseClasses/PartialPlant.mo" 2021-09-16 11:19:11.078070938 +0200
@@ -5,16 +5,16 @@
package MediumCHW = Buildings.Media.Water "Medium model";
package MediumCW = Buildings.Media.Water "Medium model";
- parameter Modelica.SIunits.MassFlowRate mCHW_flow_nominal=2567.1*1000/(
+ parameter Modelica.Units.SI.MassFlowRate mCHW_flow_nominal=2567.1*1000/(
4200*10)
"Nominal mass flow rate at chilled water";
- parameter Modelica.SIunits.MassFlowRate mCW_flow_nominal=2567.1*1000/ (
+ parameter Modelica.Units.SI.MassFlowRate mCW_flow_nominal=2567.1*1000/ (
4200*8.5)
"Nominal mass flow rate at condenser water";
- parameter Modelica.SIunits.PressureDifference dpCHW_nominal = 40000
+ parameter Modelica.Units.SI.PressureDifference dpCHW_nominal = 40000
"Nominal pressure";
- parameter Modelica.SIunits.PressureDifference dpCW_nominal = 40000
+ parameter Modelica.Units.SI.PressureDifference dpCW_nominal = 40000
"Nominal pressure";
parameter Integer numChi=1 "Number of chillers";
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/CoolingCoilHumidifyingHeating_ClosedLoop.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/CoolingCoilHumidifyingHeating_ClosedLoop.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/CoolingCoilHumidifyingHeating_ClosedLoop.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/CoolingCoilHumidifyingHeating_ClosedLoop.mo" 2021-09-16 11:19:11.054071019 +0200
@@ -12,7 +12,7 @@
offset=273.15 + 13,
height=-6));
- parameter Modelica.SIunits.ThermalConductance UA_nominal=m2_flow_nominal*1006*(T_b2_nominal-T_a2_nominal)/
+ parameter Modelica.Units.SI.ThermalConductance UA_nominal=m2_flow_nominal*1006*(T_b2_nominal-T_a2_nominal)/
Buildings.Fluid.HeatExchangers.BaseClasses.lmtd(
T_a1_nominal,
T_b1_nominal,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/CoolingCoilHumidifyingHeating_OpenLoop.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/CoolingCoilHumidifyingHeating_OpenLoop.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/CoolingCoilHumidifyingHeating_OpenLoop.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/CoolingCoilHumidifyingHeating_OpenLoop.mo" 2021-09-16 11:19:11.030071099 +0200
@@ -4,7 +4,7 @@
extends Modelica.Icons.Example;
extends Buildings.Applications.DataCenters.ChillerCooled.Equipment.Validation.BaseClasses.PartialAirHandlerMassFlow(
sou_2(nPorts=1), relHum(k=0.5));
- parameter Modelica.SIunits.ThermalConductance UA_nominal=m2_flow_nominal*1006*(12-26)/
+ parameter Modelica.Units.SI.ThermalConductance UA_nominal=m2_flow_nominal*1006*(12-26)/
Buildings.Fluid.HeatExchangers.BaseClasses.lmtd(
T_a1_nominal,
T_b1_nominal,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/ElectricChillerParallel.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/ElectricChillerParallel.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/ElectricChillerParallel.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/ElectricChillerParallel.mo" 2021-09-16 11:19:11.010071167 +0200
@@ -5,16 +5,16 @@
package Medium1 = Buildings.Media.Water "Medium model";
package Medium2 = Buildings.Media.Water "Medium model";
- parameter Modelica.SIunits.Power P_nominal = -per1.QEva_flow_nominal/per1.COP_nominal
+ parameter Modelica.Units.SI.Power P_nominal = -per1.QEva_flow_nominal/per1.COP_nominal
"Nominal compressor power (at y=1)";
- parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=10
+ parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=10
"Temperature difference evaporator inlet-outlet";
- parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=10
+ parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=10
"Temperature difference condenser outlet-inlet";
parameter Real COPc_nominal = 3 "Chiller COP";
- parameter Modelica.SIunits.MassFlowRate mEva_flow_nominal = per1.mEva_flow_nominal
+ parameter Modelica.Units.SI.MassFlowRate mEva_flow_nominal = per1.mEva_flow_nominal
"Nominal mass flow rate at evaporator";
- parameter Modelica.SIunits.MassFlowRate mCon_flow_nominal = per1.mCon_flow_nominal
+ parameter Modelica.Units.SI.MassFlowRate mCon_flow_nominal = per1.mCon_flow_nominal
"Nominal mass flow rate at condenser";
parameter Buildings.Fluid.Chillers.Data.ElectricEIR.ElectricEIRChiller_McQuay_WSC_471kW_5_89COP_Vanes
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/HeatExchanger.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/HeatExchanger.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/HeatExchanger.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/HeatExchanger.mo" 2021-09-16 11:19:10.966071315 +0200
@@ -4,13 +4,13 @@
extends Modelica.Icons.Example;
package MediumW = Buildings.Media.Water "Medium model";
- parameter Modelica.SIunits.MassFlowRate m1_flow_nominal=1000 * 0.01035
+ parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal=1000 * 0.01035
"Nominal mass flow rate at evaporator";
- parameter Modelica.SIunits.MassFlowRate m2_flow_nominal=1000 * 0.01035
+ parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal=1000 * 0.01035
"Nominal mass flow rate at condenser";
- parameter Modelica.SIunits.Pressure dp1_nominal=60000
+ parameter Modelica.Units.SI.Pressure dp1_nominal=60000
"Nominal pressure difference on medium 1 side";
- parameter Modelica.SIunits.Pressure dp2_nominal=60000
+ parameter Modelica.Units.SI.Pressure dp2_nominal=60000
"Nominal pressure difference on medium 2 side";
Buildings.Applications.DataCenters.ChillerCooled.Equipment.HeatExchanger_TSet hex1(
m1_flow_nominal=m1_flow_nominal,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/HeatExchanger_ResetController.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/HeatExchanger_ResetController.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/HeatExchanger_ResetController.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/HeatExchanger_ResetController.mo" 2021-09-16 11:19:10.938071410 +0200
@@ -4,13 +4,13 @@
extends Modelica.Icons.Example;
package MediumW = Buildings.Media.Water "Medium model";
- parameter Modelica.SIunits.MassFlowRate m1_flow_nominal=1000 * 0.01035
+ parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal=1000 * 0.01035
"Nominal mass flow rate at evaporator";
- parameter Modelica.SIunits.MassFlowRate m2_flow_nominal=1000 * 0.01035
+ parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal=1000 * 0.01035
"Nominal mass flow rate at condenser";
- parameter Modelica.SIunits.Pressure dp1_nominal=60000
+ parameter Modelica.Units.SI.Pressure dp1_nominal=60000
"Nominal pressure difference on medium 1 side";
- parameter Modelica.SIunits.Pressure dp2_nominal=60000
+ parameter Modelica.Units.SI.Pressure dp2_nominal=60000
"Nominal pressure difference on medium 2 side";
Buildings.Applications.DataCenters.ChillerCooled.Equipment.HeatExchanger_TSet hex1(
m1_flow_nominal=m1_flow_nominal,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/PumpParallel.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/PumpParallel.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/PumpParallel.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/PumpParallel.mo" 2021-09-16 11:19:10.646072394 +0200
@@ -4,7 +4,7 @@
package MediumW = Buildings.Media.Water "Medium model";
parameter Integer numPum=2 "The number of pumps";
- parameter Modelica.SIunits.MassFlowRate m_flow_nominal=6000/3600*1.2
+ parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=6000/3600*1.2
"Nominal mass flow rate";
parameter Real thr1=1E-4 "Threshold for shutoff valves in parallel 1";
parameter Real thr2=thr1*m_flow_nominal "Threshold for shutoff valves in parallel 2";
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/WatersideEconomizer.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/WatersideEconomizer.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/WatersideEconomizer.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/Validation/WatersideEconomizer.mo" 2021-09-16 11:19:10.622072475 +0200
@@ -6,16 +6,16 @@
package MediumCHW = Buildings.Media.Water "Medium model";
package MediumCW = Buildings.Media.Water "Medium model";
- parameter Modelica.SIunits.MassFlowRate mCHW_flow_nominal=2567.1*1000/(
+ parameter Modelica.Units.SI.MassFlowRate mCHW_flow_nominal=2567.1*1000/(
4200*10)
"Nominal mass flow rate at chilled water";
- parameter Modelica.SIunits.MassFlowRate mCW_flow_nominal=2567.1*1000/ (
+ parameter Modelica.Units.SI.MassFlowRate mCW_flow_nominal=2567.1*1000/ (
4200*8.5)
"Nominal mass flow rate at condenser water";
- parameter Modelica.SIunits.PressureDifference dpCHW_nominal = 40000
+ parameter Modelica.Units.SI.PressureDifference dpCHW_nominal = 40000
"Nominal pressure";
- parameter Modelica.SIunits.PressureDifference dpCW_nominal = 40000
+ parameter Modelica.Units.SI.PressureDifference dpCW_nominal = 40000
"Nominal pressure";
parameter Integer numChi=1 "Number of chillers";
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/WatersideEconomizer.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/WatersideEconomizer.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/WatersideEconomizer.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Equipment/WatersideEconomizer.mo" 2021-09-16 11:19:10.594072570 +0200
@@ -24,10 +24,10 @@
annotation(Dialog(tab="Dynamics",group="Filtered opening",enable=use_inputFilter));
// Heat exchanger
- parameter Modelica.SIunits.Efficiency eta(start=0.8) "constant effectiveness";
+ parameter Modelica.Units.SI.Efficiency eta(start=0.8) "constant effectiveness";
// Bypass valve parameters
- parameter Modelica.SIunits.Time tauThrWayVal=10
+ parameter Modelica.Units.SI.Time tauThrWayVal=10
"Time constant at nominal flow for dynamic energy and momentum balance of the three-way valve"
annotation(Dialog(tab="Dynamics", group="Nominal condition",
enable=use_controller and not energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState));
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Examples/BaseClasses/PartialDataCenter.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Examples/BaseClasses/PartialDataCenter.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Examples/BaseClasses/PartialDataCenter.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/ChillerCooled/Examples/BaseClasses/PartialDataCenter.mo" 2021-09-16 11:19:10.546072731 +0200
@@ -6,24 +6,24 @@
// Chiller parameters
parameter Integer numChi=2 "Number of chillers";
- parameter Modelica.SIunits.MassFlowRate m1_flow_chi_nominal= 34.7
+ parameter Modelica.Units.SI.MassFlowRate m1_flow_chi_nominal= 34.7
"Nominal mass flow rate at condenser water in the chillers";
- parameter Modelica.SIunits.MassFlowRate m2_flow_chi_nominal= 18.3
+ parameter Modelica.Units.SI.MassFlowRate m2_flow_chi_nominal= 18.3
"Nominal mass flow rate at evaporator water in the chillers";
- parameter Modelica.SIunits.PressureDifference dp1_chi_nominal = 46.2*1000
+ parameter Modelica.Units.SI.PressureDifference dp1_chi_nominal = 46.2*1000
"Nominal pressure";
- parameter Modelica.SIunits.PressureDifference dp2_chi_nominal = 44.8*1000
+ parameter Modelica.Units.SI.PressureDifference dp2_chi_nominal = 44.8*1000
"Nominal pressure";
- parameter Modelica.SIunits.Power QEva_nominal = m2_flow_chi_nominal*4200*(6.67-18.56)
+ parameter Modelica.Units.SI.Power QEva_nominal = m2_flow_chi_nominal*4200*(6.67-18.56)
"Nominal cooling capaciaty(Negative means cooling)";
// WSE parameters
- parameter Modelica.SIunits.MassFlowRate m1_flow_wse_nominal= 34.7
+ parameter Modelica.Units.SI.MassFlowRate m1_flow_wse_nominal= 34.7
"Nominal mass flow rate at condenser water in the chillers";
- parameter Modelica.SIunits.MassFlowRate m2_flow_wse_nominal= 35.3
+ parameter Modelica.Units.SI.MassFlowRate m2_flow_wse_nominal= 35.3
"Nominal mass flow rate at condenser water in the chillers";
- parameter Modelica.SIunits.PressureDifference dp1_wse_nominal = 33.1*1000
+ parameter Modelica.Units.SI.PressureDifference dp1_wse_nominal = 33.1*1000
"Nominal pressure";
- parameter Modelica.SIunits.PressureDifference dp2_wse_nominal = 34.5*1000
+ parameter Modelica.Units.SI.PressureDifference dp2_wse_nominal = 34.5*1000
"Nominal pressure";
parameter Buildings.Fluid.Movers.Data.Generic[numChi] perPumCW(
@@ -32,28 +32,28 @@
V_flow=m1_flow_chi_nominal/1000*{0.2,0.6,1.0,1.2},
dp=(dp1_chi_nominal+60000+6000)*{1.2,1.1,1.0,0.6}))
"Performance data for condenser water pumps";
- parameter Modelica.SIunits.Time tWai=1200 "Waiting time";
+ parameter Modelica.Units.SI.Time tWai=1200 "Waiting time";
// AHU
- parameter Modelica.SIunits.ThermalConductance UA_nominal=numChi*QEva_nominal/
+ parameter Modelica.Units.SI.ThermalConductance UA_nominal=numChi*QEva_nominal/
Buildings.Fluid.HeatExchangers.BaseClasses.lmtd(
6.67,
11.56,
12,
25)
"Thermal conductance at nominal flow for sensible heat, used to compute time constant";
- parameter Modelica.SIunits.MassFlowRate mAir_flow_nominal = 161.35
+ parameter Modelica.Units.SI.MassFlowRate mAir_flow_nominal = 161.35
"Nominal air mass flowrate";
parameter Real yValMinAHU(min=0,max=1,unit="1")=0.1
"Minimum valve openning position";
// Set point
- parameter Modelica.SIunits.Temperature TCHWSet = 273.15 + 8
+ parameter Modelica.Units.SI.Temperature TCHWSet = 273.15 + 8
"Chilled water temperature setpoint";
- parameter Modelica.SIunits.Temperature TSupAirSet = TCHWSet + 10
+ parameter Modelica.Units.SI.Temperature TSupAirSet = TCHWSet + 10
"Supply air temperature setpoint";
- parameter Modelica.SIunits.Temperature TRetAirSet = 273.15 + 25
+ parameter Modelica.Units.SI.Temperature TRetAirSet = 273.15 + 25
"Supply air temperature setpoint";
- parameter Modelica.SIunits.Pressure dpSetPoi = 80000
+ parameter Modelica.Units.SI.Pressure dpSetPoi = 80000
"Differential pressure setpoint";
replaceable Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.PartialChillerWSE chiWSE(
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/DXCooled/Controls/AirsideEconomizer.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/DXCooled/Controls/AirsideEconomizer.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/DXCooled/Controls/AirsideEconomizer.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/DXCooled/Controls/AirsideEconomizer.mo" 2021-09-16 11:19:10.334073446 +0200
@@ -4,7 +4,7 @@
parameter Real gai(min=Modelica.Constants.small) = 1
"Gain of controller"
annotation(Dialog(group="Control"));
- parameter Modelica.SIunits.Time Ti = 50
+ parameter Modelica.Units.SI.Time Ti = 50
"Integrator time"
annotation(Dialog(group="Control"));
parameter Real minOAFra(min=0,max=1, final unit="1")
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/DXCooled/Controls/Compressor.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/DXCooled/Controls/Compressor.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/DXCooled/Controls/Compressor.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/DXCooled/Controls/Compressor.mo" 2021-09-16 11:19:10.310073527 +0200
@@ -2,7 +2,7 @@
model Compressor "Controller for compressor speed"
parameter Real k=0.5 "Gain of controller";
- parameter Modelica.SIunits.Time Ti=240 "Time constant of integrator block";
+ parameter Modelica.Units.SI.Time Ti=240 "Time constant of integrator block";
parameter Real yMax=1 "Upper limit of output";
parameter Real yMin=0 "Lower limit of output";
parameter Boolean reverseAction=true
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/DXCooled/Controls/CoolingMode.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/DXCooled/Controls/CoolingMode.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/DXCooled/Controls/CoolingMode.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/DXCooled/Controls/CoolingMode.mo" 2021-09-16 11:19:10.286073608 +0200
@@ -2,8 +2,8 @@
model CoolingMode
"Controller for the DX cooling system with an airside economizer"
- parameter Modelica.SIunits.Time tWai "Waiting time, set to avoid frequent switching";
- parameter Modelica.SIunits.TemperatureDifference dT(min=0.1) = 1.1 "Deadband";
+ parameter Modelica.Units.SI.Time tWai "Waiting time, set to avoid frequent switching";
+ parameter Modelica.Units.SI.TemperatureDifference dT(min=0.1) = 1.1 "Deadband";
Modelica.Blocks.Interfaces.RealInput TOutDryBul(
final quantity="ThermodynamicTemperature",
@@ -40,12 +40,12 @@
extent={{-10,10},{10,-10}},
rotation=-90,
origin={0,8})));
- Modelica.StateGraph.InitialStepWithSignal freCoo(nIn=1) "Free cooling mode"
+ Modelica.StateGraph.InitialStepWithSignal freCoo(nOut = 1, nIn = 1) "Free cooling mode"
annotation (Placement(transformation(
extent={{-10,10},{10,-10}},
rotation=-90,
origin={0,58})));
- Modelica.StateGraph.StepWithSignal fulMecCoo "Fully mechanical cooling mode"
+ Modelica.StateGraph.StepWithSignal fulMecCoo(nIn = 1, nOut = 1) "Fully mechanical cooling mode"
annotation (Placement(transformation(
extent={{-10,10},{10,-10}},
rotation=-90,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/DXCooled/Controls/Validation/AirsideEconomizer.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/DXCooled/Controls/Validation/AirsideEconomizer.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/DXCooled/Controls/Validation/AirsideEconomizer.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/DXCooled/Controls/Validation/AirsideEconomizer.mo" 2021-09-16 11:19:10.246073743 +0200
@@ -5,7 +5,7 @@
extends Modelica.Icons.Example;
replaceable package Medium =
Buildings.Media.Air;
- parameter Modelica.SIunits.MassFlowRate mA_flow_nominal=0.43
+ parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal=0.43
"Nominal air flowrate";
Buildings.Applications.DataCenters.DXCooled.Controls.AirsideEconomizer con(
minOAFra= 0,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/DXCooled/Controls/Validation/Compressor.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/DXCooled/Controls/Validation/Compressor.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/DXCooled/Controls/Validation/Compressor.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/DXCooled/Controls/Validation/Compressor.mo" 2021-09-16 11:19:10.222073824 +0200
@@ -11,7 +11,7 @@
annotation (Placement(transformation(extent={{-60,60},{-40,80}})));
Modelica.Blocks.Sources.Sine TSupMea(
amplitude=2,
- freqHz=1/120,
+f =1/120,
offset=291.15) "Measured supply air temperature"
annotation (Placement(transformation(extent={{-60,10},{-40,30}})));
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/DXCooled/Examples/DXCooledAirsideEconomizer.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/DXCooled/Examples/DXCooledAirsideEconomizer.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/DXCooled/Examples/DXCooledAirsideEconomizer.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Applications/DataCenters/DXCooled/Examples/DXCooledAirsideEconomizer.mo" 2021-09-16 11:19:10.186073945 +0200
@@ -18,24 +18,24 @@
replaceable package Medium = Buildings.Media.Air "Medium model";
// Air temperatures at design conditions
- parameter Modelica.SIunits.Temperature TASup_nominal = 286.15
+ parameter Modelica.Units.SI.Temperature TASup_nominal = 286.15
"Nominal air temperature supplied to room";
- parameter Modelica.SIunits.Temperature TRooSet = 298.15
+ parameter Modelica.Units.SI.Temperature TRooSet = 298.15
"Nominal room air temperature";
- parameter Modelica.SIunits.Temperature TAirSupSet = 291.13
+ parameter Modelica.Units.SI.Temperature TAirSupSet = 291.13
"Nominal room air temperature";
/////////////////////////////////////////////////////////
// Cooling loads
- parameter Modelica.SIunits.HeatFlowRate QRooInt_flow=
+ parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow=
500000 "Internal heat gains of the room";
- parameter Modelica.SIunits.HeatFlowRate QRooC_flow_nominal=
+ parameter Modelica.Units.SI.HeatFlowRate QRooC_flow_nominal=
-2*QRooInt_flow;
////////////////////////////////////////////////////////////
// DX Coil
- parameter Modelica.SIunits.MassFlowRate mA_flow_nominal=
+ parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal=
QRooC_flow_nominal/1006/(TASup_nominal-TRooSet)
"Nominal air mass flow rate";
- parameter Modelica.SIunits.HeatFlowRate QCoiC_flow_nominal=
+ parameter Modelica.Units.SI.HeatFlowRate QCoiC_flow_nominal=
QRooC_flow_nominal
"Cooling load of coil";
parameter Real minSpeFan = 0.2
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SkyTemperature/BlackBody.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SkyTemperature/BlackBody.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SkyTemperature/BlackBody.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SkyTemperature/BlackBody.mo" 2021-09-16 11:19:09.902074903 +0200
@@ -31,8 +31,8 @@
nominal=100) "Horizontal infrared irradiation"
annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
protected
- Modelica.SIunits.Temperature TDewPoiK "Dewpoint temperature";
- Modelica.SIunits.Emissivity epsSky "Black-body absorptivity of sky";
+ Modelica.Units.SI.Temperature TDewPoiK "Dewpoint temperature";
+ Modelica.Units.SI.Emissivity epsSky "Black-body absorptivity of sky";
Real nOpa10(min=0, max=10) "Opaque sky cover in [0, 10]";
equation
if calTSky == Buildings.BoundaryConditions.Types.SkyTemperatureCalculation.TemperaturesAndSkyCover then
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo" 2021-09-16 11:19:09.782075308 +0200
@@ -1,7 +1,7 @@
within Buildings.BoundaryConditions.SolarGeometry.BaseClasses.Examples;
model SolarAzimuth "Test model for zenith angle"
extends Modelica.Icons.Example;
- parameter Modelica.SIunits.Angle lat= 41.98*Modelica.Constants.pi/180
+ parameter Modelica.Units.SI.Angle lat= 41.98*Modelica.Constants.pi/180
"Latitude";
Buildings.BoundaryConditions.SolarGeometry.BaseClasses.SolarHourAngle
solHouAng "Solar hour angle"
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo" 2021-09-16 11:19:09.750075415 +0200
@@ -17,7 +17,7 @@
Buildings.BoundaryConditions.SolarGeometry.BaseClasses.AltitudeAngle altAng
"Altitude angle"
annotation (Placement(transformation(extent={{-20,20},{0,40}})));
- parameter Modelica.SIunits.Angle lat=41.98*Modelica.Constants.pi/180
+ parameter Modelica.Units.SI.Angle lat=41.98*Modelica.Constants.pi/180
"Latitude";
equation
connect(weaDat.weaBus, weaBus) annotation (Line(
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo" 2021-09-16 11:19:09.714075537 +0200
@@ -1,10 +1,10 @@
within Buildings.BoundaryConditions.SolarGeometry.BaseClasses;
block IncidenceAngle "The solar incidence angle on a tilted surface"
extends Modelica.Blocks.Icons.Block;
- parameter Modelica.SIunits.Angle lat "Latitude";
- parameter Modelica.SIunits.Angle azi(displayUnit="deg")
+ parameter Modelica.Units.SI.Angle lat "Latitude";
+ parameter Modelica.Units.SI.Angle azi(displayUnit="deg")
"Surface azimuth. azi=-90 degree if surface outward unit normal points toward east; azi=0 if it points toward south";
- parameter Modelica.SIunits.Angle til(displayUnit="deg")
+ parameter Modelica.Units.SI.Angle til(displayUnit="deg")
"Surface tilt. til=90 degree for walls; til=0 for ceilings; til=180 for roof";
Modelica.Blocks.Interfaces.RealInput solHouAng(quantity="Angle", unit="rad")
"Solar hour angle"
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo" 2021-09-16 11:19:09.694075604 +0200
@@ -1,7 +1,7 @@
within Buildings.BoundaryConditions.SolarGeometry.BaseClasses;
block SolarAzimuth "Solar azimuth"
extends Modelica.Blocks.Icons.Block;
- parameter Modelica.SIunits.Angle lat "Latitude";
+ parameter Modelica.Units.SI.Angle lat "Latitude";
Modelica.Blocks.Interfaces.RealInput zen(quantity="Angle", unit="rad")
"Zenith angle"
annotation (Placement(transformation(extent={{-140,40},{-100,80}})));
@@ -22,8 +22,8 @@
Real tmp "cos(solAzi) before data validity check";
Real solAziTem "Temporary variable for solar azimuth";
- constant Modelica.SIunits.Time day=86400 "Number of seconds in a day";
- constant Modelica.SIunits.Angle polarCircle = 1.1617
+ constant Modelica.Units.SI.Time day=86400 "Number of seconds in a day";
+ constant Modelica.Units.SI.Angle polarCircle = 1.1617
"Latitude of polar circle (66 degree 33 min 44 sec)";
final parameter Boolean outsidePolarCircle = lat < polarCircle and lat > -polarCircle
"Flag, true if latitude is outside polar region";
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo" 2021-09-16 11:19:09.666075699 +0200
@@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo" 2021-09-16 11:19:09.654075739 +0200
@@ -1,7 +1,7 @@
within Buildings.BoundaryConditions.SolarGeometry.BaseClasses;
block ZenithAngle "Zenith angle"
extends Modelica.Blocks.Icons.Block;
- parameter Modelica.SIunits.Angle lat "Latitude";
+ parameter Modelica.Units.SI.Angle lat "Latitude";
Modelica.Blocks.Interfaces.RealInput solHouAng(quantity="Angle", unit="rad")
"Solar hour angle"
annotation (Placement(transformation(extent={{-140,-68},{-100,-28}})));
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/Examples/ProjectedShadowLength.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/Examples/ProjectedShadowLength.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/Examples/ProjectedShadowLength.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/Examples/ProjectedShadowLength.mo" 2021-09-16 11:19:09.618075860 +0200
@@ -1,7 +1,7 @@
within Buildings.BoundaryConditions.SolarGeometry.Examples;
model ProjectedShadowLength "Test model for projected shadow length"
extends Modelica.Icons.Example;
- parameter Modelica.SIunits.Length h = 2 "Height of object";
+ parameter Modelica.Units.SI.Length h = 2 "Height of object";
Buildings.BoundaryConditions.SolarGeometry.ProjectedShadowLength proShaLenEas(
azi=Buildings.Types.Azimuth.E,
h=h,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/IncidenceAngle.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/IncidenceAngle.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/IncidenceAngle.mo" 2021-09-16 11:15:38.330780816 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/IncidenceAngle.mo" 2021-09-16 11:19:09.598075928 +0200
@@ -1,9 +1,9 @@
within Buildings.BoundaryConditions.SolarGeometry;
block IncidenceAngle "Solar incidence angle on a tilted surface"
extends Modelica.Blocks.Icons.Block;
- parameter Modelica.SIunits.Angle lat "Latitude";
- parameter Modelica.SIunits.Angle azi "Surface azimuth";
- parameter Modelica.SIunits.Angle til "Surface tilt";
+ parameter Modelica.Units.SI.Angle lat "Latitude";
+ parameter Modelica.Units.SI.Angle azi "Surface azimuth";
+ parameter Modelica.Units.SI.Angle til "Surface tilt";
Modelica.Blocks.Interfaces.RealOutput y(
final quantity="Angle",
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/ProjectedShadowLength.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/ProjectedShadowLength.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/ProjectedShadowLength.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/ProjectedShadowLength.mo" 2021-09-16 11:19:09.578075995 +0200
@@ -9,18 +9,18 @@
caption="Select weather file"),
group="Location"));
- parameter Modelica.SIunits.Angle lon(displayUnit="deg")=
+ parameter Modelica.Units.SI.Angle lon(displayUnit="deg")=
Buildings.BoundaryConditions.WeatherData.BaseClasses.getLongitudeTMY3(
absFilNam) "Longitude" annotation (Evaluate=true, Dialog(group="Location"));
- parameter Modelica.SIunits.Angle lat(displayUnit="deg")=
+ parameter Modelica.Units.SI.Angle lat(displayUnit="deg")=
Buildings.BoundaryConditions.WeatherData.BaseClasses.getLatitudeTMY3(
absFilNam) "Latitude" annotation (Evaluate=true, Dialog(group="Location"));
- parameter Modelica.SIunits.Time timZon(displayUnit="h")=
+ parameter Modelica.Units.SI.Time timZon(displayUnit="h")=
Buildings.BoundaryConditions.WeatherData.BaseClasses.getTimeZoneTMY3(absFilNam)
"Time zone" annotation (Evaluate=true, Dialog(group="Location"));
- parameter Modelica.SIunits.Length h "Height of surface";
- parameter Modelica.SIunits.Angle azi "Surface azimuth";
+ parameter Modelica.Units.SI.Length h "Height of surface";
+ parameter Modelica.Units.SI.Angle azi "Surface azimuth";
Modelica.Blocks.Interfaces.RealOutput y(
final quantity="Length",
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/ZenithAngle.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/ZenithAngle.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/ZenithAngle.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarGeometry/ZenithAngle.mo" 2021-09-16 11:19:09.538076130 +0200
@@ -1,7 +1,7 @@
within Buildings.BoundaryConditions.SolarGeometry;
block ZenithAngle "Zenith angle"
extends Modelica.Blocks.Icons.Block;
- parameter Modelica.SIunits.Angle lat "Latitude";
+ parameter Modelica.Units.SI.Angle lat "Latitude";
Modelica.Blocks.Interfaces.RealOutput y(
final quantity="Angle",
final unit="rad",
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo" 2021-09-16 11:19:09.494076279 +0200
@@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo" 2021-09-16 11:19:09.478076333 +0200
@@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo" 2021-09-16 11:19:09.214077223 +0200
@@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo" 2021-09-16 11:19:09.178077344 +0200
@@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarIrradiation/DiffusePerez.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarIrradiation/DiffusePerez.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarIrradiation/DiffusePerez.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarIrradiation/DiffusePerez.mo" 2021-09-16 11:19:09.146077452 +0200
@@ -5,8 +5,8 @@
Buildings.BoundaryConditions.SolarIrradiation.BaseClasses.PartialSolarIrradiation;
parameter Real rho(min=0, max=1, final unit="1")=0.2 "Ground reflectance";
- parameter Modelica.SIunits.Angle lat "Latitude";
- parameter Modelica.SIunits.Angle azi "Surface azimuth";
+ parameter Modelica.Units.SI.Angle lat "Latitude";
+ parameter Modelica.Units.SI.Angle azi "Surface azimuth";
parameter Boolean outSkyCon=false
"Output contribution of diffuse irradiation from sky";
parameter Boolean outGroCon=false
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo" 2021-09-16 11:19:09.114077560 +0200
@@ -3,8 +3,8 @@
extends
Buildings.BoundaryConditions.SolarIrradiation.BaseClasses.PartialSolarIrradiation;
- parameter Modelica.SIunits.Angle lat "Latitude";
- parameter Modelica.SIunits.Angle azi "Surface azimuth";
+ parameter Modelica.Units.SI.Angle lat "Latitude";
+ parameter Modelica.Units.SI.Angle azi "Surface azimuth";
Modelica.Blocks.Interfaces.RealOutput inc(
final quantity="Angle",
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo" 2021-09-16 11:19:09.074077695 +0200
@@ -2,9 +2,9 @@
model DiffusePerez
"Test model for diffuse solar irradiation on a tilted surface using the Perez model"
extends Modelica.Icons.Example;
- parameter Modelica.SIunits.Angle lat=37/180*Modelica.Constants.pi "Latitude";
- parameter Modelica.SIunits.Angle azi=0.3 "Azi angle";
- parameter Modelica.SIunits.Angle til=0.5 "Tilted angle";
+ parameter Modelica.Units.SI.Angle lat=37/180*Modelica.Constants.pi "Latitude";
+ parameter Modelica.Units.SI.Angle azi=0.3 "Azi angle";
+ parameter Modelica.Units.SI.Angle til=0.5 "Tilted angle";
Buildings.BoundaryConditions.WeatherData.ReaderTMY3 weaDat(filNam=
Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos"))
annotation (Placement(transformation(extent={{-40,0},{-20,20}})));
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo" 2021-09-16 11:19:09.050077776 +0200
@@ -2,7 +2,7 @@
model DirectTiltedSurface
"Test model for direct solar irradiation on a tilted surface"
extends Modelica.Icons.Example;
- parameter Modelica.SIunits.Angle lat=37/180*Modelica.Constants.pi "Latitude";
+ parameter Modelica.Units.SI.Angle lat=37/180*Modelica.Constants.pi "Latitude";
Buildings.BoundaryConditions.WeatherData.ReaderTMY3 weaDat(filNam=
Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos"))
annotation (Placement(transformation(extent={{-60,20},{-40,40}})));
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/CheckBlackBodySkyTemperature.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/CheckBlackBodySkyTemperature.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/CheckBlackBodySkyTemperature.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/CheckBlackBodySkyTemperature.mo" 2021-09-16 11:19:08.998077951 +0200
@@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/CheckDewPointTemperature.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/CheckDewPointTemperature.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/CheckDewPointTemperature.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/CheckDewPointTemperature.mo" 2021-09-16 11:19:08.982078005 +0200
@@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/CheckDryBulbTemperature.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/CheckDryBulbTemperature.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/CheckDryBulbTemperature.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/CheckDryBulbTemperature.mo" 2021-09-16 11:19:08.966078059 +0200
@@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo" 2021-09-16 11:19:08.954078099 +0200
@@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo" 2021-09-16 11:19:08.942078140 +0200
@@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo" 2021-09-16 11:19:08.670079056 +0200
@@ -1,11 +1,11 @@
within Buildings.BoundaryConditions.WeatherData.BaseClasses.Examples;
model GetHeaderElement "Test model to get header element"
extends Modelica.Icons.Example;
- parameter Modelica.SIunits.Angle longitude(fixed=false, displayUnit="deg")
+ parameter Modelica.Units.SI.Angle longitude(fixed=false, displayUnit="deg")
"Longitude";
- parameter Modelica.SIunits.Angle latitude(fixed=false, displayUnit="deg")
+ parameter Modelica.Units.SI.Angle latitude(fixed=false, displayUnit="deg")
"Latitude";
- parameter Modelica.SIunits.Time timeZone(fixed=false, displayUnit="h")
+ parameter Modelica.Units.SI.Time timeZone(fixed=false, displayUnit="h")
"Time zone";
parameter String filNam = Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos")
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3.mo" 2021-09-16 11:19:08.658079096 +0200
@@ -7,13 +7,13 @@
"Name of weather data file";
parameter String tabNam = "tab1" "Name of table on weather file";
- parameter Modelica.SIunits.Time[2] timeSpan(each fixed=false)
+ parameter Modelica.Units.SI.Time[2] timeSpan(each fixed=false)
"Start time, end time of weather data";
protected
- constant Modelica.SIunits.Time endTim = 365*24*3600.;
- constant Modelica.SIunits.Time staTim = 0.;
+ constant Modelica.Units.SI.Time endTim = 365*24*3600.;
+ constant Modelica.Units.SI.Time staTim = 0.;
initial equation
timeSpan = Buildings.BoundaryConditions.WeatherData.BaseClasses.getTimeSpanTMY3(
filNam, tabNam);
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo" 2021-09-16 11:19:08.542079487 +0200
@@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/SourceSelectorRadiation.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/SourceSelectorRadiation.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/SourceSelectorRadiation.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/SourceSelectorRadiation.mo" 2021-09-16 11:19:08.482079690 +0200
@@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo" 2021-09-16 11:19:08.430079865 +0200
@@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo" 2021-09-16 11:19:08.418079905 +0200
@@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/getTimeSpanTMY3.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/getTimeSpanTMY3.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/getTimeSpanTMY3.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/getTimeSpanTMY3.mo" 2021-09-16 11:19:08.406079946 +0200
@@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo" 2021-09-16 11:19:08.394079986 +0200
@@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/ReaderTMY3.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/ReaderTMY3.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/ReaderTMY3.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/ReaderTMY3.mo" 2021-09-16 11:19:08.358080108 +0200
@@ -18,7 +18,7 @@
parameter Buildings.BoundaryConditions.Types.DataSource pAtmSou=Buildings.BoundaryConditions.Types.DataSource.Parameter
"Atmospheric pressure"
annotation (Evaluate=true, HideResult=true, Dialog(tab="Data source"));
- parameter Modelica.SIunits.Pressure pAtm=101325
+ parameter Modelica.Units.SI.Pressure pAtm=101325
"Atmospheric pressure (used if pAtmSou=Parameter)"
annotation (Dialog(tab="Data source"));
Modelica.Blocks.Interfaces.RealInput pAtm_in(
@@ -34,7 +34,7 @@
parameter Buildings.BoundaryConditions.Types.DataSource TDryBulSou=Buildings.BoundaryConditions.Types.DataSource.File
"Dry bulb temperature"
annotation (Evaluate=true, HideResult=true, Dialog(tab="Data source"));
- parameter Modelica.SIunits.Temperature TDryBul(displayUnit="degC") = 293.15
+ parameter Modelica.Units.SI.Temperature TDryBul(displayUnit="degC") = 293.15
"Dry bulb temperature (used if TDryBul=Parameter)"
annotation (Dialog(tab="Data source"));
Modelica.Blocks.Interfaces.RealInput TDryBul_in(
@@ -49,7 +49,7 @@
parameter Buildings.BoundaryConditions.Types.DataSource TDewPoiSou=Buildings.BoundaryConditions.Types.DataSource.File
"Dew point temperature"
annotation (Evaluate=true, HideResult=true, Dialog(tab="Data source"));
- parameter Modelica.SIunits.Temperature TDewPoi(displayUnit="degC") = 283.15
+ parameter Modelica.Units.SI.Temperature TDewPoi(displayUnit="degC") = 283.15
"Dew point temperature (used if TDewPoi=Parameter)"
annotation (Dialog(tab="Data source"));
Modelica.Blocks.Interfaces.RealInput TDewPoi_in(
@@ -63,7 +63,7 @@
// Black body sky temperature
parameter Buildings.BoundaryConditions.Types.DataSource TBlaSkySou=Buildings.BoundaryConditions.Types.DataSource.File
"Black-body sky temperature" annotation (Evaluate=true, HideResult=true, Dialog(tab="Data source"));
- parameter Modelica.SIunits.Temperature TBlaSky=273.15
+ parameter Modelica.Units.SI.Temperature TBlaSky=273.15
"Black-body sky temperature (used if TBlaSkySou=Parameter)"
annotation (Dialog(tab="Data source"));
Modelica.Blocks.Interfaces.RealInput TBlaSky_in(
@@ -94,7 +94,7 @@
// Wind speed
parameter Buildings.BoundaryConditions.Types.DataSource winSpeSou=Buildings.BoundaryConditions.Types.DataSource.File
"Wind speed" annotation (Evaluate=true, HideResult=true, Dialog(tab="Data source"));
- parameter Modelica.SIunits.Velocity winSpe(min=0) = 1
+ parameter Modelica.Units.SI.Velocity winSpe(min=0) = 1
"Wind speed (used if winSpe=Parameter)"
annotation (Dialog(tab="Data source"));
Modelica.Blocks.Interfaces.RealInput winSpe_in(
@@ -108,7 +108,7 @@
// Wind direction
parameter Buildings.BoundaryConditions.Types.DataSource winDirSou=Buildings.BoundaryConditions.Types.DataSource.File
"Wind direction" annotation (Evaluate=true, HideResult=true, Dialog(tab="Data source"));
- parameter Modelica.SIunits.Angle winDir=1.0
+ parameter Modelica.Units.SI.Angle winDir=1.0
"Wind direction (used if winDir=Parameter)"
annotation (Dialog(tab="Data source"));
Modelica.Blocks.Interfaces.RealInput winDir_in(
@@ -122,7 +122,7 @@
// Infrared horizontal radiation
parameter Buildings.BoundaryConditions.Types.DataSource HInfHorSou=Buildings.BoundaryConditions.Types.DataSource.File
"Infrared horizontal radiation" annotation (Evaluate=true, HideResult=true, Dialog(tab="Data source"));
- parameter Modelica.SIunits.HeatFlux HInfHor=0.0
+ parameter Modelica.Units.SI.HeatFlux HInfHor=0.0
"Infrared horizontal radiation (used if HInfHorSou=Parameter)"
annotation (Dialog(tab="Data source"));
Modelica.Blocks.Interfaces.RealInput HInfHor_in(
@@ -222,18 +222,18 @@
Evaluate=true,
Dialog(tab="Advanced", group="Sky temperature"));
- final parameter Modelica.SIunits.Angle lon(displayUnit="deg")=
+ final parameter Modelica.Units.SI.Angle lon(displayUnit="deg")=
Buildings.BoundaryConditions.WeatherData.BaseClasses.getLongitudeTMY3(
filNam) "Longitude";
- final parameter Modelica.SIunits.Angle lat(displayUnit="deg")=
+ final parameter Modelica.Units.SI.Angle lat(displayUnit="deg")=
Buildings.BoundaryConditions.WeatherData.BaseClasses.getLatitudeTMY3(
filNam) "Latitude";
- final parameter Modelica.SIunits.Time timZon(displayUnit="h")=
+ final parameter Modelica.Units.SI.Time timZon(displayUnit="h")=
Buildings.BoundaryConditions.WeatherData.BaseClasses.getTimeZoneTMY3(filNam)
"Time zone";
protected
- final parameter Modelica.SIunits.Time[2] timeSpan=
+ final parameter Modelica.Units.SI.Time[2] timeSpan=
Buildings.BoundaryConditions.WeatherData.BaseClasses.getTimeSpanTMY3(filNam, "tab1")
"Start time, end time of weather data";
@@ -424,12 +424,13 @@
"Check black body sky temperature"
annotation (Placement(transformation(extent={{240,-140},{260,-120}})));
+
// Blocks that are added in order to set the name of the output signal,
// which then is displayed in the GUI of the weather data connector.
block Latitude "Generate constant signal of type Real"
extends Modelica.Blocks.Icons.Block;
- parameter Modelica.SIunits.Angle latitude "Latitude";
+ parameter Modelica.Units.SI.Angle latitude "Latitude";
Modelica.Blocks.Interfaces.RealOutput y(
unit="rad",
@@ -473,7 +474,7 @@
block Longitude "Generate constant signal of type Real"
extends Modelica.Blocks.Icons.Block;
- parameter Modelica.SIunits.Angle longitude "Longitude";
+ parameter Modelica.Units.SI.Angle longitude "Longitude";
Modelica.Blocks.Interfaces.RealOutput y(
unit="rad",
@@ -513,7 +514,6 @@
"));
end Longitude;
-
equation
connect(modTim.y, add30Min.u2) annotation (Line(points={{-139,0},{-128,0},{-128,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mo" 2021-09-16 11:19:07.894081672 +0200
@@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/Examples/LimPID.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/Examples/LimPID.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/Examples/LimPID.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/Examples/LimPID.mo" 2021-09-16 11:19:07.814081941 +0200
@@ -10,7 +10,7 @@
Td=1,
yMax=1,
yMin=-1,
- initType=Modelica.Blocks.Types.InitPID.InitialState)
+ initType=Modelica.Blocks.Types.Init.InitialState)
annotation (Placement(transformation(extent={{-20,30},{0,50}})));
Buildings.Controls.Continuous.LimPID limPIDRev(
controllerType=Modelica.Blocks.Types.SimpleController.PID,
@@ -19,7 +19,7 @@
Td=1,
yMax=1,
yMin=-1,
- initType=Modelica.Blocks.Types.InitPID.InitialState)
+ initType=Modelica.Blocks.Types.Init.InitialState)
"Controller with reverse action"
annotation (Placement(transformation(extent={{-20,-20},{0,0}})));
Modelica.Blocks.Sources.Constant const(k=0.5)
@@ -35,7 +35,7 @@
Td=1,
yMax=1,
yMin=-1,
- initType=Modelica.Blocks.Types.InitPID.InitialState)
+ initType=Modelica.Blocks.Types.Init.InitialState)
annotation (Placement(transformation(extent={{-20,70},{0,90}})));
Buildings.Utilities.Diagnostics.AssertEquality assertEquality1(
threShold=1e-3)
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/Examples/NumberOfRequests.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/Examples/NumberOfRequests.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/Examples/NumberOfRequests.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/Examples/NumberOfRequests.mo" 2021-09-16 11:19:07.762082117 +0200
@@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/Examples/PIDHysteresis.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/Examples/PIDHysteresis.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/Examples/PIDHysteresis.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/Examples/PIDHysteresis.mo" 2021-09-16 11:19:07.738082198 +0200
@@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/Examples/PIDHysteresisTimer.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/Examples/PIDHysteresisTimer.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/Examples/PIDHysteresisTimer.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/Examples/PIDHysteresisTimer.mo" 2021-09-16 11:19:07.714082279 +0200
@@ -26,7 +26,7 @@
Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow Q_flow
annotation (Placement(transformation(extent={{16,20},{36,40}})));
Modelica.Blocks.Sources.Sine sine(
- freqHz=1/86400,
+ f =1/86400,
offset=273.15,
amplitude=20,
phase=-1.5707963267949)
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/Examples/SignalRanker.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/Examples/SignalRanker.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/Examples/SignalRanker.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/Examples/SignalRanker.mo" 2021-09-16 11:19:07.690082359 +0200
@@ -1,14 +1,14 @@
within Buildings.Controls.Continuous.Examples;
model SignalRanker "Example model for signal ranker"
extends Modelica.Icons.Example;
- Modelica.Blocks.Sources.Sine sine(freqHz=2)
+ Modelica.Blocks.Sources.Sine sine(f =2)
annotation (Placement(transformation(extent={{-60,-20},{-40,0}})));
Modelica.Blocks.Sources.Pulse pulse(period=0.25)
annotation (Placement(transformation(extent={{-60,20},{-40,40}})));
Buildings.Controls.Continuous.SignalRanker sigRan(
nin=3)
annotation (Placement(transformation(extent={{-20,20},{0,40}})));
- Modelica.Blocks.Sources.ExpSine expSine(freqHz=10, damping=1)
+ Modelica.Blocks.Sources.ExpSine expSine(f =10, damping=1)
annotation (Placement(transformation(extent={{-60,60},{-40,80}})));
equation
connect(sine.y, sigRan.u[1]) annotation (Line(points={{-39,-10},{-32,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/LimPID.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/LimPID.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/LimPID.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/LimPID.mo" 2021-09-16 11:19:07.674082413 +0200
@@ -9,11 +9,11 @@
parameter Modelica.Blocks.Types.SimpleController controllerType=
Modelica.Blocks.Types.SimpleController.PID "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 reverseAction then -1 else 1
"Switch for sign for reverse action";
@@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/OffTimer.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/OffTimer.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/OffTimer.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/OffTimer.mo" 2021-09-16 11:19:07.578082737 +0200
@@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/PIDHysteresis.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/PIDHysteresis.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/PIDHysteresis.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/PIDHysteresis.mo" 2021-09-16 11:19:07.562082791 +0200
@@ -17,9 +17,9 @@
annotation (Dialog(group="Set point tracking"));
parameter Real k=1 "Gain of controller"
annotation (Dialog(group="Set point tracking"));
- parameter Modelica.SIunits.Time Ti "Time constant of Integrator block"
+ parameter Modelica.Units.SI.Time Ti "Time constant of Integrator block"
annotation (Dialog(group="Set point tracking"));
- parameter Modelica.SIunits.Time Td "Time constant of Derivative block"
+ parameter Modelica.Units.SI.Time Td "Time constant of Derivative block"
annotation (Dialog(group="Set point tracking"));
parameter Real yMax=1 "Upper limit of output"
annotation (Dialog(group="Set point tracking"));
@@ -37,7 +37,7 @@
"Set to true to enable reverse action (such as for a cooling coil controller)"
annotation (Dialog(group="Set point tracking"));
- parameter Modelica.Blocks.Types.InitPID initType=Modelica.Blocks.Types.InitPID.DoNotUse_InitialIntegratorState
+ parameter Modelica.Blocks.Types.Init initType=Modelica.Blocks.Types.Init.InitialState
"Type of initialization (1: no init, 2: steady state, 3: initial state, 4: initial output)"
annotation (Dialog(group="Initialization"));
parameter Real xi_start=0
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/PIDHysteresisTimer.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/PIDHysteresisTimer.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/PIDHysteresisTimer.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/PIDHysteresisTimer.mo" 2021-09-16 11:19:07.530082899 +0200
@@ -20,9 +20,9 @@
annotation (Dialog(group="Set point tracking"));
parameter Real k=1 "Gain of controller"
annotation (Dialog(group="Set point tracking"));
- parameter Modelica.SIunits.Time Ti "Time constant of Integrator block"
+ parameter Modelica.Units.SI.Time Ti "Time constant of Integrator block"
annotation (Dialog(group="Set point tracking"));
- parameter Modelica.SIunits.Time Td "Time constant of Derivative block"
+ parameter Modelica.Units.SI.Time Td "Time constant of Derivative block"
annotation (Dialog(group="Set point tracking"));
parameter Real yMax=1 "Upper limit of modulating output"
annotation (Dialog(group="Set point tracking"));
@@ -41,7 +41,7 @@
"Set to true to enable reverse action (such as for a cooling coil controller)"
annotation (Dialog(group="Set point tracking"));
- parameter Modelica.Blocks.Types.InitPID initType=Modelica.Blocks.Types.InitPID.DoNotUse_InitialIntegratorState
+ parameter Modelica.Blocks.Types.Init initType=Modelica.Blocks.Types.Init.InitialState
"Type of initialization (1: no init, 2: steady state, 3: initial state, 4: initial output)"
annotation (Dialog(group="Initialization"));
parameter Real xi_start=0
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/Validation/LimPIDReset.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/Validation/LimPIDReset.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/Validation/LimPIDReset.mo" 2021-09-16 11:15:38.334780803 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Continuous/Validation/LimPIDReset.mo" 2021-09-16 11:19:07.466083115 +0200
@@ -3,7 +3,7 @@
"Test model for PID controller with optional intgerator reset"
extends Modelica.Icons.Example;
- Modelica.Blocks.Sources.Sine setPoi(freqHz=1) "Set point signal"
+ Modelica.Blocks.Sources.Sine setPoi(f =1) "Set point signal"
annotation (Placement(transformation(extent={{-40,-20},{-20,0}})));
Buildings.Controls.Continuous.LimPID limPIDPar(
yMax=1,
@@ -14,13 +14,13 @@
Td=10,
k=0.2,
controllerType=Modelica.Blocks.Types.SimpleController.PID,
- initType=Modelica.Blocks.Types.InitPID.InitialOutput,
+ initType=Modelica.Blocks.Types.Init.InitialOutput,
y_start=0.3) "PId controller with integrator reset to a parameter value"
annotation (Placement(transformation(extent={{20,-20},{40,0}})));
Modelica.Blocks.Sources.Constant mea(k=0.5) "Measured signal"
annotation (Placement(transformation(extent={{-40,-50},{-20,-30}})));
Buildings.Controls.Continuous.LimPID limPIDDef(
- initType=Modelica.Blocks.Types.InitPID.InitialState,
+ initType=Modelica.Blocks.Types.Init.InitialState,
Td=10,
k=1,
Ti=1,
@@ -44,14 +44,14 @@
k=0.2,
Ti=20,
controllerType=Modelica.Blocks.Types.SimpleController.PID,
- initType=Modelica.Blocks.Types.InitPID.InitialOutput,
+ initType=Modelica.Blocks.Types.Init.InitialOutput,
y_start=0.3) "PId controller with integrator reset to an input value"
annotation (Placement(transformation(extent={{20,-80},{40,-60}})));
Modelica.Blocks.Sources.Constant conRes(k=0.9)
"Signal to which integrator will be reset to"
annotation (Placement(transformation(extent={{-40,-90},{-20,-70}})));
Modelica.Blocks.Continuous.LimPID limPIDOri(
- initType=Modelica.Blocks.Types.InitPID.InitialState,
+ initType=Modelica.Blocks.Types.Init.InitialState,
Td=10,
k=1,
Ti=1,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/DemandResponse/BaseClasses/NormalOperation.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/DemandResponse/BaseClasses/NormalOperation.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/DemandResponse/BaseClasses/NormalOperation.mo" 2021-09-16 11:15:38.338780790 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/DemandResponse/BaseClasses/NormalOperation.mo" 2021-09-16 11:19:07.394083357 +0200
@@ -1,6 +1,6 @@
within Buildings.Controls.DemandResponse.BaseClasses;
block NormalOperation "Normal operation"
- extends Modelica.StateGraph.StepWithSignal;
+ extends Modelica.StateGraph.StepWithSignal(nIn = 1, nOut = 1);
Modelica.Blocks.Interfaces.RealInput PCon(unit="W")
"Consumed electrical power"
annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}),
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/DemandResponse/BaseClasses/PartialDemandResponse.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/DemandResponse/BaseClasses/PartialDemandResponse.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/DemandResponse/BaseClasses/PartialDemandResponse.mo" 2021-09-16 11:15:38.338780790 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/DemandResponse/BaseClasses/PartialDemandResponse.mo" 2021-09-16 11:19:07.218083951 +0200
@@ -1,7 +1,7 @@
within Buildings.Controls.DemandResponse.BaseClasses;
partial block PartialDemandResponse
"Partial block that declares common data for demand response models"
- extends Modelica.StateGraph.Step;
+ extends Modelica.StateGraph.Step(nIn = 1, nOut = 1);
parameter Integer nSam
"Number of intervals in a day for which baseline is computed";
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/DemandResponse/BaseClasses/ShedOperation.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/DemandResponse/BaseClasses/ShedOperation.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/DemandResponse/BaseClasses/ShedOperation.mo" 2021-09-16 11:15:38.338780790 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/DemandResponse/BaseClasses/ShedOperation.mo" 2021-09-16 11:19:07.202084005 +0200
@@ -1,6 +1,6 @@
within Buildings.Controls.DemandResponse.BaseClasses;
block ShedOperation "Computes the consumption with the shed taken into account"
- extends Modelica.StateGraph.Step;
+ extends Modelica.StateGraph.Step(nIn = 1, nOut = 1);
Modelica.Blocks.Interfaces.RealInput PCon(unit="W")
"Consumed electrical power"
annotation (Placement(transformation(extent={{-120,-90},{-100,-70}}),
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/DemandResponse/Client.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/DemandResponse/Client.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/DemandResponse/Client.mo" 2021-09-16 11:15:38.338780790 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/DemandResponse/Client.mo" 2021-09-16 11:19:07.186084058 +0200
@@ -2,9 +2,9 @@
model Client "Demand response client"
extends Modelica.Blocks.Icons.Block;
- final parameter Modelica.SIunits.Time tPeriod = 24*3600
+ final parameter Modelica.Units.SI.Time tPeriod = 24*3600
"Period, generally one day";
- final parameter Modelica.SIunits.Time tSample=tPeriod/nSam
+ final parameter Modelica.Units.SI.Time tSample=tPeriod/nSam
"Sample period, generally 900 or 3600 seconds";
parameter Integer nSam
"Number of samples in a day. For 1 hour sampling, set to 24";
@@ -65,7 +65,7 @@
annotation (Placement(transformation(extent={{100,40},{120,60}})));
protected
- Modelica.StateGraph.InitialStep initialStep(nIn=0)
+ Modelica.StateGraph.InitialStep initialStep(nOut = 1, nIn = 0)
annotation (Placement(transformation(extent={{-80,70},{-60,90}})));
inner Modelica.StateGraph.StateGraphRoot stateGraphRoot
annotation (Placement(transformation(extent={{60,60},{80,80}})));
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/OBC/CDL/Continuous/Derivative.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/OBC/CDL/Continuous/Derivative.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/OBC/CDL/Continuous/Derivative.mo" 2021-09-16 11:15:38.346780764 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/OBC/CDL/Continuous/Derivative.mo" 2021-09-16 11:19:03.050097996 +0200
@@ -1,7 +1,7 @@
within Buildings.Controls.OBC.CDL.Continuous;
block Derivative "Block that approximates the derivative of the input"
parameter Real k(unit="1") = 1 "Gains";
- parameter Modelica.SIunits.Time T(min=1E-60)=0.01
+ parameter Modelica.Units.SI.Time T(min=1E-60)=0.01
"Time constant (T>0 required)";
parameter Real x_start=0 "Initial or guess value of state"
annotation (Dialog(group="Initialization"));
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/OBC/CDL/Continuous/HysteresisWithHold.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/OBC/CDL/Continuous/HysteresisWithHold.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/OBC/CDL/Continuous/HysteresisWithHold.mo" 2021-09-16 11:15:38.346780764 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/OBC/CDL/Continuous/HysteresisWithHold.mo" 2021-09-16 11:19:02.734099061 +0200
@@ -5,10 +5,10 @@
parameter Real uLow "if y=true and u
Partial function that defines the input and output arguments
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Predictors/BaseClasses/sampleStart.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Predictors/BaseClasses/sampleStart.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Predictors/BaseClasses/sampleStart.mo" 2021-09-16 11:15:38.358780724 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Predictors/BaseClasses/sampleStart.mo" 2021-09-16 11:18:56.066121521 +0200
@@ -1,9 +1,9 @@
within Buildings.Controls.Predictors.BaseClasses;
function sampleStart "Start time for sampling"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Time t "Simulation time";
- input Modelica.SIunits.Time samplePeriod "Sample Period";
- output Modelica.SIunits.Time sampleStart "Time at which first sample happens";
+ input Modelica.Units.SI.Time t "Simulation time";
+ input Modelica.Units.SI.Time samplePeriod "Sample Period";
+ output Modelica.Units.SI.Time sampleStart "Time at which first sample happens";
algorithm
sampleStart :=ceil(t/samplePeriod)*samplePeriod;
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Predictors/BaseClasses/weatherRegression.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Predictors/BaseClasses/weatherRegression.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Predictors/BaseClasses/weatherRegression.mo" 2021-09-16 11:15:38.358780724 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Predictors/BaseClasses/weatherRegression.mo" 2021-09-16 11:18:56.058121548 +0200
@@ -1,12 +1,12 @@
within Buildings.Controls.Predictors.BaseClasses;
function weatherRegression "Linear weather regression model"
extends partialBaselinePrediction;
- input Modelica.SIunits.Temperature TCur "Current temperature";
- input Modelica.SIunits.Temperature T[:]
+ input Modelica.Units.SI.Temperature TCur "Current temperature";
+ input Modelica.Units.SI.Temperature T[:]
"Vector of temperatures of each interval of the current time of day";
protected
- Modelica.SIunits.Temperature TAve "Average temperature";
- Modelica.SIunits.Power PAve "Average power";
+ Modelica.Units.SI.Temperature TAve "Average temperature";
+ Modelica.Units.SI.Power PAve "Average power";
Real den(unit="K2") "Denominator";
Real a "Intercept";
Real b "Slope";
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Predictors/ElectricalLoad.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Predictors/ElectricalLoad.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Predictors/ElectricalLoad.mo" 2021-09-16 11:15:38.358780724 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Predictors/ElectricalLoad.mo" 2021-09-16 11:18:56.046121589 +0200
@@ -17,14 +17,14 @@
parameter Boolean use_dayOfAdj=true "if true, use the day of adjustment"
annotation (Dialog(group="Day of adjustment"));
- parameter Modelica.SIunits.Time dayOfAdj_start(
+ parameter Modelica.Units.SI.Time dayOfAdj_start(
max=0,
displayUnit="h") = -14400
"Number of hours prior to current time when day of adjustment starts"
annotation (Evaluate=true, Dialog(enable=use_dayOfAdj,
group="Day of adjustment"));
- parameter Modelica.SIunits.Time dayOfAdj_end(
+ parameter Modelica.Units.SI.Time dayOfAdj_end(
max=0,
displayUnit="h") = -3600
"Number of hours prior to current time when day of adjustment ends"
@@ -73,9 +73,9 @@
discrete Real adj(unit="1") "Load adjustment factor";
protected
- parameter Modelica.SIunits.Time samplePeriod=86400/nSam
+ parameter Modelica.Units.SI.Time samplePeriod=86400/nSam
"Sample period of the component";
- parameter Modelica.SIunits.Time samStart(fixed=false)
+ parameter Modelica.Units.SI.Time samStart(fixed=false)
"Time when the first sampling starts";
parameter Integer iDayOf_start = integer((nSam*dayOfAdj_start/86400+1E-8))
"Counter where day of look up begins";
@@ -84,22 +84,22 @@
parameter Integer nDayOf = iDayOf_end-iDayOf_start
"Number of samples used for the day of adjustment";
- parameter Modelica.SIunits.Time dt = 86400/nSam
+ parameter Modelica.Units.SI.Time dt = 86400/nSam
"Length of one sampling interval";
- discrete Modelica.SIunits.Power PAve "Average power over the past interval";
+ discrete Modelica.Units.SI.Power PAve "Average power over the past interval";
Boolean sampleTrigger "True, if sample time instant";
- discrete output Modelica.SIunits.Energy ELast "Energy at the last sample";
- discrete output Modelica.SIunits.Time tLast
+ discrete output Modelica.Units.SI.Energy ELast "Energy at the last sample";
+ discrete output Modelica.Units.SI.Time tLast
"Time at which last sample occurred";
output Integer[nPre] iSam "Index for power of the current sampling interval";
- discrete output Modelica.SIunits.Power P[Buildings.Controls.Types.nDayTypes,nSam,nHis]
+ discrete output Modelica.Units.SI.Power P[Buildings.Controls.Types.nDayTypes,nSam,nHis]
"Baseline power consumption";
// The temperature history is set to a zero array if it is not needed.
// This significantly reduces the size of the code that needs to be compiled.
- discrete output Modelica.SIunits.Temperature T[
+ discrete output Modelica.Units.SI.Temperature T[
if predictionModel == Types.PredictionModel.WeatherRegression then Buildings.Controls.Types.nDayTypes else 0,
if predictionModel == Types.PredictionModel.WeatherRegression then nSam else 0,
if predictionModel == Types.PredictionModel.WeatherRegression then nHis else 0]
@@ -116,12 +116,12 @@
Boolean _storeHistory
"Flag, switched to false when block gets an storeHistory=false signal, and remaining false until midnight";
- discrete Modelica.SIunits.Energy EActAve
+ discrete Modelica.Units.SI.Energy EActAve
"Actual energy over the day off period";
- discrete Modelica.SIunits.Energy EHisAve
+ discrete Modelica.Units.SI.Energy EHisAve
"Actual load over the day off period, summed over all time intervals";
- discrete Modelica.SIunits.Power PPreHis[Buildings.Controls.Types.nDayTypes, nSam]
+ discrete Modelica.Units.SI.Power PPreHis[Buildings.Controls.Types.nDayTypes, nSam]
"Predicted power consumptions for all day off time intervals";
Boolean PPreHisSet[Buildings.Controls.Types.nDayTypes, nSam](each start=false, each fixed=true)
"Flag, true if a value in PPreHis has been set for that element";
@@ -148,17 +148,17 @@
// Functions
function isMidNight
- input Modelica.SIunits.Time t "Simulation time";
+ input Modelica.Units.SI.Time t "Simulation time";
output Boolean r "True if time is midnight, false otherwise";
algorithm
r := rem(t, 86400.0) < 1;
end isMidNight;
function getTypeOfDays
- input Modelica.SIunits.Time t "Simulation time";
+ input Modelica.Units.SI.Time t "Simulation time";
input Buildings.Controls.Types.Day[:] typeOfDay
"Type of day as received from input connector";
- input Modelica.SIunits.Time dt "Length of one sampling interval";
+ input Modelica.Units.SI.Time dt "Length of one sampling interval";
input Integer nPre "Number of predictions to be made";
output Integer[nPre] tod "Type of day for each prediction interval";
protected
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Predictors/Validation/BaseClasses/PartialSimpleTestCase.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Predictors/Validation/BaseClasses/PartialSimpleTestCase.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Predictors/Validation/BaseClasses/PartialSimpleTestCase.mo" 2021-09-16 11:15:38.358780724 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Predictors/Validation/BaseClasses/PartialSimpleTestCase.mo" 2021-09-16 11:18:55.930121979 +0200
@@ -3,8 +3,8 @@
"Partial base class for simple test case of base load prediction"
extends Modelica.Icons.Example;
- parameter Modelica.SIunits.Time tPeriod = 24*3600 "Period";
- parameter Modelica.SIunits.Time tSample = 3600 "Sampling period";
+ parameter Modelica.Units.SI.Time tPeriod = 24*3600 "Period";
+ parameter Modelica.Units.SI.Time tSample = 3600 "Sampling period";
parameter Integer nPre(min=1) = 12 "Number of time steps to predict";
ElectricalLoad baseLoad(
final nPre=nPre,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Predictors/Validation/SineInput.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Predictors/Validation/SineInput.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Predictors/Validation/SineInput.mo" 2021-09-16 11:15:38.358780724 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Predictors/Validation/SineInput.mo" 2021-09-16 11:18:55.870122181 +0200
@@ -7,7 +7,7 @@
Modelica.Blocks.Sources.Cosine PBas(
amplitude=0.5,
offset=0.5,
- freqHz=1/tPeriod,
+f =1/tPeriod,
phase=3.1415926535898) "Measured power consumption"
annotation (Placement(transformation(extent={{-100,-40},{-80,-20}})));
Sampler P(samplePeriod=tSample)
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/SetPoints/OccupancySchedule.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/SetPoints/OccupancySchedule.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/SetPoints/OccupancySchedule.mo" 2021-09-16 11:15:38.358780724 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/SetPoints/OccupancySchedule.mo" 2021-09-16 11:18:55.614123043 +0200
@@ -6,7 +6,7 @@
"Occupancy table, each entry switching occupancy on or off";
parameter Boolean firstEntryOccupied = true
"Set to true if first entry in occupancy denotes a changed from unoccupied to occupied";
- parameter Modelica.SIunits.Time period = 86400 "End time of periodicity";
+ parameter Modelica.Units.SI.Time period = 86400 "End time of periodicity";
Modelica.Blocks.Interfaces.RealOutput tNexNonOcc
"Time until next non-occupancy"
@@ -21,7 +21,7 @@
final parameter Integer nRow = size(occupancy,1)
"Number of rows in the schedule";
- output Modelica.SIunits.Time offSet=integer(time/period)*period
+ output Modelica.Units.SI.Time offSet=integer(time/period)*period
"Time off-set, in multiples of period, that is used to switch the time when doing the table lookup";
output Integer nexStaInd "Next index when occupancy starts";
output Integer nexStoInd "Next index when occupancy stops";
@@ -31,8 +31,8 @@
output Integer iPerSto
"Counter for the period in which the next occupancy stops";
- output Modelica.SIunits.Time tOcc "Time when next occupancy starts";
- output Modelica.SIunits.Time tNonOcc "Time when next non-occupancy starts";
+ output Modelica.Units.SI.Time tOcc "Time when next occupancy starts";
+ output Modelica.Units.SI.Time tNonOcc "Time when next non-occupancy starts";
encapsulated function switchInteger
import Modelica;
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/SetPoints/SupplyReturnTemperatureReset.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/SetPoints/SupplyReturnTemperatureReset.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/SetPoints/SupplyReturnTemperatureReset.mo" 2021-09-16 11:15:38.358780724 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/SetPoints/SupplyReturnTemperatureReset.mo" 2021-09-16 11:18:55.590123124 +0200
@@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/SetPoints/Table.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/SetPoints/Table.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/SetPoints/Table.mo" 2021-09-16 11:15:38.358780724 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/SetPoints/Table.mo" 2021-09-16 11:18:55.566123205 +0200
@@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Sources/DayType.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Sources/DayType.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Sources/DayType.mo" 2021-09-16 11:15:38.358780724 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Controls/Sources/DayType.mo" 2021-09-16 11:18:55.510123393 +0200
@@ -21,11 +21,11 @@
{120,10}}), iconTransformation(extent={{100,-10},{120,10}})));
protected
- parameter Modelica.SIunits.Time samplePeriod=86400
+ parameter Modelica.Units.SI.Time samplePeriod=86400
"Sample period of the component";
output Integer iDay(min=1, max=size(days, 1))
"Pointer to days that determines what day type is sent to the output";
- parameter Modelica.SIunits.Time firstSample(fixed=false)
+ parameter Modelica.Units.SI.Time firstSample(fixed=false)
"Time when the sampling starts";
output Boolean sampleTrigger "True, if sample time instant";
output Boolean skipIDayIncrement
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/Interfaces/PowerOutput.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/Interfaces/PowerOutput.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/Interfaces/PowerOutput.mo" 2021-09-16 11:15:38.358780724 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/Interfaces/PowerOutput.mo" 2021-09-16 11:18:55.450123595 +0200
@@ -1,9 +1,9 @@
within Buildings.Electrical.AC.Interfaces;
connector PowerOutput
"Connector with real power, reactive power and power factor"
- output Modelica.SIunits.Power real "Real power";
- output Modelica.SIunits.ReactivePower apparent "Apparent power";
- output Modelica.SIunits.Angle phi "Phase shift";
+ output Modelica.Units.SI.Power real "Real power";
+ output Modelica.Units.SI.ReactivePower apparent "Apparent power";
+ output Modelica.Units.SI.Angle phi "Phase shift";
output Real cosPhi "Power factor";
annotation (Icon(graphics={ Polygon(
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Conversion/ACACConverter.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Conversion/ACACConverter.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Conversion/ACACConverter.mo" 2021-09-16 11:15:38.358780724 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Conversion/ACACConverter.mo" 2021-09-16 11:18:55.402123757 +0200
@@ -22,11 +22,11 @@
parameter Boolean ground_2 = true
"If true, connect side 2 of converter to ground"
annotation(Evaluate=true, Dialog(tab = "Ground", group="side 2"));
- Modelica.SIunits.Power LossPower[2] "Loss power";
+ Modelica.Units.SI.Power LossPower[2] "Loss power";
protected
- Modelica.SIunits.Power P_p[2] = PhaseSystem_p.phasePowers_vi(terminal_p.v, terminal_p.i)
+ Modelica.Units.SI.Power P_p[2] = PhaseSystem_p.phasePowers_vi(terminal_p.v, terminal_p.i)
"Power transmitted at pin p";
- Modelica.SIunits.Power P_n[2] = PhaseSystem_n.phasePowers_vi(terminal_n.v, terminal_n.i)
+ Modelica.Units.SI.Power P_n[2] = PhaseSystem_n.phasePowers_vi(terminal_n.v, terminal_n.i)
"Power transmitted at pin n";
equation
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Conversion/ACACTransformer.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Conversion/ACACTransformer.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Conversion/ACACTransformer.mo" 2021-09-16 11:15:38.358780724 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Conversion/ACACTransformer.mo" 2021-09-16 11:18:55.378123837 +0200
@@ -12,11 +12,11 @@
constrainedby Interfaces.Terminal_p(
i(start = zeros(PhaseSystem_p.n),
each stateSelect = StateSelect.prefer)));
- parameter Modelica.SIunits.Voltage VHigh
+ parameter Modelica.Units.SI.Voltage VHigh
"Rms voltage on side 1 of the transformer (primary side)";
- parameter Modelica.SIunits.Voltage VLow
+ parameter Modelica.Units.SI.Voltage VLow
"Rms voltage on side 2 of the transformer (secondary side)";
- parameter Modelica.SIunits.ApparentPower VABase
+ parameter Modelica.Units.SI.ApparentPower VABase
"Nominal power of the transformer";
parameter Real XoverR
"Ratio between the complex and real components of the impedance (XL/R)";
@@ -27,52 +27,52 @@
parameter Boolean ground_2 = true
"If true, connect side 2 of converter to ground"
annotation(Evaluate=true, Dialog(tab = "Ground", group="side 2"));
- parameter Modelica.SIunits.Angle phi_1 = 0
+ parameter Modelica.Units.SI.Angle phi_1 = 0
"Angle of the voltage side 1 at initialization"
annotation(Evaluate=true,Dialog(tab = "Initialization"));
- parameter Modelica.SIunits.Angle phi_2 = phi_1
+ parameter Modelica.Units.SI.Angle phi_2 = phi_1
"Angle of the voltage side 2 at initialization"
annotation(Evaluate=true, Dialog(tab = "Initialization"));
- Modelica.SIunits.Efficiency eta "Efficiency";
- Modelica.SIunits.Power PLoss[2] "Loss power";
+ Modelica.Units.SI.Efficiency eta "Efficiency";
+ Modelica.Units.SI.Power PLoss[2] "Loss power";
- Modelica.SIunits.Voltage V1[2](
+ Modelica.Units.SI.Voltage V1[2](
start = PhaseSystem_n.phaseVoltages(VHigh, phi_1))
"Voltage at the winding - primary side";
- Modelica.SIunits.Voltage V2[2](
+ Modelica.Units.SI.Voltage V2[2](
start = PhaseSystem_p.phaseVoltages(VLow, phi_2))
"Voltage at the winding - secondary side";
protected
Real N = VHigh/VLow "Winding ratio";
- Modelica.SIunits.Current IHigh = VABase/VHigh
+
+ Modelica.Units.SI.Current IHigh = VABase/VHigh
"Nominal current on primary side";
- Modelica.SIunits.Current ILow = VABase/VLow
+ Modelica.Units.SI.Current ILow = VABase/VLow
"Nominal current on secondary side";
- Modelica.SIunits.Current IscHigh = IHigh/Zperc
+ Modelica.Units.SI.Current IscHigh = IHigh/Zperc
"Short circuit current on primary side";
- Modelica.SIunits.Current IscLow = ILow/Zperc
+ Modelica.Units.SI.Current IscLow = ILow/Zperc
"Short circuit current on secondary side";
- Modelica.SIunits.Impedance Zp = VHigh/IscHigh
+ Modelica.Units.SI.Impedance Zp = VHigh/IscHigh
"Impedance of the primary side (module)";
- Modelica.SIunits.Impedance Z1[2]=
+ Modelica.Units.SI.Impedance Z1[2]=
{Zp*cos(atan(XoverR)), Zp*sin(atan(XoverR))}
"Impedance of the primary side of the transformer";
- Modelica.SIunits.Impedance Zs = VLow/IscLow
+ Modelica.Units.SI.Impedance Zs = VLow/IscLow
"Impedance of the secondary side (module)";
- Modelica.SIunits.Impedance Z2[2]=
+ Modelica.Units.SI.Impedance Z2[2]=
{Zs*cos(atan(XoverR)), Zs*sin(atan(XoverR))}
"Impedance of the secondary side of the transformer";
- Modelica.SIunits.Power P_p[2]=
+ Modelica.Units.SI.Power P_p[2]=
PhaseSystem_p.phasePowers_vi(terminal_p.v, terminal_p.i)
"Power transmitted at pin p (secondary)";
- Modelica.SIunits.Power P_n[2]=
+ Modelica.Units.SI.Power P_n[2]=
PhaseSystem_n.phasePowers_vi(terminal_n.v, terminal_n.i)
"Power transmitted at pin n (primary)";
- Modelica.SIunits.Power S_p = Modelica.Fluid.Utilities.regRoot(P_p[1]^2 + P_p[2]^2, delta=0.1)
+ Modelica.Units.SI.Power S_p = Modelica.Fluid.Utilities.regRoot(P_p[1]^2 + P_p[2]^2, delta=0.1)
"Apparent power at terminal p";
- Modelica.SIunits.Power S_n = Modelica.Fluid.Utilities.regRoot(P_n[1]^2 + P_n[2]^2, delta=0.1)
+ Modelica.Units.SI.Power S_n = Modelica.Fluid.Utilities.regRoot(P_n[1]^2 + P_n[2]^2, delta=0.1)
"Apparent power at terminal n";
-
equation
// Efficiency
eta = Buildings.Utilities.Math.Functions.smoothMin(
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Conversion/ACACTransformerFull.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Conversion/ACACTransformerFull.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Conversion/ACACTransformerFull.mo" 2021-09-16 11:15:38.358780724 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Conversion/ACACTransformerFull.mo" 2021-09-16 11:18:55.330123999 +0200
@@ -12,13 +12,13 @@
constrainedby Interfaces.Terminal_p(
i(start = zeros(PhaseSystem_p.n),
each stateSelect = StateSelect.prefer)));
- parameter Modelica.SIunits.Voltage VHigh
+ parameter Modelica.Units.SI.Voltage VHigh
"RMS voltage on side 1 of the transformer (primary side)";
- parameter Modelica.SIunits.Voltage VLow
+ parameter Modelica.Units.SI.Voltage VLow
"RMS voltage on side 2 of the transformer (secondary side)";
- parameter Modelica.SIunits.ApparentPower VABase
+ parameter Modelica.Units.SI.ApparentPower VABase
"Nominal power of the transformer";
- parameter Modelica.SIunits.Frequency f(start=60) "Nominal frequency";
+ parameter Modelica.Units.SI.Frequency f(start=60) "Nominal frequency";
parameter Buildings.Electrical.Types.PerUnit R1(min=0)
"Resistance on side 1 of the transformer (pu)";
parameter Buildings.Electrical.Types.PerUnit L1(min=0)
@@ -40,45 +40,45 @@
annotation(Evaluate=true,Dialog(tab = "Ground", group="side 1"));
parameter Boolean ground_2 = true "Connect side 2 of converter to ground"
annotation(Evaluate=true, Dialog(tab = "Ground", group="side 2"));
- parameter Modelica.SIunits.Angle phi_1 = 0
+ parameter Modelica.Units.SI.Angle phi_1 = 0
"Angle of the voltage side 1 at initialization"
annotation(Evaluate=true,Dialog(tab = "Initialization"));
- parameter Modelica.SIunits.Angle phi_2 = phi_1
+ parameter Modelica.Units.SI.Angle phi_2 = phi_1
"Angle of the voltage side 2 at initialization"
annotation(Evaluate=true, Dialog(tab = "Initialization"));
- Modelica.SIunits.Efficiency eta "Efficiency";
- Modelica.SIunits.Power PLoss[2] "Loss power";
+ Modelica.Units.SI.Efficiency eta "Efficiency";
+ Modelica.Units.SI.Power PLoss[2] "Loss power";
- Modelica.SIunits.Voltage V1[2](start = PhaseSystem_n.phaseVoltages(VHigh, phi_1))
+ Modelica.Units.SI.Voltage V1[2](start = PhaseSystem_n.phaseVoltages(VHigh, phi_1))
"Voltage at the winding - primary side";
- Modelica.SIunits.Voltage V2[2](start = PhaseSystem_n.phaseVoltages(VLow, phi_2))
+ Modelica.Units.SI.Voltage V2[2](start = PhaseSystem_n.phaseVoltages(VLow, phi_2))
"Voltage at the winding - secondary side";
protected
- parameter Modelica.SIunits.AngularVelocity omega_n = 2*Modelica.Constants.pi*f;
+ parameter Modelica.Units.SI.AngularVelocity omega_n = 2*Modelica.Constants.pi*f;
parameter Real N = VHigh/VLow "Winding ratio";
- parameter Modelica.SIunits.Resistance RBaseHigh = VHigh^2/VABase
+ parameter Modelica.Units.SI.Resistance RBaseHigh = VHigh^2/VABase
"Base impedance of the primary side";
- parameter Modelica.SIunits.Resistance RBaseLow = VLow^2/VABase
+ parameter Modelica.Units.SI.Resistance RBaseLow = VLow^2/VABase
"Base impedance of the secondary side";
- Modelica.SIunits.Impedance Z1[2] = {RBaseHigh*R1, omega*L1*RBaseHigh/omega_n}
+ Modelica.Units.SI.Impedance Z1[2] = {RBaseHigh*R1, omega*L1*RBaseHigh/omega_n}
"Impedance of the primary side of the transformer";
- Modelica.SIunits.Impedance Z2[2] = {RBaseLow*R2, omega*L2*RBaseLow/omega_n}
+ Modelica.Units.SI.Impedance Z2[2] = {RBaseLow*R2, omega*L2*RBaseLow/omega_n}
"Impedance of the secondary side of the transformer";
- Modelica.SIunits.Impedance Zrm[2] = {RBaseHigh*Rm, 0}
+ Modelica.Units.SI.Impedance Zrm[2] = {RBaseHigh*Rm, 0}
"Magnetization impedance - resistance";
- Modelica.SIunits.Impedance Zlm[2] = {0, omega*Lm*RBaseHigh/omega_n}
+ Modelica.Units.SI.Impedance Zlm[2] = {0, omega*Lm*RBaseHigh/omega_n}
"Magnetization impedance - impedence";
- Modelica.SIunits.Power P_p[2] = PhaseSystem_p.phasePowers_vi(terminal_p.v, terminal_p.i)
+ Modelica.Units.SI.Power P_p[2] = PhaseSystem_p.phasePowers_vi(terminal_p.v, terminal_p.i)
"Power transmitted at pin p (secondary)";
- Modelica.SIunits.Power P_n[2] = PhaseSystem_n.phasePowers_vi(terminal_n.v, terminal_n.i)
+ Modelica.Units.SI.Power P_n[2] = PhaseSystem_n.phasePowers_vi(terminal_n.v, terminal_n.i)
"Power transmitted at pin n (primary)";
- Modelica.SIunits.Power S_p = Modelica.Fluid.Utilities.regRoot(P_p[1]^2 + P_p[2]^2, delta=0.1)
+ Modelica.Units.SI.Power S_p = Modelica.Fluid.Utilities.regRoot(P_p[1]^2 + P_p[2]^2, delta=0.1)
"Apparent power at terminal p";
- Modelica.SIunits.Power S_n = Modelica.Fluid.Utilities.regRoot(P_n[1]^2 + P_n[2]^2, delta=0.1)
+ Modelica.Units.SI.Power S_n = Modelica.Fluid.Utilities.regRoot(P_n[1]^2 + P_n[2]^2, delta=0.1)
"Apparent power at terminal n";
- Modelica.SIunits.AngularVelocity omega "Angular velocity";
- Modelica.SIunits.Current Im[2] "Magnetization current";
- Modelica.SIunits.Angle theRef "Absolute angle of rotating reference system";
+ Modelica.Units.SI.AngularVelocity omega "Angular velocity";
+ Modelica.Units.SI.Current Im[2] "Magnetization current";
+ Modelica.Units.SI.Angle theRef "Absolute angle of rotating reference system";
equation
assert(sqrt(P_p[1]^2 + P_p[2]^2) <= VABase*1.01,
"The load power of the transformer is higher than VABase");
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Conversion/ACDCConverter.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Conversion/ACDCConverter.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Conversion/ACDCConverter.mo" 2021-09-16 11:15:38.358780724 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Conversion/ACDCConverter.mo" 2021-09-16 11:18:55.258124241 +0200
@@ -14,15 +14,15 @@
"Ratio of DC voltage / AC RMS voltage";
parameter Real eta(min=0, max=1)
"Converter efficiency, pLoss = (1-eta) * Ptr";
- Modelica.SIunits.Power PLoss "Loss power";
+ Modelica.Units.SI.Power PLoss "Loss power";
parameter Boolean ground_AC = false "Connect AC side of converter to ground" annotation(Evaluate=true, Dialog(tab = "Ground", group="AC side"));
parameter Boolean ground_DC = true "Connect DC side of converter to ground" annotation(Evaluate=true, Dialog(tab = "Ground", group="DC side"));
protected
PhaseSystem_p.Current i_dc "DC current";
PhaseSystem_p.Voltage v_dc "DC voltage";
- Modelica.SIunits.Power P_p[2] = PhaseSystem_p.phasePowers_vi(terminal_p.v, terminal_p.i)
+ Modelica.Units.SI.Power P_p[2] = PhaseSystem_p.phasePowers_vi(terminal_p.v, terminal_p.i)
"Power transmitted at pin p (secondary)";
- Modelica.SIunits.Power P_n[2](each start=0)=
+ Modelica.Units.SI.Power P_n[2](each start=0)=
PhaseSystem_n.phasePowers_vi(terminal_n.v, terminal_n.i)
"Power transmitted at pin n (primary)";
equation
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Lines/Examples/ACLine_L.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Lines/Examples/ACLine_L.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Lines/Examples/ACLine_L.mo" 2021-09-16 11:15:38.362780711 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Lines/Examples/ACLine_L.mo" 2021-09-16 11:18:54.890125481 +0200
@@ -1,7 +1,7 @@
within Buildings.Electrical.AC.OnePhase.Lines.Examples;
model ACLine_L "Test model for a single phase inductive line"
extends Modelica.Icons.Example;
- parameter Modelica.SIunits.Inductance Lbase = 10/2/Modelica.Constants.pi/60
+ parameter Modelica.Units.SI.Inductance Lbase = 10/2/Modelica.Constants.pi/60
"Base value for the line inductances";
Sources.FixedVoltage E( definiteReference=true,
f=60,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Lines/Examples/ACLine_RL.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Lines/Examples/ACLine_RL.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Lines/Examples/ACLine_RL.mo" 2021-09-16 11:15:38.362780711 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Lines/Examples/ACLine_RL.mo" 2021-09-16 11:18:54.846125629 +0200
@@ -1,9 +1,9 @@
within Buildings.Electrical.AC.OnePhase.Lines.Examples;
model ACLine_RL "Test model for a single phase inductive-resistive line"
extends Modelica.Icons.Example;
- parameter Modelica.SIunits.Resistance Rbase = 10
+ parameter Modelica.Units.SI.Resistance Rbase = 10
"Base value for the line resistance";
- parameter Modelica.SIunits.Inductance Lbase = Rbase/2/Modelica.Constants.pi/60
+ parameter Modelica.Units.SI.Inductance Lbase = Rbase/2/Modelica.Constants.pi/60
"Base value for the line inductance";
Sources.FixedVoltage E( definiteReference=true,
f=60,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Lines/Network.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Lines/Network.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Lines/Network.mo" 2021-09-16 11:15:38.362780711 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Lines/Network.mo" 2021-09-16 11:18:54.794125805 +0200
@@ -16,7 +16,7 @@
group="Assumptions",
enable=use_C), choices(choice=Buildings.Electrical.Types.Load.FixedZ_steady_state
"Steady state", choice=Buildings.Electrical.Types.Load.FixedZ_dynamic "Dynamic"));
- Modelica.SIunits.Voltage VAbs[grid.nNodes] "RMS voltage of the grid nodes";
+ Modelica.Units.SI.Voltage VAbs[grid.nNodes] "RMS voltage of the grid nodes";
equation
for i in 1:grid.nLinks loop
connect(lines[i].terminal_p, terminal[grid.fromTo[i,1]]);
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Lines/TwoPortInductance.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Lines/TwoPortInductance.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Lines/TwoPortInductance.mo" 2021-09-16 11:15:38.362780711 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Lines/TwoPortInductance.mo" 2021-09-16 11:18:54.778125858 +0200
@@ -14,10 +14,10 @@
"Type of model (e.g., steady state, dynamic, prescribed power consumption, etc.)"
annotation (Evaluate=true, Dialog(group="Modeling assumption"));
protected
- Modelica.SIunits.AngularVelocity omega
- "Frequency of the quasi-stationary sine waves";
- Modelica.SIunits.Angle theRef "Absolute angle of rotating reference system";
+ Modelica.Units.SI.AngularVelocity omega
+ "Frequency of the quasi-stationary sine waves";
+ Modelica.Units.SI.Angle theRef "Absolute angle of rotating reference system";
equation
theRef = PhaseSystem_p.thetaRef(terminal_p.theta);
omega = der(theRef);
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Lines/TwoPortRL.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Lines/TwoPortRL.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Lines/TwoPortRL.mo" 2021-09-16 11:15:38.362780711 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Lines/TwoPortRL.mo" 2021-09-16 11:18:54.762125912 +0200
@@ -8,7 +8,7 @@
redeclare replaceable Interfaces.Terminal_n terminal_n,
redeclare replaceable Interfaces.Terminal_p terminal_p,
final C=0);
- parameter Modelica.SIunits.Current i_start[PhaseSystem_p.n] = zeros(PhaseSystem_p.n)
+ parameter Modelica.Units.SI.Current i_start[PhaseSystem_p.n] = zeros(PhaseSystem_p.n)
"Initial current phasor of the line (positive if entering from terminal p)"
annotation (Dialog(enable = (mode==Buildings.Electrical.Types.Load.FixedZ_dynamic)));
parameter Buildings.Electrical.Types.Load mode(
@@ -18,12 +18,12 @@
"Type of model (e.g., steady state, dynamic, prescribed power consumption, etc.)"
annotation (Evaluate=true, Dialog(group="Modeling assumption"));
protected
- Modelica.SIunits.Current i_p[2](start = i_start, each stateSelect=StateSelect.prefer)
+
+ Modelica.Units.SI.Current i_p[2](start = i_start, each stateSelect=StateSelect.prefer)
"Current phasor at terminal p";
- Modelica.SIunits.AngularVelocity omega
+ Modelica.Units.SI.AngularVelocity omega
"Frequency of the quasi-stationary sine waves";
- Modelica.SIunits.Angle theRef "Absolute angle of rotating reference system";
-
+ Modelica.Units.SI.Angle theRef "Absolute angle of rotating reference system";
initial equation
if mode==Buildings.Electrical.Types.Load.FixedZ_dynamic then
i_p = i_start;
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Lines/TwoPortRLC.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Lines/TwoPortRLC.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Lines/TwoPortRLC.mo" 2021-09-16 11:15:38.362780711 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Lines/TwoPortRLC.mo" 2021-09-16 11:18:54.738125993 +0200
@@ -8,7 +8,7 @@
redeclare package PhaseSystem = PhaseSystem_n),
redeclare replaceable Interfaces.Terminal_p terminal_p(
redeclare package PhaseSystem = PhaseSystem_p));
- parameter Modelica.SIunits.Voltage Vc_start[2] = {V_nominal,0}
+ parameter Modelica.Units.SI.Voltage Vc_start[2] = {V_nominal,0}
"Initial voltage phasor of the capacitance located in the middle of the line"
annotation (Dialog(enable = (mode==Buildings.Electrical.Types.Load.FixedZ_dynamic)));
parameter Buildings.Electrical.Types.Load mode(
@@ -18,14 +18,14 @@
"Type of model (e.g., steady state, dynamic, prescribed power consumption, etc.)"
annotation (Evaluate=true, Dialog(group="Modeling assumption"));
protected
- Modelica.SIunits.Voltage Vc[2](start = Vc_start, each stateSelect=StateSelect.prefer)
+
+ Modelica.Units.SI.Voltage Vc[2](start = Vc_start, each stateSelect=StateSelect.prefer)
"Voltage of the Capacitance located in the middle of the line";
- Modelica.SIunits.Current Ic[2]
+ Modelica.Units.SI.Current Ic[2]
"Currenbt of the capacitance located in the middle of the line";
- Modelica.SIunits.AngularVelocity omega
+ Modelica.Units.SI.AngularVelocity omega
"Frequency of the quasi-stationary sine waves";
- Modelica.SIunits.Angle theRef "Absolute angle of rotating reference system";
-
+ Modelica.Units.SI.Angle theRef "Absolute angle of rotating reference system";
initial equation
if C > 0 and mode == Buildings.Electrical.Types.Load.FixedZ_dynamic then
Vc = Vc_start;
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Loads/Capacitive.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Loads/Capacitive.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Loads/Capacitive.mo" 2021-09-16 11:15:38.362780711 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Loads/Capacitive.mo" 2021-09-16 11:18:54.702126114 +0200
@@ -6,7 +6,7 @@
V_nominal(start = 110));
protected
- Modelica.SIunits.Angle theRef "Absolute angle of rotating reference system";
+ Modelica.Units.SI.Angle theRef "Absolute angle of rotating reference system";
initial equation
if mode == Buildings.Electrical.Types.Load.FixedZ_dynamic then
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Loads/Impedance.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Loads/Impedance.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Loads/Impedance.mo" 2021-09-16 11:15:38.362780711 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Loads/Impedance.mo" 2021-09-16 11:18:54.586126505 +0200
@@ -5,10 +5,10 @@
redeclare replaceable Interfaces.Terminal_n terminal);
protected
- Modelica.SIunits.Angle theRef "Absolute angle of rotating reference system";
- Modelica.SIunits.AngularVelocity omega
+ Modelica.Units.SI.Angle theRef "Absolute angle of rotating reference system";
+ Modelica.Units.SI.AngularVelocity omega
"Frequency of the quasi-stationary sine waves";
- Modelica.SIunits.Reactance X(start = 1) "Complex component of the impedance";
+ Modelica.Units.SI.Reactance X(start = 1) "Complex component of the impedance";
equation
theRef = PhaseSystem.thetaRef(terminal.theta);
omega = der(theRef);
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Loads/Inductive.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Loads/Inductive.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Loads/Inductive.mo" 2021-09-16 11:15:38.362780711 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Loads/Inductive.mo" 2021-09-16 11:18:54.570126559 +0200
@@ -6,7 +6,7 @@
V_nominal(start = 110));
protected
- Modelica.SIunits.Angle theRef "Absolute angle of rotating reference system";
+ Modelica.Units.SI.Angle theRef "Absolute angle of rotating reference system";
initial equation
if mode == Buildings.Electrical.Types.Load.FixedZ_dynamic then
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Sensors/Probe.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Sensors/Probe.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Sensors/Probe.mo" 2021-09-16 11:15:38.362780711 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Sensors/Probe.mo" 2021-09-16 11:18:54.466126909 +0200
@@ -1,7 +1,7 @@
within Buildings.Electrical.AC.OnePhase.Sensors;
model Probe "Model of a probe that measures RMS voltage and angle"
extends Icons.GeneralizedProbe;
- parameter Modelica.SIunits.Voltage V_nominal(min=0, start = 110)
+ parameter Modelica.Units.SI.Voltage V_nominal(min=0, start = 110)
"Nominal voltage (V_nominal >= 0)";
parameter Boolean perUnit = true "If true, display voltage in p.u.";
replaceable Interfaces.Terminal_n term "Electrical connector" annotation (Placement(
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Sources/Examples/VariablePowerSource.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Sources/Examples/VariablePowerSource.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Sources/Examples/VariablePowerSource.mo" 2021-09-16 11:15:38.362780711 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Sources/Examples/VariablePowerSource.mo" 2021-09-16 11:18:54.202127797 +0200
@@ -9,7 +9,7 @@
offset=200,
startTime=1,
amplitude=100,
- freqHz=0.05) "Generated power"
+f =0.05) "Generated power"
annotation (Placement(transformation(extent={{-92,-10},{-72,10}})));
Buildings.Electrical.AC.OnePhase.Loads.Inductive RL(mode=Types.Load.VariableZ_y_input,
P_nominal=-300,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Sources/FixedVoltage.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Sources/FixedVoltage.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Sources/FixedVoltage.mo" 2021-09-16 11:15:38.362780711 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Sources/FixedVoltage.mo" 2021-09-16 11:18:54.174127892 +0200
@@ -3,11 +3,11 @@
extends Buildings.Electrical.Interfaces.Source(
redeclare package PhaseSystem = PhaseSystems.OnePhase,
redeclare replaceable Interfaces.Terminal_p terminal);
- parameter Modelica.SIunits.Frequency f(start=60) "Frequency of the source";
- parameter Modelica.SIunits.Voltage V(start = 110) "RMS voltage of the source";
- parameter Modelica.SIunits.Angle phiSou = 0 "Phase shift of the source";
+ parameter Modelica.Units.SI.Frequency f(start=60) "Frequency of the source";
+ parameter Modelica.Units.SI.Voltage V(start = 110) "RMS voltage of the source";
+ parameter Modelica.Units.SI.Angle phiSou = 0 "Phase shift of the source";
protected
- Modelica.SIunits.Angle thetaRel
+ Modelica.Units.SI.Angle thetaRel
"Absolute angle of rotating system as offset to thetaRef";
equation
if Connections.isRoot(terminal.theta) then
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Sources/Generator.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Sources/Generator.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Sources/Generator.mo" 2021-09-16 11:15:38.362780711 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Sources/Generator.mo" 2021-09-16 11:18:54.158127945 +0200
@@ -3,10 +3,10 @@
extends Buildings.Electrical.Interfaces.Source(
redeclare package PhaseSystem = PhaseSystems.OnePhase,
redeclare replaceable Interfaces.Terminal_p terminal);
- parameter Modelica.SIunits.Frequency f(start=60) "Frequency of the source";
- parameter Modelica.SIunits.Angle phiGen(displayUnit="deg") = 0
+ parameter Modelica.Units.SI.Frequency f(start=60) "Frequency of the source";
+ parameter Modelica.Units.SI.Angle phiGen(displayUnit="deg") = 0
"Phase shift of the source";
- Modelica.SIunits.Current I "value of current";
+ Modelica.Units.SI.Current I "value of current";
Modelica.Blocks.Interfaces.RealInput P
"Variable power generated by the source"
annotation (Placement(transformation(
@@ -15,7 +15,7 @@
extent={{-20,-20},{20,20}},
origin={-100,0})));
protected
- Modelica.SIunits.Angle thetaRel
+ Modelica.Units.SI.Angle thetaRel
"Absolute angle of rotating system as offset to thetaRef";
equation
if Connections.isRoot(terminal.theta) then
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Sources/Grid.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Sources/Grid.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Sources/Grid.mo" 2021-09-16 11:15:38.362780711 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Sources/Grid.mo" 2021-09-16 11:18:54.138128013 +0200
@@ -4,9 +4,9 @@
replaceable Buildings.Electrical.AC.OnePhase.Interfaces.Terminal_p terminal
annotation (Placement(transformation(extent={{-10,
-110},{10,-90}}), iconTransformation(extent={{-10,-110},{10,-90}})));
- parameter Modelica.SIunits.Frequency f(start=60) "Frequency of the source";
- parameter Modelica.SIunits.Voltage V(start = 110) "RMS voltage of the source";
- parameter Modelica.SIunits.Angle phiSou = 0 "Phase shift angle of the source";
+ parameter Modelica.Units.SI.Frequency f(start=60) "Frequency of the source";
+ parameter Modelica.Units.SI.Voltage V(start = 110) "RMS voltage of the source";
+ parameter Modelica.Units.SI.Angle phiSou = 0 "Phase shift angle of the source";
Buildings.Electrical.AC.Interfaces.PowerOutput P
"Power consumed from grid if positive, or fed to grid if negative"
annotation (Placement(transformation(extent={{100,-10},{120,10}})));
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Storage/Battery.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Storage/Battery.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Storage/Battery.mo" 2021-09-16 11:15:38.362780711 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/OnePhase/Storage/Battery.mo" 2021-09-16 11:18:54.066128255 +0200
@@ -5,14 +5,14 @@
Buildings.Electrical.PhaseSystems.OnePhase constrainedby
Buildings.Electrical.PhaseSystems.PartialPhaseSystem "Phase system"
annotation (choicesAllMatching=true);
- parameter Modelica.SIunits.Efficiency etaCha(max=1) = 0.9
+ parameter Modelica.Units.SI.Efficiency etaCha(max=1) = 0.9
"Efficiency during charging";
- parameter Modelica.SIunits.Efficiency etaDis(max=1) = 0.9
+ parameter Modelica.Units.SI.Efficiency etaDis(max=1) = 0.9
"Efficiency during discharging";
parameter Real SOC_start(start=0.1) "Initial charge";
- parameter Modelica.SIunits.Energy EMax(min=0, displayUnit="kWh")
+ parameter Modelica.Units.SI.Energy EMax(min=0, displayUnit="kWh")
"Maximum available charge";
- parameter Modelica.SIunits.Voltage V_nominal(start = 110)
+ parameter Modelica.Units.SI.Voltage V_nominal(start = 110)
"Nominal voltage (V_nominal >= 0)";
parameter Boolean linearized=false
"If =true introduce a linearization in the load";
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesBalanced/Lines/Examples/ACLine_L.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesBalanced/Lines/Examples/ACLine_L.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesBalanced/Lines/Examples/ACLine_L.mo" 2021-09-16 11:15:38.362780711 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesBalanced/Lines/Examples/ACLine_L.mo" 2021-09-16 11:18:53.630129723 +0200
@@ -1,7 +1,7 @@
within Buildings.Electrical.AC.ThreePhasesBalanced.Lines.Examples;
model ACLine_L "Test model for single phase inductive lines"
extends Modelica.Icons.Example;
- parameter Modelica.SIunits.Inductance Lbase = 10/2/Modelica.Constants.pi/60
+ parameter Modelica.Units.SI.Inductance Lbase = 10/2/Modelica.Constants.pi/60
"Base value for the line inductances";
ThreePhasesBalanced.Sources.FixedVoltage E(definiteReference=true,
f=60,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesBalanced/Lines/Examples/ACLine_RL.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesBalanced/Lines/Examples/ACLine_RL.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesBalanced/Lines/Examples/ACLine_RL.mo" 2021-09-16 11:15:38.362780711 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesBalanced/Lines/Examples/ACLine_RL.mo" 2021-09-16 11:18:53.590129857 +0200
@@ -1,9 +1,9 @@
within Buildings.Electrical.AC.ThreePhasesBalanced.Lines.Examples;
model ACLine_RL "Test model for single phase inductive-resistive lines"
extends Modelica.Icons.Example;
- parameter Modelica.SIunits.Resistance Rbase = 10
+ parameter Modelica.Units.SI.Resistance Rbase = 10
"Base value for the line resistance";
- parameter Modelica.SIunits.Inductance Lbase = Rbase/2/Modelica.Constants.pi/60
+ parameter Modelica.Units.SI.Inductance Lbase = Rbase/2/Modelica.Constants.pi/60
"Base value for the line inductance";
ThreePhasesBalanced.Sources.FixedVoltage E(definiteReference=true,
f=60,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesBalanced/Lines/Network.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesBalanced/Lines/Network.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesBalanced/Lines/Network.mo" 2021-09-16 11:15:38.362780711 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesBalanced/Lines/Network.mo" 2021-09-16 11:18:53.530130060 +0200
@@ -7,7 +7,7 @@
redeclare Lines.Line lines(
redeclare replaceable
Buildings.Electrical.Transmission.LowVoltageCables.Generic commercialCable=grid.cables));
- Modelica.SIunits.Voltage VAbs[grid.nNodes] "RMS voltage of the grid nodes";
+ Modelica.Units.SI.Voltage VAbs[grid.nNodes] "RMS voltage of the grid nodes";
equation
for i in 1:grid.nLinks loop
connect(lines[i].terminal_p, terminal[grid.fromTo[i,1]]);
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesBalanced/Loads/Examples/ThreePhases.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesBalanced/Loads/Examples/ThreePhases.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesBalanced/Loads/Examples/ThreePhases.mo" 2021-09-16 11:15:38.362780711 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesBalanced/Loads/Examples/ThreePhases.mo" 2021-09-16 11:18:53.374130585 +0200
@@ -2,11 +2,11 @@
model ThreePhases
"Example that provides a comparison between AC one phase and three-phase balanced"
extends Modelica.Icons.Example;
- Modelica.SIunits.Power errorY=
+ Modelica.Units.SI.Power errorY=
sqrt((sen_Y.S[1] - (sen_a.S[1] + sen_b.S[1] + sen_c.S[1]))^2 +
(sen_Y.S[2] - (sen_a.S[2] + sen_b.S[2] + sen_c.S[2]))^2)
"Difference of the power consumption in the star (Y) connection";
- Modelica.SIunits.Power errorD=
+ Modelica.Units.SI.Power errorD=
sqrt((sen_D.S[1] - (sen_ab.S[1] + sen_bc.S[1] + sen_ca.S[1]))^2 +
(sen_D.S[2] - (sen_ab.S[2] + sen_bc.S[2] + sen_ca.S[2]))^2)
"Difference of the power consumption in the triangle (D) connection";
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesBalanced/Loads/Impedance.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesBalanced/Loads/Impedance.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesBalanced/Loads/Impedance.mo" 2021-09-16 11:15:38.362780711 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesBalanced/Loads/Impedance.mo" 2021-09-16 11:18:53.326130747 +0200
@@ -11,11 +11,11 @@
__Dymola_radioButtons=true));
protected
- Modelica.SIunits.Angle theRef "Absolute angle of rotating reference system";
- Modelica.SIunits.AngularVelocity omega
- "Frequency of the quasi-stationary sine waves";
- Modelica.SIunits.Reactance X(start = 1) "Complex component of the impedance";
+ Modelica.Units.SI.Angle theRef "Absolute angle of rotating reference system";
+ Modelica.Units.SI.AngularVelocity omega
+ "Frequency of the quasi-stationary sine waves";
+ Modelica.Units.SI.Reactance X(start = 1) "Complex component of the impedance";
equation
theRef = PhaseSystem.thetaRef(terminal.theta);
omega = der(theRef);
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesBalanced/Sources/Examples/VariablePowerSource.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesBalanced/Sources/Examples/VariablePowerSource.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesBalanced/Sources/Examples/VariablePowerSource.mo" 2021-09-16 11:15:38.362780711 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesBalanced/Sources/Examples/VariablePowerSource.mo" 2021-09-16 11:18:53.158131312 +0200
@@ -9,7 +9,7 @@
offset=200,
startTime=1,
amplitude=100,
- freqHz=0.05) "Generated power"
+f =0.05) "Generated power"
annotation (Placement(transformation(extent={{-92,-10},{-72,10}})));
Buildings.Electrical.AC.ThreePhasesBalanced.Loads.Inductive RL(mode=Types.Load.VariableZ_y_input,
P_nominal=-300,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACConverter.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACConverter.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACConverter.mo" 2021-09-16 11:15:38.366780698 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACConverter.mo" 2021-09-16 11:18:52.862132309 +0200
@@ -19,7 +19,7 @@
ground_2=ground_2));
parameter Real conversionFactor
"Ratio of QS rms voltage on side 2 / QS rms voltage on side 1";
- parameter Modelica.SIunits.Efficiency eta(max=1)
+ parameter Modelica.Units.SI.Efficiency eta(max=1)
"Converter efficiency, pLoss = (1-eta) * Ptr";
parameter Boolean ground_1 = false "Connect side 1 of converter to ground" annotation(Dialog(tab = "Ground", group="side 1"));
parameter Boolean ground_2 = true "Connect side 2 of converter to ground" annotation(Dialog(tab = "Ground", group="side 2"));
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformer.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformer.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformer.mo" 2021-09-16 11:15:38.366780698 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformer.mo" 2021-09-16 11:18:52.846132363 +0200
@@ -29,11 +29,11 @@
ground_2=ground_2,
VABase=VABase/3,
phi_1=2.0943951023932));
- parameter Modelica.SIunits.Voltage VHigh
+ parameter Modelica.Units.SI.Voltage VHigh
"Rms voltage on side 1 of the transformer (primary side)";
- parameter Modelica.SIunits.Voltage VLow
+ parameter Modelica.Units.SI.Voltage VLow
"Rms voltage on side 2 of the transformer (secondary side)";
- parameter Modelica.SIunits.ApparentPower VABase
+ parameter Modelica.Units.SI.ApparentPower VABase
"Nominal power of the transformer";
parameter Real XoverR
"Ratio between the complex and real components of the impedance (XL/R)";
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerDD.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerDD.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerDD.mo" 2021-09-16 11:15:38.366780698 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerDD.mo" 2021-09-16 11:18:52.818132457 +0200
@@ -29,11 +29,11 @@
VHigh=VHigh,
VLow=VLow,
phi_1=2.6179938779915));
- parameter Modelica.SIunits.Voltage VHigh
+ parameter Modelica.Units.SI.Voltage VHigh
"Rms voltage on side 1 of the transformer (primary side)";
- parameter Modelica.SIunits.Voltage VLow
+ parameter Modelica.Units.SI.Voltage VLow
"Rms voltage on side 2 of the transformer (secondary side)";
- parameter Modelica.SIunits.ApparentPower VABase
+ parameter Modelica.Units.SI.ApparentPower VABase
"Nominal power of the transformer";
parameter Real XoverR
"Ratio between the complex and real components of the impedance (XL/R)";
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerFull.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerFull.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerFull.mo" 2021-09-16 11:15:38.366780698 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerFull.mo" 2021-09-16 11:18:52.782132578 +0200
@@ -33,13 +33,13 @@
ground_1=ground_1,
ground_2=ground_2));
- parameter Modelica.SIunits.Voltage VHigh
+ parameter Modelica.Units.SI.Voltage VHigh
"Rms voltage on side 1 of the transformer (primary side)";
- parameter Modelica.SIunits.Voltage VLow
+ parameter Modelica.Units.SI.Voltage VLow
"Rms voltage on side 2 of the transformer (secondary side)";
- parameter Modelica.SIunits.ApparentPower VABase
+ parameter Modelica.Units.SI.ApparentPower VABase
"Nominal power of the transformer";
- parameter Modelica.SIunits.Frequency f(start=60) "Nominal frequency";
+ parameter Modelica.Units.SI.Frequency f(start=60) "Nominal frequency";
parameter Buildings.Electrical.Types.PerUnit R1(min=0)
"Resistance on side 1 of the transformer (pu)";
parameter Buildings.Electrical.Types.PerUnit L1(min=0)
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepDownDY.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepDownDY.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepDownDY.mo" 2021-09-16 11:15:38.366780698 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepDownDY.mo" 2021-09-16 11:18:52.754132672 +0200
@@ -30,11 +30,11 @@
VABase=VABase/3,
VLow=-VLow/sqrt(3),
phi_1=-1.5707963267949));
- parameter Modelica.SIunits.Voltage VHigh
+ parameter Modelica.Units.SI.Voltage VHigh
"Rms voltage on side 1 of the transformer (primary side)";
- parameter Modelica.SIunits.Voltage VLow
+ parameter Modelica.Units.SI.Voltage VLow
"Rms voltage on side 2 of the transformer (secondary side)";
- parameter Modelica.SIunits.ApparentPower VABase
+ parameter Modelica.Units.SI.ApparentPower VABase
"Nominal power of the transformer";
parameter Real XoverR
"Ratio between the complex and real components of the impedance (XL/R)";
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepDownYD.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepDownYD.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepDownYD.mo" 2021-09-16 11:15:38.366780698 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepDownYD.mo" 2021-09-16 11:18:52.722132780 +0200
@@ -30,11 +30,11 @@
VABase=VABase/3,
VLow=VLow,
phi_1=2.0943951023932));
- parameter Modelica.SIunits.Voltage VHigh
+ parameter Modelica.Units.SI.Voltage VHigh
"Rms voltage on side 1 of the transformer (primary side)";
- parameter Modelica.SIunits.Voltage VLow
+ parameter Modelica.Units.SI.Voltage VLow
"Rms voltage on side 2 of the transformer (secondary side)";
- parameter Modelica.SIunits.ApparentPower VABase
+ parameter Modelica.Units.SI.ApparentPower VABase
"Nominal power of the transformer";
parameter Real XoverR
"Ratio between the complex and real components of the impedance (XL/R)";
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepUpDY.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepUpDY.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepUpDY.mo" 2021-09-16 11:15:38.366780698 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepUpDY.mo" 2021-09-16 11:18:52.694132874 +0200
@@ -30,11 +30,11 @@
VABase=VABase/3,
VLow=VLow/sqrt(3),
phi_1=2.6179938779915));
- parameter Modelica.SIunits.Voltage VHigh
+ parameter Modelica.Units.SI.Voltage VHigh
"Rms voltage on side 1 of the transformer (primary side)";
- parameter Modelica.SIunits.Voltage VLow
+ parameter Modelica.Units.SI.Voltage VLow
"Rms voltage on side 2 of the transformer (secondary side)";
- parameter Modelica.SIunits.ApparentPower VABase
+ parameter Modelica.Units.SI.ApparentPower VABase
"Nominal power of the transformer";
parameter Real XoverR
"Ratio between the complex and real components of the impedance (XL/R)";
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepUpYD.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepUpYD.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepUpYD.mo" 2021-09-16 11:15:38.366780698 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/ACACTransformerStepUpYD.mo" 2021-09-16 11:18:52.662132982 +0200
@@ -30,11 +30,11 @@
VABase=VABase/3,
VLow=-VLow,
phi_1=2.0943951023932));
- parameter Modelica.SIunits.Voltage VHigh
+ parameter Modelica.Units.SI.Voltage VHigh
"Rms voltage on side 1 of the transformer (primary side)";
- parameter Modelica.SIunits.Voltage VLow
+ parameter Modelica.Units.SI.Voltage VLow
"Rms voltage on side 2 of the transformer (secondary side)";
- parameter Modelica.SIunits.ApparentPower VABase
+ parameter Modelica.Units.SI.ApparentPower VABase
"Nominal power of the transformer";
parameter Real XoverR
"Ratio between the complex and real components of the impedance (XL/R)";
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/Examples/BaseClasses/TransformerExample.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/Examples/BaseClasses/TransformerExample.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/Examples/BaseClasses/TransformerExample.mo" 2021-09-16 11:15:38.366780698 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Conversion/Examples/BaseClasses/TransformerExample.mo" 2021-09-16 11:18:52.502133520 +0200
@@ -2,9 +2,9 @@
model TransformerExample
"This example represents the basic test for a transformer model"
extends Modelica.Icons.Example;
- parameter Modelica.SIunits.Voltage V_primary = 12470
+ parameter Modelica.Units.SI.Voltage V_primary = 12470
"RMS Voltage on the primary side of the transformer";
- parameter Modelica.SIunits.Voltage V_secondary = 4160
+ parameter Modelica.Units.SI.Voltage V_secondary = 4160
"RMS Voltage on the secondary side of the transformer";
Sources.FixedVoltage sou(
f=60,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_L.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_L.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_L.mo" 2021-09-16 11:15:38.366780698 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_L.mo" 2021-09-16 11:18:51.958135352 +0200
@@ -1,7 +1,7 @@
within Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.Examples;
model ACLine_L "Test model for a three-phase unbalanced inductive line"
extends Modelica.Icons.Example;
- parameter Modelica.SIunits.Inductance Lbase = 10/2/Modelica.Constants.pi/60
+ parameter Modelica.Units.SI.Inductance Lbase = 10/2/Modelica.Constants.pi/60
"Base value for the line inductances";
Sources.FixedVoltage E(
definiteReference=true,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_L_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_L_N.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_L_N.mo" 2021-09-16 11:15:38.366780698 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_L_N.mo" 2021-09-16 11:18:51.930135446 +0200
@@ -2,7 +2,7 @@
model ACLine_L_N
"Test model for a three-phase unbalanced inductive line with neutral cable"
extends Modelica.Icons.Example;
- parameter Modelica.SIunits.Inductance Lbase = 10/2/Modelica.Constants.pi/60
+ parameter Modelica.Units.SI.Inductance Lbase = 10/2/Modelica.Constants.pi/60
"Base value for the line inductances";
Sources.FixedVoltage_N E(
definiteReference=true,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RL.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RL.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RL.mo" 2021-09-16 11:15:38.366780698 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RL.mo" 2021-09-16 11:18:51.706136200 +0200
@@ -2,9 +2,9 @@
model ACLine_RL
"Test model for a three-phase unbalanced inductive-resistive line"
extends Modelica.Icons.Example;
- parameter Modelica.SIunits.Resistance Rbase = 3*10
+ parameter Modelica.Units.SI.Resistance Rbase = 3*10
"Base value for the line resistance";
- parameter Modelica.SIunits.Inductance Lbase = Rbase/2/Modelica.Constants.pi/60
+ parameter Modelica.Units.SI.Inductance Lbase = Rbase/2/Modelica.Constants.pi/60
"Base value for the line inductance";
Sources.FixedVoltage E(
definiteReference=true,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RLC.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RLC.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RLC.mo" 2021-09-16 11:15:38.366780698 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RLC.mo" 2021-09-16 11:18:51.678136294 +0200
@@ -1,11 +1,11 @@
within Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.Examples;
model ACLine_RLC "Test model for a three-phase unbalanced RLC line"
extends Modelica.Icons.Example;
- parameter Modelica.SIunits.Resistance RBase = 3*10
+ parameter Modelica.Units.SI.Resistance RBase = 3*10
"Base value for the line resistance";
- parameter Modelica.SIunits.Inductance LBase = RBase/(2*Modelica.Constants.pi*60)
+ parameter Modelica.Units.SI.Inductance LBase = RBase/(2*Modelica.Constants.pi*60)
"Base value for the line inductances";
- parameter Modelica.SIunits.Capacitance CBase = 3*0.1/(2*Modelica.Constants.pi*60)
+ parameter Modelica.Units.SI.Capacitance CBase = 3*0.1/(2*Modelica.Constants.pi*60)
"Base value for the line inductances";
Sources.FixedVoltage E(
definiteReference=true,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RLC_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RLC_N.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RLC_N.mo" 2021-09-16 11:15:38.366780698 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RLC_N.mo" 2021-09-16 11:18:51.650136389 +0200
@@ -2,11 +2,11 @@
model ACLine_RLC_N
"Test model for a three-phase unbalanced RLC line with neutral cable"
extends Modelica.Icons.Example;
- parameter Modelica.SIunits.Resistance RBase = 3*10
+ parameter Modelica.Units.SI.Resistance RBase = 3*10
"Base value for the line resistance";
- parameter Modelica.SIunits.Inductance LBase = RBase/(2*Modelica.Constants.pi*60)
+ parameter Modelica.Units.SI.Inductance LBase = RBase/(2*Modelica.Constants.pi*60)
"Base value for the line inductances";
- parameter Modelica.SIunits.Capacitance CBase = 3*0.1/(2*Modelica.Constants.pi*60)
+ parameter Modelica.Units.SI.Capacitance CBase = 3*0.1/(2*Modelica.Constants.pi*60)
"Base value for the line inductances";
Sources.FixedVoltage_N E(
definiteReference=true,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RL_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RL_N.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RL_N.mo" 2021-09-16 11:15:38.366780698 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/Examples/ACLine_RL_N.mo" 2021-09-16 11:18:51.622136483 +0200
@@ -2,9 +2,9 @@
model ACLine_RL_N
"Test model for a three-phase unbalanced inductive-resistive line with neutral cable"
extends Modelica.Icons.Example;
- parameter Modelica.SIunits.Resistance Rbase = 3*10
+ parameter Modelica.Units.SI.Resistance Rbase = 3*10
"Base value for the line resistance";
- parameter Modelica.SIunits.Inductance Lbase = Rbase/2/Modelica.Constants.pi/60
+ parameter Modelica.Units.SI.Inductance Lbase = Rbase/2/Modelica.Constants.pi/60
"Base value for the line inductance";
Sources.FixedVoltage_N E(
definiteReference=true,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/Network.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/Network.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/Network.mo" 2021-09-16 11:15:38.366780698 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/Network.mo" 2021-09-16 11:18:51.506136873 +0200
@@ -5,7 +5,7 @@
Buildings.Electrical.AC.ThreePhasesUnbalanced.Interfaces.Terminal_p terminal,
redeclare replaceable Transmission.Grids.TestGrid2Nodes grid,
redeclare Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.Line lines(commercialCable=grid.cables));
- Modelica.SIunits.Voltage VAbs[3,grid.nNodes]
+ Modelica.Units.SI.Voltage VAbs[3,grid.nNodes]
"RMS voltage of the grid nodes";
equation
for i in 1:grid.nLinks loop
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/Network_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/Network_N.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/Network_N.mo" 2021-09-16 11:15:38.366780698 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/Network_N.mo" 2021-09-16 11:18:51.490136927 +0200
@@ -6,7 +6,7 @@
redeclare replaceable Transmission.Grids.TestGrid2Nodes grid,
redeclare Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.Line_N lines(
commercialCable=grid.cables));
- Modelica.SIunits.Voltage VAbs[3,grid.nNodes]
+ Modelica.Units.SI.Voltage VAbs[3,grid.nNodes]
"RMS voltage of the grid nodes";
equation
for i in 1:grid.nLinks loop
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortInductance.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortInductance.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortInductance.mo" 2021-09-16 11:15:38.366780698 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortInductance.mo" 2021-09-16 11:18:51.470136994 +0200
@@ -1,7 +1,7 @@
within Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines;
model TwoPortInductance "Model of an inductance with two electrical ports"
extends Buildings.Electrical.AC.ThreePhasesUnbalanced.Interfaces.TwoPort;
- parameter Modelica.SIunits.Inductance L "Inductance";
+ parameter Modelica.Units.SI.Inductance L "Inductance";
OnePhase.Lines.TwoPortInductance phase1(
final L=L/3) "Inductance line 1"
annotation (Placement(transformation(extent={{-10,20},{10,40}})));
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortInductance_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortInductance_N.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortInductance_N.mo" 2021-09-16 11:15:38.366780698 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortInductance_N.mo" 2021-09-16 11:18:51.442137089 +0200
@@ -2,8 +2,8 @@
model TwoPortInductance_N
"Model of an inductance with two electrical ports and neutral line cable"
extends Buildings.Electrical.AC.ThreePhasesUnbalanced.Interfaces.TwoPort_N;
- parameter Modelica.SIunits.Inductance L "Inductance";
- parameter Modelica.SIunits.Inductance Ln "Inductance of neutral cable";
+ parameter Modelica.Units.SI.Inductance L "Inductance";
+ parameter Modelica.Units.SI.Inductance Ln "Inductance of neutral cable";
OnePhase.Lines.TwoPortInductance phase1(
final L=L/3) "Inductance line 1"
annotation (Placement(transformation(extent={{-10,32},{10,52}})));
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRL.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRL.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRL.mo" 2021-09-16 11:15:38.366780698 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRL.mo" 2021-09-16 11:18:51.418137169 +0200
@@ -2,61 +2,61 @@
model TwoPortMatrixRL
"Model of an RL line parameterized with impedance matrices"
extends Buildings.Electrical.AC.ThreePhasesUnbalanced.Interfaces.TwoPort;
- parameter Modelica.SIunits.Voltage V_nominal(min=0, start=480)
+
+ parameter Modelica.Units.SI.Voltage V_nominal(min=0, start=480)
"Nominal voltage (V_nominal >= 0)" annotation(Evaluate=true, Dialog(group="Nominal conditions"));
- parameter Modelica.SIunits.Impedance Z11[2]
+ parameter Modelica.Units.SI.Impedance Z11[2]
"Element [1,1] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z12[2]
+ parameter Modelica.Units.SI.Impedance Z12[2]
"Element [1,2] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z13[2]
+ parameter Modelica.Units.SI.Impedance Z13[2]
"Element [1,3] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z22[2]
+ parameter Modelica.Units.SI.Impedance Z22[2]
"Element [2,2] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z23[2]
+ parameter Modelica.Units.SI.Impedance Z23[2]
"Element [2,3] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z33[2]
+ parameter Modelica.Units.SI.Impedance Z33[2]
"Element [3,3] of impedance matrix";
- final parameter Modelica.SIunits.Impedance[2] Z21 = Z12
+ final parameter Modelica.Units.SI.Impedance[2] Z21 = Z12
"Element [2,1] of impedance matrix";
- final parameter Modelica.SIunits.Impedance[2] Z31 = Z13
+ final parameter Modelica.Units.SI.Impedance[2] Z31 = Z13
"Element [3,1] of impedance matrix";
- final parameter Modelica.SIunits.Impedance[2] Z32 = Z23
+ final parameter Modelica.Units.SI.Impedance[2] Z32 = Z23
"Element [3,1] of impedance matrix";
- Modelica.SIunits.Current i1[2](
+ Modelica.Units.SI.Current i1[2](
each stateSelect = StateSelect.prefer) = terminal_n.phase[1].i
"Current in line 1";
- Modelica.SIunits.Current i2[2](
+ Modelica.Units.SI.Current i2[2](
each stateSelect = StateSelect.prefer) = terminal_n.phase[2].i
"Current in line 2";
- Modelica.SIunits.Current i3[2](
+ Modelica.Units.SI.Current i3[2](
each stateSelect = StateSelect.prefer) = terminal_n.phase[3].i
"Current in line 3";
- Modelica.SIunits.Voltage v1_n[2](
+ Modelica.Units.SI.Voltage v1_n[2](
start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi = 0),
each stateSelect = StateSelect.never) = terminal_n.phase[1].v
"Voltage in line 1 at connector N";
- Modelica.SIunits.Voltage v2_n[2](
+ Modelica.Units.SI.Voltage v2_n[2](
start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi = -2*Modelica.Constants.pi/3),
each stateSelect = StateSelect.never) = terminal_n.phase[2].v
"Voltage in line 2 at connector N";
- Modelica.SIunits.Voltage v3_n[2](
+ Modelica.Units.SI.Voltage v3_n[2](
start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi = 2*Modelica.Constants.pi/3),
each stateSelect = StateSelect.never) = terminal_n.phase[3].v
"Voltage in line 3 at connector N";
- Modelica.SIunits.Voltage v1_p[2](
+ Modelica.Units.SI.Voltage v1_p[2](
start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi = 0),
each stateSelect = StateSelect.never) = terminal_p.phase[1].v
"Voltage in line 1 at connector P";
- Modelica.SIunits.Voltage v2_p[2](
+ Modelica.Units.SI.Voltage v2_p[2](
start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi = -2*Modelica.Constants.pi/3),
each stateSelect = StateSelect.never) = terminal_p.phase[2].v
"Voltage in line 2 at connector P";
- Modelica.SIunits.Voltage v3_p[2](
+ Modelica.Units.SI.Voltage v3_p[2](
start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi = 2*Modelica.Constants.pi/3),
each stateSelect = StateSelect.never) = terminal_p.phase[3].v
"Voltage in line 3 at connector P";
-
protected
function productAC1p = Buildings.Electrical.PhaseSystems.OnePhase.product
"Product between complex quantities";
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRLC.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRLC.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRLC.mo" 2021-09-16 11:15:38.366780698 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRLC.mo" 2021-09-16 11:18:51.382137291 +0200
@@ -2,67 +2,67 @@
model TwoPortMatrixRLC
"PI model of a line parameterized with impedance and admittance matrices"
extends Buildings.Electrical.AC.ThreePhasesUnbalanced.Interfaces.TwoPort;
- parameter Modelica.SIunits.Voltage V_nominal(min=0, start=480)
+ parameter Modelica.Units.SI.Voltage V_nominal(min=0, start=480)
"Nominal voltage (V_nominal >= 0)" annotation(Evaluate=true, Dialog(group="Nominal conditions"));
- parameter Modelica.SIunits.Impedance Z11[2]
+ parameter Modelica.Units.SI.Impedance Z11[2]
"Element [1,1] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z12[2]
+ parameter Modelica.Units.SI.Impedance Z12[2]
"Element [1,2] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z13[2]
+ parameter Modelica.Units.SI.Impedance Z13[2]
"Element [1,3] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z22[2]
+ parameter Modelica.Units.SI.Impedance Z22[2]
"Element [2,2] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z23[2]
+ parameter Modelica.Units.SI.Impedance Z23[2]
"Element [2,3] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z33[2]
+ parameter Modelica.Units.SI.Impedance Z33[2]
"Element [3,3] of impedance matrix";
- final parameter Modelica.SIunits.Impedance[2] Z21 = Z12
+ final parameter Modelica.Units.SI.Impedance[2] Z21 = Z12
"Element [2,1] of impedance matrix";
- final parameter Modelica.SIunits.Impedance[2] Z31 = Z13
+ final parameter Modelica.Units.SI.Impedance[2] Z31 = Z13
"Element [3,1] of impedance matrix";
- final parameter Modelica.SIunits.Impedance[2] Z32 = Z23
+ final parameter Modelica.Units.SI.Impedance[2] Z32 = Z23
"Element [3,1] of impedance matrix";
- parameter Modelica.SIunits.Admittance B11
+ parameter Modelica.Units.SI.Admittance B11
"Element [1,1] of admittance matrix";
- parameter Modelica.SIunits.Admittance B12
+ parameter Modelica.Units.SI.Admittance B12
"Element [1,2] of admittance matrix";
- parameter Modelica.SIunits.Admittance B13
+ parameter Modelica.Units.SI.Admittance B13
"Element [1,3] of admittance matrix";
- parameter Modelica.SIunits.Admittance B22
+ parameter Modelica.Units.SI.Admittance B22
"Element [2,2] of admittance matrix";
- parameter Modelica.SIunits.Admittance B23
+ parameter Modelica.Units.SI.Admittance B23
"Element [2,3] of admittance matrix";
- parameter Modelica.SIunits.Admittance B33
+ parameter Modelica.Units.SI.Admittance B33
"Element [3,3] of admittance matrix";
- final parameter Modelica.SIunits.Admittance B21 = B12
+ final parameter Modelica.Units.SI.Admittance B21 = B12
"Element [2,1] of admittance matrix";
- final parameter Modelica.SIunits.Admittance B31 = B13
+ final parameter Modelica.Units.SI.Admittance B31 = B13
"Element [3,1] of admittance matrix";
- final parameter Modelica.SIunits.Admittance B32 = B23
+ final parameter Modelica.Units.SI.Admittance B32 = B23
"Element [3,2] of admittance matrix";
- Modelica.SIunits.Voltage v1_n[2](
+ Modelica.Units.SI.Voltage v1_n[2](
start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= 0),
each stateSelect = StateSelect.never) = terminal_n.phase[1].v
"Voltage in line 1 at connector N";
- Modelica.SIunits.Voltage v2_n[2](
+ Modelica.Units.SI.Voltage v2_n[2](
start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= -2*Modelica.Constants.pi/3),
each stateSelect = StateSelect.never) = terminal_n.phase[2].v
"Voltage in line 2 at connector N";
- Modelica.SIunits.Voltage v3_n[2](
+ Modelica.Units.SI.Voltage v3_n[2](
start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= 2*Modelica.Constants.pi/3),
each stateSelect = StateSelect.never) = terminal_n.phase[3].v
"Voltage in line 3 at connector N";
- Modelica.SIunits.Voltage v1_p[2](
+ Modelica.Units.SI.Voltage v1_p[2](
start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= 0),
each stateSelect = StateSelect.never) = terminal_p.phase[1].v
"Voltage in line 1 at connector P";
- Modelica.SIunits.Voltage v2_p[2](
+ Modelica.Units.SI.Voltage v2_p[2](
start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= -2*Modelica.Constants.pi/3),
each stateSelect = StateSelect.never) = terminal_p.phase[2].v
"Voltage in line 2 at connector P";
- Modelica.SIunits.Voltage v3_p[2](
+ Modelica.Units.SI.Voltage v3_p[2](
start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= 2*Modelica.Constants.pi/3),
each stateSelect = StateSelect.never) = terminal_p.phase[3].v
"Voltage in line 3 at connector P";
@@ -70,17 +70,17 @@
protected
function productAC1p = Buildings.Electrical.PhaseSystems.OnePhase.product
"Product between complex quantities";
- Modelica.SIunits.Current Isr[3,2](
+
+ Modelica.Units.SI.Current Isr[3,2](
start = zeros(3,Buildings.Electrical.PhaseSystems.OnePhase.n),
each stateSelect = StateSelect.prefer)
"Currents that pass through the lines";
- Modelica.SIunits.Current Ish_p[3,2](
+ Modelica.Units.SI.Current Ish_p[3,2](
start = zeros(3,Buildings.Electrical.PhaseSystems.OnePhase.n),
each stateSelect = StateSelect.prefer) "Shunt current on side p";
- Modelica.SIunits.Current Ish_n[3,2](
+ Modelica.Units.SI.Current Ish_n[3,2](
start = zeros(3,Buildings.Electrical.PhaseSystems.OnePhase.n),
each stateSelect = StateSelect.prefer) "Shunt current on side n";
-
equation
// Link the connectors to propagate the overdetermined variable
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRLC_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRLC_N.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRLC_N.mo" 2021-09-16 11:15:38.366780698 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRLC_N.mo" 2021-09-16 11:18:51.334137452 +0200
@@ -2,103 +2,103 @@
model TwoPortMatrixRLC_N
"PI model of a line parameterized with impedance and admittance matrices and neutral line"
extends Buildings.Electrical.AC.ThreePhasesUnbalanced.Interfaces.TwoPort_N;
- parameter Modelica.SIunits.Voltage V_nominal(min=0, start=480)
+ parameter Modelica.Units.SI.Voltage V_nominal(min=0, start=480)
"Nominal voltage (V_nominal >= 0)" annotation(Evaluate=true, Dialog(group="Nominal conditions"));
- parameter Modelica.SIunits.Impedance Z11[2]
+ parameter Modelica.Units.SI.Impedance Z11[2]
"Element [1,1] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z12[2]
+ parameter Modelica.Units.SI.Impedance Z12[2]
"Element [1,2] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z13[2]
+ parameter Modelica.Units.SI.Impedance Z13[2]
"Element [1,3] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z14[2]
+ parameter Modelica.Units.SI.Impedance Z14[2]
"Element [1,4] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z22[2]
+ parameter Modelica.Units.SI.Impedance Z22[2]
"Element [2,2] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z23[2]
+ parameter Modelica.Units.SI.Impedance Z23[2]
"Element [2,3] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z24[2]
+ parameter Modelica.Units.SI.Impedance Z24[2]
"Element [2,4] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z33[2]
+ parameter Modelica.Units.SI.Impedance Z33[2]
"Element [3,3] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z34[2]
+ parameter Modelica.Units.SI.Impedance Z34[2]
"Element [3,4] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z44[2]
+ parameter Modelica.Units.SI.Impedance Z44[2]
"Element [4,4] of impedance matrix";
- final parameter Modelica.SIunits.Impedance[2] Z21 = Z12
+ final parameter Modelica.Units.SI.Impedance[2] Z21 = Z12
"Element [2,1] of impedance matrix";
- final parameter Modelica.SIunits.Impedance[2] Z31 = Z13
+ final parameter Modelica.Units.SI.Impedance[2] Z31 = Z13
"Element [3,1] of impedance matrix";
- final parameter Modelica.SIunits.Impedance[2] Z32 = Z23
+ final parameter Modelica.Units.SI.Impedance[2] Z32 = Z23
"Element [3,1] of impedance matrix";
- final parameter Modelica.SIunits.Impedance[2] Z41 = Z14
+ final parameter Modelica.Units.SI.Impedance[2] Z41 = Z14
"Element [4,1] of impedance matrix";
- final parameter Modelica.SIunits.Impedance[2] Z42 = Z24
+ final parameter Modelica.Units.SI.Impedance[2] Z42 = Z24
"Element [4,2] of impedance matrix";
- final parameter Modelica.SIunits.Impedance[2] Z43 = Z34
+ final parameter Modelica.Units.SI.Impedance[2] Z43 = Z34
"Element [4,3] of impedance matrix";
- parameter Modelica.SIunits.Admittance B11
+ parameter Modelica.Units.SI.Admittance B11
"Element [1,1] of admittance matrix";
- parameter Modelica.SIunits.Admittance B12
+ parameter Modelica.Units.SI.Admittance B12
"Element [1,2] of admittance matrix";
- parameter Modelica.SIunits.Admittance B13
+ parameter Modelica.Units.SI.Admittance B13
"Element [1,3] of admittance matrix";
- parameter Modelica.SIunits.Admittance B14
+ parameter Modelica.Units.SI.Admittance B14
"Element [1,4] of admittance matrix";
- parameter Modelica.SIunits.Admittance B22
+ parameter Modelica.Units.SI.Admittance B22
"Element [2,2] of admittance matrix";
- parameter Modelica.SIunits.Admittance B23
+ parameter Modelica.Units.SI.Admittance B23
"Element [2,3] of admittance matrix";
- parameter Modelica.SIunits.Admittance B24
+ parameter Modelica.Units.SI.Admittance B24
"Element [2,4] of admittance matrix";
- parameter Modelica.SIunits.Admittance B33
+ parameter Modelica.Units.SI.Admittance B33
"Element [3,3] of admittance matrix";
- parameter Modelica.SIunits.Admittance B34
+ parameter Modelica.Units.SI.Admittance B34
"Element [3,4] of admittance matrix";
- parameter Modelica.SIunits.Admittance B44
+ parameter Modelica.Units.SI.Admittance B44
"Element [4,4] of admittance matrix";
- final parameter Modelica.SIunits.Admittance B21 = B12
+ final parameter Modelica.Units.SI.Admittance B21 = B12
"Element [2,1] of admittance matrix";
- final parameter Modelica.SIunits.Admittance B31 = B13
+ final parameter Modelica.Units.SI.Admittance B31 = B13
"Element [3,1] of admittance matrix";
- final parameter Modelica.SIunits.Admittance B32 = B23
+ final parameter Modelica.Units.SI.Admittance B32 = B23
"Element [3,2] of admittance matrix";
- final parameter Modelica.SIunits.Admittance B41 = B14
+ final parameter Modelica.Units.SI.Admittance B41 = B14
"Element [4,1] of admittance matrix";
- final parameter Modelica.SIunits.Admittance B42 = B24
+ final parameter Modelica.Units.SI.Admittance B42 = B24
"Element [4,2] of admittance matrix";
- final parameter Modelica.SIunits.Admittance B43 = B34
+ final parameter Modelica.Units.SI.Admittance B43 = B34
"Element [4,3] of admittance matrix";
- Modelica.SIunits.Voltage v1_n[2](
+ Modelica.Units.SI.Voltage v1_n[2](
start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= 0),
each stateSelect = StateSelect.never) = terminal_n.phase[1].v
"Voltage in line 1 at connector N";
- Modelica.SIunits.Voltage v2_n[2](
+ Modelica.Units.SI.Voltage v2_n[2](
start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= -2*Modelica.Constants.pi/3),
each stateSelect = StateSelect.never) = terminal_n.phase[2].v
"Voltage in line 2 at connector N";
- Modelica.SIunits.Voltage v3_n[2](
+ Modelica.Units.SI.Voltage v3_n[2](
start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= 2*Modelica.Constants.pi/3),
each stateSelect = StateSelect.never) = terminal_n.phase[3].v
"Voltage in line 3 at connector N";
- Modelica.SIunits.Voltage v4_n[2](
+ Modelica.Units.SI.Voltage v4_n[2](
start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(0),
each stateSelect = StateSelect.never) = terminal_n.phase[4].v
"Voltage in line 4 (neutral) at connector N";
- Modelica.SIunits.Voltage v1_p[2](
+ Modelica.Units.SI.Voltage v1_p[2](
start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= 0),
each stateSelect = StateSelect.never) = terminal_p.phase[1].v
"Voltage in line 1 at connector P";
- Modelica.SIunits.Voltage v2_p[2](
+ Modelica.Units.SI.Voltage v2_p[2](
start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= -2*Modelica.Constants.pi/3),
each stateSelect = StateSelect.never) = terminal_p.phase[2].v
"Voltage in line 2 at connector P";
- Modelica.SIunits.Voltage v3_p[2](
+ Modelica.Units.SI.Voltage v3_p[2](
start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= 2*Modelica.Constants.pi/3),
each stateSelect = StateSelect.never) = terminal_p.phase[3].v
"Voltage in line 3 at connector P";
- Modelica.SIunits.Voltage v4_p[2](
+ Modelica.Units.SI.Voltage v4_p[2](
start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(0),
each stateSelect = StateSelect.never) = terminal_p.phase[4].v
"Voltage in line 4 (neutral) at connector P";
@@ -106,14 +106,14 @@
protected
function productAC1p = Buildings.Electrical.PhaseSystems.OnePhase.product
"Product between complex quantities";
- Modelica.SIunits.Current Isr[4,2](
+
+ Modelica.Units.SI.Current Isr[4,2](
each stateSelect = StateSelect.prefer)
"Currents that pass through the lines";
- Modelica.SIunits.Current Ish_p[4,2](
+ Modelica.Units.SI.Current Ish_p[4,2](
each stateSelect = StateSelect.prefer) "Shunt current on side p";
- Modelica.SIunits.Current Ish_n[4,2](
+ Modelica.Units.SI.Current Ish_n[4,2](
each stateSelect = StateSelect.prefer) "Shunt current on side n";
-
equation
// Link the connectors to propagate the overdetermined variable
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRL_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRL_N.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRL_N.mo" 2021-09-16 11:15:38.366780698 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortMatrixRL_N.mo" 2021-09-16 11:18:51.274137654 +0200
@@ -2,86 +2,86 @@
model TwoPortMatrixRL_N
"Model of an RL line parameterized with impedance matrices and neutral line"
extends Buildings.Electrical.AC.ThreePhasesUnbalanced.Interfaces.TwoPort_N;
- parameter Modelica.SIunits.Voltage V_nominal(min=0, start=480)
+
+ parameter Modelica.Units.SI.Voltage V_nominal(min=0, start=480)
"Nominal voltage (V_nominal >= 0)" annotation(Evaluate=true, Dialog(group="Nominal conditions"));
- parameter Modelica.SIunits.Impedance Z11[2]
+ parameter Modelica.Units.SI.Impedance Z11[2]
"Element [1,1] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z12[2]
+ parameter Modelica.Units.SI.Impedance Z12[2]
"Element [1,2] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z13[2]
+ parameter Modelica.Units.SI.Impedance Z13[2]
"Element [1,3] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z14[2]
+ parameter Modelica.Units.SI.Impedance Z14[2]
"Element [1,4] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z22[2]
+ parameter Modelica.Units.SI.Impedance Z22[2]
"Element [2,2] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z23[2]
+ parameter Modelica.Units.SI.Impedance Z23[2]
"Element [2,3] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z24[2]
+ parameter Modelica.Units.SI.Impedance Z24[2]
"Element [2,4] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z33[2]
+ parameter Modelica.Units.SI.Impedance Z33[2]
"Element [3,3] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z34[2]
+ parameter Modelica.Units.SI.Impedance Z34[2]
"Element [3,4] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z44[2]
+ parameter Modelica.Units.SI.Impedance Z44[2]
"Element [4,4] of impedance matrix";
- final parameter Modelica.SIunits.Impedance[2] Z21 = Z12
+ final parameter Modelica.Units.SI.Impedance[2] Z21 = Z12
"Element [2,1] of impedance matrix";
- final parameter Modelica.SIunits.Impedance[2] Z31 = Z13
+ final parameter Modelica.Units.SI.Impedance[2] Z31 = Z13
"Element [3,1] of impedance matrix";
- final parameter Modelica.SIunits.Impedance[2] Z32 = Z23
+ final parameter Modelica.Units.SI.Impedance[2] Z32 = Z23
"Element [3,1] of impedance matrix";
- final parameter Modelica.SIunits.Impedance[2] Z41 = Z14
+ final parameter Modelica.Units.SI.Impedance[2] Z41 = Z14
"Element [4,1] of impedance matrix";
- final parameter Modelica.SIunits.Impedance[2] Z42 = Z24
+ final parameter Modelica.Units.SI.Impedance[2] Z42 = Z24
"Element [4,2] of impedance matrix";
- final parameter Modelica.SIunits.Impedance[2] Z43 = Z34
+ final parameter Modelica.Units.SI.Impedance[2] Z43 = Z34
"Element [4,3] of impedance matrix";
- Modelica.SIunits.Current i1[2](
+ Modelica.Units.SI.Current i1[2](
each stateSelect = StateSelect.prefer) = terminal_n.phase[1].i
"Current in line 1";
- Modelica.SIunits.Current i2[2](
+ Modelica.Units.SI.Current i2[2](
each stateSelect = StateSelect.prefer) = terminal_n.phase[2].i
"Current in line 2";
- Modelica.SIunits.Current i3[2](
+ Modelica.Units.SI.Current i3[2](
each stateSelect = StateSelect.prefer) = terminal_n.phase[3].i
"Current in line 3";
- Modelica.SIunits.Current i4[2](
+ Modelica.Units.SI.Current i4[2](
each stateSelect = StateSelect.prefer) = terminal_n.phase[4].i
"Current in line 4 (neutral)";
- Modelica.SIunits.Voltage v1_n[2](
+ Modelica.Units.SI.Voltage v1_n[2](
start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= 0),
each stateSelect = StateSelect.never) = terminal_n.phase[1].v
"Voltage in line 1 at connector N";
- Modelica.SIunits.Voltage v2_n[2](
+ Modelica.Units.SI.Voltage v2_n[2](
start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= -2*Modelica.Constants.pi/3),
each stateSelect = StateSelect.never) = terminal_n.phase[2].v
"Voltage in line 2 at connector N";
- Modelica.SIunits.Voltage v3_n[2](
+ Modelica.Units.SI.Voltage v3_n[2](
start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= 2*Modelica.Constants.pi/3),
each stateSelect = StateSelect.never) = terminal_n.phase[3].v
"Voltage in line 3 at connector N";
- Modelica.SIunits.Voltage v4_n[2](
+ Modelica.Units.SI.Voltage v4_n[2](
start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(0),
each stateSelect = StateSelect.never) = terminal_n.phase[4].v
"Voltage in line 4 (neutral) at connector N";
- Modelica.SIunits.Voltage v1_p[2](
+ Modelica.Units.SI.Voltage v1_p[2](
start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= 0),
each stateSelect = StateSelect.never) = terminal_p.phase[1].v
"Voltage in line 1 at connector P";
- Modelica.SIunits.Voltage v2_p[2](
+ Modelica.Units.SI.Voltage v2_p[2](
start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= -2*Modelica.Constants.pi/3),
each stateSelect = StateSelect.never) = terminal_p.phase[2].v
"Voltage in line 2 at connector P";
- Modelica.SIunits.Voltage v3_p[2](
+ Modelica.Units.SI.Voltage v3_p[2](
start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(V_nominal/sqrt(3), phi= 2*Modelica.Constants.pi/3),
each stateSelect = StateSelect.never) = terminal_p.phase[3].v
"Voltage in line 3 at connector P";
- Modelica.SIunits.Voltage v4_p[2](
+ Modelica.Units.SI.Voltage v4_p[2](
start = Buildings.Electrical.PhaseSystems.OnePhase.phaseVoltages(0),
each stateSelect = StateSelect.never) = terminal_p.phase[4].v
"Voltage in line 4 (neutral) at connector P";
-
protected
function productAC1p = Buildings.Electrical.PhaseSystems.OnePhase.product
"Product between complex quantities";
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRL.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRL.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRL.mo" 2021-09-16 11:15:38.366780698 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRL.mo" 2021-09-16 11:18:51.230137802 +0200
@@ -3,21 +3,21 @@
"Model of a resistive-inductive element with two electrical ports"
extends Modelica.Electrical.Analog.Interfaces.ConditionalHeatPort;
extends Buildings.Electrical.AC.ThreePhasesUnbalanced.Interfaces.TwoPort;
- parameter Modelica.SIunits.Resistance R "Resistance at temperature T_ref"
+ parameter Modelica.Units.SI.Resistance R "Resistance at temperature T_ref"
annotation(Evaluate=true);
- parameter Modelica.SIunits.Temperature T_ref = 298.15 "Reference temperature"
+ parameter Modelica.Units.SI.Temperature T_ref = 298.15 "Reference temperature"
annotation(Evaluate=true);
- parameter Modelica.SIunits.Temperature M = 507.65
+ parameter Modelica.Units.SI.Temperature M = 507.65
"Temperature constant (R_actual = R*(M + T_heatPort)/(M + T_ref))"
annotation(Evaluate=true);
- parameter Modelica.SIunits.Inductance L "Inductance";
- parameter Modelica.SIunits.Current i1_start[2] = {0,0}
+ parameter Modelica.Units.SI.Inductance L "Inductance";
+ parameter Modelica.Units.SI.Current i1_start[2] = {0,0}
"Initial current phasor of phase 1 (positive if entering from terminal p)"
annotation (Dialog(enable = (mode==Buildings.Electrical.Types.Load.FixedZ_dynamic)));
- parameter Modelica.SIunits.Current i2_start[2] = {0,0}
+ parameter Modelica.Units.SI.Current i2_start[2] = {0,0}
"Initial current phasor of phase 2 (positive if entering from terminal p)"
annotation (Dialog(enable = (mode==Buildings.Electrical.Types.Load.FixedZ_dynamic)));
- parameter Modelica.SIunits.Current i3_start[2] = {0,0}
+ parameter Modelica.Units.SI.Current i3_start[2] = {0,0}
"Initial current phasor of phase 3 (positive if entering from terminal p)"
annotation (Dialog(enable = (mode==Buildings.Electrical.Types.Load.FixedZ_dynamic)));
parameter Buildings.Electrical.Types.Load mode(
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRLC.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRLC.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRLC.mo" 2021-09-16 11:15:38.366780698 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRLC.mo" 2021-09-16 11:18:51.190137937 +0200
@@ -2,20 +2,20 @@
model TwoPortRLC "Model of an RLC element with two electrical ports"
extends Modelica.Electrical.Analog.Interfaces.ConditionalHeatPort;
extends Buildings.Electrical.AC.ThreePhasesUnbalanced.Interfaces.TwoPort;
- parameter Modelica.SIunits.Resistance R "Resistance at temperature T_ref";
- parameter Modelica.SIunits.Capacitance C "Capacity";
- parameter Modelica.SIunits.Inductance L "Inductance";
- parameter Modelica.SIunits.Temperature T_ref = 298.15 "Reference temperature"
+ parameter Modelica.Units.SI.Resistance R "Resistance at temperature T_ref";
+ parameter Modelica.Units.SI.Capacitance C "Capacity";
+ parameter Modelica.Units.SI.Inductance L "Inductance";
+ parameter Modelica.Units.SI.Temperature T_ref = 298.15 "Reference temperature"
annotation(Evaluate=true);
- parameter Modelica.SIunits.Temperature M = 507.65
+ parameter Modelica.Units.SI.Temperature M = 507.65
"Temperature constant (R_actual = R*(M + T_heatPort)/(M + T_ref))" annotation(Evaluate=true);
- parameter Modelica.SIunits.Voltage Vc1_start[2] = V_nominal/sqrt(3)*{1,0}
+ parameter Modelica.Units.SI.Voltage Vc1_start[2] = V_nominal/sqrt(3)*{1,0}
"Initial voltage phasor of the capacitance located in the middle of phase 1"
annotation (Dialog(enable = (mode==Buildings.Electrical.Types.Load.FixedZ_dynamic)));
- parameter Modelica.SIunits.Voltage Vc2_start[2] = V_nominal/sqrt(3)*{-1/2,-sqrt(3)/2}
+ parameter Modelica.Units.SI.Voltage Vc2_start[2] = V_nominal/sqrt(3)*{-1/2,-sqrt(3)/2}
"Initial voltage phasor of the capacitance located in the middle of phase 1"
annotation (Dialog(enable = (mode==Buildings.Electrical.Types.Load.FixedZ_dynamic)));
- parameter Modelica.SIunits.Voltage Vc3_start[2] = V_nominal/sqrt(3)*{-1/2,+sqrt(3)/2}
+ parameter Modelica.Units.SI.Voltage Vc3_start[2] = V_nominal/sqrt(3)*{-1/2,+sqrt(3)/2}
"Initial voltage phasor of the capacitance located in the middle of phase 1"
annotation (Dialog(enable = (mode==Buildings.Electrical.Types.Load.FixedZ_dynamic)));
parameter Buildings.Electrical.Types.Load mode(
@@ -24,7 +24,7 @@
Buildings.Electrical.Types.Load.FixedZ_steady_state
"Type of model (e.g., steady state, dynamic, prescribed power consumption, etc.)"
annotation (Evaluate=true, Dialog(group="Modeling assumption"));
- parameter Modelica.SIunits.Voltage V_nominal(min=0, start=480)
+ parameter Modelica.Units.SI.Voltage V_nominal(min=0, start=480)
"Nominal voltage (V_nominal >= 0)"
annotation (
Evaluate=true,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRLC_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRLC_N.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRLC_N.mo" 2021-09-16 11:15:38.366780698 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRLC_N.mo" 2021-09-16 11:18:51.154138058 +0200
@@ -3,24 +3,24 @@
"Model of an RLC element with two electrical ports and neutral line cable"
extends Modelica.Electrical.Analog.Interfaces.ConditionalHeatPort;
extends Buildings.Electrical.AC.ThreePhasesUnbalanced.Interfaces.TwoPort_N;
- parameter Modelica.SIunits.Resistance R "Resistance at temperature T_ref";
- parameter Modelica.SIunits.Resistance Rn
+ parameter Modelica.Units.SI.Resistance R "Resistance at temperature T_ref";
+ parameter Modelica.Units.SI.Resistance Rn
"Resistance of neutral cable at temperature T_ref";
- parameter Modelica.SIunits.Capacitance C "Capacity";
- parameter Modelica.SIunits.Capacitance Cn "Capacityof neutral cable";
- parameter Modelica.SIunits.Inductance L "Inductance";
- parameter Modelica.SIunits.Inductance Ln "Inductance of neutral cable";
- parameter Modelica.SIunits.Temperature T_ref = 298.15 "Reference temperature"
+ parameter Modelica.Units.SI.Capacitance C "Capacity";
+ parameter Modelica.Units.SI.Capacitance Cn "Capacityof neutral cable";
+ parameter Modelica.Units.SI.Inductance L "Inductance";
+ parameter Modelica.Units.SI.Inductance Ln "Inductance of neutral cable";
+ parameter Modelica.Units.SI.Temperature T_ref = 298.15 "Reference temperature"
annotation(Evaluate=true);
- parameter Modelica.SIunits.Temperature M = 507.65
+ parameter Modelica.Units.SI.Temperature M = 507.65
"Temperature constant (R_actual = R*(M + T_heatPort)/(M + T_ref))" annotation(Evaluate=true);
- parameter Modelica.SIunits.Voltage Vc1_start[2] = V_nominal/sqrt(3)*{1,0}
+ parameter Modelica.Units.SI.Voltage Vc1_start[2] = V_nominal/sqrt(3)*{1,0}
"Initial voltage phasor of the capacitance located in the middle of phase 1"
annotation (Dialog(enable = (mode==Buildings.Electrical.Types.Load.FixedZ_dynamic)));
- parameter Modelica.SIunits.Voltage Vc2_start[2] = V_nominal/sqrt(3)*{-1/2,-sqrt(3)/2}
+ parameter Modelica.Units.SI.Voltage Vc2_start[2] = V_nominal/sqrt(3)*{-1/2,-sqrt(3)/2}
"Initial voltage phasor of the capacitance located in the middle of phase 1"
annotation (Dialog(enable = (mode==Buildings.Electrical.Types.Load.FixedZ_dynamic)));
- parameter Modelica.SIunits.Voltage Vc3_start[2] = V_nominal/sqrt(3)*{-1/2,+sqrt(3)/2}
+ parameter Modelica.Units.SI.Voltage Vc3_start[2] = V_nominal/sqrt(3)*{-1/2,+sqrt(3)/2}
"Initial voltage phasor of the capacitance located in the middle of phase 1"
annotation (Dialog(enable = (mode==Buildings.Electrical.Types.Load.FixedZ_dynamic)));
parameter Buildings.Electrical.Types.Load mode(
@@ -29,7 +29,7 @@
Buildings.Electrical.Types.Load.FixedZ_steady_state
"Type of model (e.g., steady state, dynamic, prescribed power consumption, etc.)"
annotation (Evaluate=true, Dialog(group="Modeling assumption"));
- parameter Modelica.SIunits.Voltage V_nominal(min=0, start=480)
+ parameter Modelica.Units.SI.Voltage V_nominal(min=0, start=480)
"Nominal voltage (V_nominal >= 0)"
annotation (
Evaluate=true,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRL_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRL_N.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRL_N.mo" 2021-09-16 11:15:38.366780698 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortRL_N.mo" 2021-09-16 11:18:51.110138206 +0200
@@ -3,23 +3,23 @@
"Model of a resistive-inductive element with two electrical ports and neutral line cable"
extends Modelica.Electrical.Analog.Interfaces.ConditionalHeatPort;
extends Buildings.Electrical.AC.ThreePhasesUnbalanced.Interfaces.TwoPort_N;
- parameter Modelica.SIunits.Resistance R "Resistance at temperature T_ref";
- parameter Modelica.SIunits.Resistance Rn
+ parameter Modelica.Units.SI.Resistance R "Resistance at temperature T_ref";
+ parameter Modelica.Units.SI.Resistance Rn
"Resistance of neutral cable at temperature T_ref";
- parameter Modelica.SIunits.Temperature T_ref = 298.15 "Reference temperature"
+ parameter Modelica.Units.SI.Temperature T_ref = 298.15 "Reference temperature"
annotation(Evaluate=true);
- parameter Modelica.SIunits.Temperature M = 507.65
+ parameter Modelica.Units.SI.Temperature M = 507.65
"Temperature constant (R_actual = R*(M + T_heatPort)/(M + T_ref))"
annotation(Evaluate=true);
- parameter Modelica.SIunits.Inductance L "Inductance";
- parameter Modelica.SIunits.Inductance Ln "Inductance of neutral cable";
- parameter Modelica.SIunits.Current i1_start[2] = {0,0}
+ parameter Modelica.Units.SI.Inductance L "Inductance";
+ parameter Modelica.Units.SI.Inductance Ln "Inductance of neutral cable";
+ parameter Modelica.Units.SI.Current i1_start[2] = {0,0}
"Initial current phasor of phase 1 (positive if entering from terminal p)"
annotation (Dialog(enable = (mode==Buildings.Electrical.Types.Load.FixedZ_dynamic)));
- parameter Modelica.SIunits.Current i2_start[2] = {0,0}
+ parameter Modelica.Units.SI.Current i2_start[2] = {0,0}
"Initial current phasor of phase 2 (positive if entering from terminal p)"
annotation (Dialog(enable = (mode==Buildings.Electrical.Types.Load.FixedZ_dynamic)));
- parameter Modelica.SIunits.Current i3_start[2] = {0,0}
+ parameter Modelica.Units.SI.Current i3_start[2] = {0,0}
"Initial current phasor of phase 3 (positive if entering from terminal p)"
annotation (Dialog(enable = (mode==Buildings.Electrical.Types.Load.FixedZ_dynamic)));
parameter Buildings.Electrical.Types.Load mode(
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortResistance.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortResistance.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortResistance.mo" 2021-09-16 11:15:38.366780698 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortResistance.mo" 2021-09-16 11:18:51.074138327 +0200
@@ -2,12 +2,12 @@
model TwoPortResistance "Model of a resistance with two electrical ports"
extends Modelica.Electrical.Analog.Interfaces.ConditionalHeatPort;
extends Buildings.Electrical.AC.ThreePhasesUnbalanced.Interfaces.TwoPort;
- parameter Modelica.SIunits.Temperature T_ref = 298.15 "Reference temperature"
+ parameter Modelica.Units.SI.Temperature T_ref = 298.15 "Reference temperature"
annotation(Evaluate=true);
- parameter Modelica.SIunits.Temperature M = 507.65
+ parameter Modelica.Units.SI.Temperature M = 507.65
"Temperature constant (R_actual = R*(M + T_heatPort)/(M + T_ref))"
annotation(Evaluate=true);
- parameter Modelica.SIunits.Resistance R "Resistance at temperature T_ref";
+ parameter Modelica.Units.SI.Resistance R "Resistance at temperature T_ref";
OnePhase.Lines.TwoPortResistance phase1(
final T_ref=T_ref,
final M=M,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortResistance_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortResistance_N.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortResistance_N.mo" 2021-09-16 11:15:38.366780698 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Lines/TwoPortResistance_N.mo" 2021-09-16 11:18:51.050138408 +0200
@@ -3,13 +3,13 @@
"Model of a resistance with two electrical ports and neutral cable"
extends Modelica.Electrical.Analog.Interfaces.ConditionalHeatPort;
extends Buildings.Electrical.AC.ThreePhasesUnbalanced.Interfaces.TwoPort_N;
- parameter Modelica.SIunits.Temperature T_ref = 298.15 "Reference temperature"
+ parameter Modelica.Units.SI.Temperature T_ref = 298.15 "Reference temperature"
annotation(Evaluate=true);
- parameter Modelica.SIunits.Temperature M = 507.65
+ parameter Modelica.Units.SI.Temperature M = 507.65
"Temperature constant (R_actual = R*(M + T_heatPort)/(M + T_ref))"
annotation(Evaluate=true);
- parameter Modelica.SIunits.Resistance R "Resistance at temperature T_ref";
- parameter Modelica.SIunits.Resistance Rn
+ parameter Modelica.Units.SI.Resistance R "Resistance at temperature T_ref";
+ parameter Modelica.Units.SI.Resistance Rn
"Resistance of neutral cable at temperature T_ref";
OnePhase.Lines.TwoPortResistance phase1(
final T_ref=T_ref,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Loads/BaseClasses/BaseImpedance.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Loads/BaseClasses/BaseImpedance.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Loads/BaseClasses/BaseImpedance.mo" 2021-09-16 11:15:38.366780698 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Loads/BaseClasses/BaseImpedance.mo" 2021-09-16 11:18:50.838139121 +0200
@@ -62,34 +62,34 @@
choice=true "Inductive",
choice=false "Capacitive",
__Dymola_radioButtons=true));
- parameter Modelica.SIunits.Resistance R(start = 1,min=0) = 1 "Resistance"
+ parameter Modelica.Units.SI.Resistance R(start = 1,min=0) = 1 "Resistance"
annotation (Dialog(enable= not use_R_in));
- parameter Modelica.SIunits.Inductance L(start=0, min=0) = 0 "Inductance"
+ parameter Modelica.Units.SI.Inductance L(start=0, min=0) = 0 "Inductance"
annotation (Dialog(enable=inductive and (not use_L_in)));
- parameter Modelica.SIunits.Capacitance C(start=0,min=0) = 0 "Capacitance"
+ parameter Modelica.Units.SI.Capacitance C(start=0,min=0) = 0 "Capacitance"
annotation (Dialog(enable=(not inductive) and (not use_C_in)));
parameter Boolean use_R_in = false "if true, R is specified by an input"
annotation(Evaluate=true, Dialog(tab = "Variable load", group="Resistance"));
- parameter Modelica.SIunits.Resistance RMin(start = R, min=Modelica.Constants.eps) = 1e-4
+ parameter Modelica.Units.SI.Resistance RMin(start = R, min=Modelica.Constants.eps) = 1e-4
"Minimum value of the resistance"
annotation(Evaluate=true, Dialog(enable = use_R_in, tab = "Variable load", group="Resistance"));
- parameter Modelica.SIunits.Resistance RMax(start = R, min=Modelica.Constants.eps) = 1e2
+ parameter Modelica.Units.SI.Resistance RMax(start = R, min=Modelica.Constants.eps) = 1e2
"Maximum value of the resistance"
annotation(Evaluate=true, Dialog(enable = use_R_in, tab = "Variable load", group="Resistance"));
parameter Boolean use_C_in = false "if true, C is specified by an input"
annotation(Evaluate=true, Dialog(tab = "Variable load", group="Capacitance"));
- parameter Modelica.SIunits.Capacitance CMin(start = C, min=Modelica.Constants.eps) = 1e-4
+ parameter Modelica.Units.SI.Capacitance CMin(start = C, min=Modelica.Constants.eps) = 1e-4
"Minimum value of the capacitance"
annotation(Evaluate=true, Dialog(enable = use_C_in, tab = "Variable load", group="Capacitance"));
- parameter Modelica.SIunits.Capacitance CMax(start = C, min=Modelica.Constants.eps) = 1e2
+ parameter Modelica.Units.SI.Capacitance CMax(start = C, min=Modelica.Constants.eps) = 1e2
"Maximum value of the capacitance"
annotation(Evaluate=true, Dialog(enable = use_C_in, tab = "Variable load", group="Capacitance"));
parameter Boolean use_L_in = false "if true, L is specified by an input"
annotation(Evaluate=true, Dialog(tab = "Variable load", group="Inductance"));
- parameter Modelica.SIunits.Inductance LMin(start = L, min=Modelica.Constants.eps) = 1e-4
+ parameter Modelica.Units.SI.Inductance LMin(start = L, min=Modelica.Constants.eps) = 1e-4
"Minimum value of the inductance"
annotation(Evaluate=true, Dialog(enable = use_L_in, tab = "Variable load", group="Inductance"));
- parameter Modelica.SIunits.Inductance LMax(start = L, min=Modelica.Constants.eps) = 1e2
+ parameter Modelica.Units.SI.Inductance LMax(start = L, min=Modelica.Constants.eps) = 1e2
"Maximum value of the inductance"
annotation(Evaluate=true, Dialog(enable = use_L_in, tab = "Variable load", group="Inductance"));
Modelica.Blocks.Interfaces.RealInput y_R(min=0, max=1) if use_R_in
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Loads/BaseClasses/BaseLoadCtrl.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Loads/BaseClasses/BaseLoadCtrl.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Loads/BaseClasses/BaseLoadCtrl.mo" 2021-09-16 11:15:38.366780698 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Loads/BaseClasses/BaseLoadCtrl.mo" 2021-09-16 11:18:50.786139297 +0200
@@ -13,12 +13,12 @@
Buildings.Electrical.Types.Load.FixedZ_steady_state "Parameters that specifies the mode of the load (e.g., steady state,
dynamic, prescribed power consumption, etc.)" annotation(Dialog(group="Modeling assumption"));
- parameter Modelica.SIunits.Power P_nominal=0
+ parameter Modelica.Units.SI.Power P_nominal=0
"Nominal power (negative if consumed, positive if generated)"
annotation(Dialog(group="Nominal conditions",
enable = mode <> Buildings.Electrical.Types.Load.VariableZ_P_input));
- parameter Modelica.SIunits.Voltage V_nominal(min=0, start = 480)
+ parameter Modelica.Units.SI.Voltage V_nominal(min=0, start = 480)
"Nominal voltage (V_nominal >= 0)"
annotation(Dialog(group="Nominal conditions"));
parameter Boolean voltageCtrl = false "This flag enables the voltage control"
@@ -26,7 +26,7 @@
parameter Real vThresh(min=0.0, max=1.0) = 0.1
"Threshold that activates voltage ctrl (ratio of nominal voltage)" annotation(Dialog(group="Voltage CTRL",
enable = voltageCtrl));
- parameter Modelica.SIunits.Time tDelay = 300
+ parameter Modelica.Units.SI.Time tDelay = 300
"Time to wait before plugging the load again after disconnection" annotation(Dialog(group="Voltage CTRL",
enable = voltageCtrl));
parameter Types.InitMode initMode=Buildings.Electrical.Types.InitMode.zero_current
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Loads/Examples/LoadCtrl.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Loads/Examples/LoadCtrl.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Loads/Examples/LoadCtrl.mo" 2021-09-16 11:15:38.366780698 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Loads/Examples/LoadCtrl.mo" 2021-09-16 11:18:50.582139984 +0200
@@ -4,7 +4,7 @@
Sources.FixedVoltage_N sou(f=60, V=480) "Voltage source"
annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
Modelica.Blocks.Sources.Sine pow_1(
- freqHz=0.1,
+ f =0.1,
amplitude=4500,
offset=6000) "Power on phase 1"
annotation (Placement(transformation(extent={{60,10},{40,30}})));
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Loads/Examples/Loads.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Loads/Examples/Loads.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Loads/Examples/Loads.mo" 2021-09-16 11:15:38.370780685 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Loads/Examples/Loads.mo" 2021-09-16 11:18:50.562140051 +0200
@@ -7,7 +7,7 @@
annotation (Placement(transformation(extent={{-94,-10},{-74,10}})));
Modelica.Blocks.Sources.Sine ph_1(
amplitude=2000,
- freqHz=10,
+f =10,
offset=-2500) "Power signal for loads on phase 1"
annotation (Placement(transformation(extent={{80,30},{60,50}})));
Modelica.Blocks.Sources.Constant ph_23(k=0)
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Sensors/BaseClasses/GeneralizedProbe.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Sensors/BaseClasses/GeneralizedProbe.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Sensors/BaseClasses/GeneralizedProbe.mo" 2021-09-16 11:15:38.370780685 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Sensors/BaseClasses/GeneralizedProbe.mo" 2021-09-16 11:18:50.390140630 +0200
@@ -2,7 +2,7 @@
partial model GeneralizedProbe
"Partial model of a generalized three-phase probe"
extends Icons.GeneralizedProbe;
- parameter Modelica.SIunits.Voltage V_nominal(min=0, start=480)
+ parameter Modelica.Units.SI.Voltage V_nominal(min=0, start=480)
"RMS Nominal voltage (V_nominal >= 0)";
parameter Boolean perUnit = true "This flag display voltage in p.u.";
Modelica.Blocks.Interfaces.RealOutput V[3](each unit="1")
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Sources/BaseClasses/BaseUnbalancedPV.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Sources/BaseClasses/BaseUnbalancedPV.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Sources/BaseClasses/BaseUnbalancedPV.mo" 2021-09-16 11:15:38.370780685 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Sources/BaseClasses/BaseUnbalancedPV.mo" 2021-09-16 11:18:50.070141706 +0200
@@ -3,7 +3,7 @@
extends Buildings.Electrical.Interfaces.PartialPluggableUnbalanced;
extends Buildings.Electrical.Interfaces.PartialPvBase;
extends Buildings.Electrical.Interfaces.PartialAcDcParameters;
- parameter Modelica.SIunits.Voltage V_nominal(min=0, start=480)
+ parameter Modelica.Units.SI.Voltage V_nominal(min=0, start=480)
"Nominal voltage (V_nominal >= 0)"
annotation(Dialog(group="Nominal conditions"));
parameter Real areaFraction[3](each min=0, each max=1.0) = ones(3)/3
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Sources/FixedVoltage.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Sources/FixedVoltage.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Sources/FixedVoltage.mo" 2021-09-16 11:15:38.370780685 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Sources/FixedVoltage.mo" 2021-09-16 11:18:49.854142433 +0200
@@ -2,16 +2,16 @@
model FixedVoltage "Fixed voltage source"
extends
Buildings.Electrical.AC.ThreePhasesUnbalanced.Sources.BaseClasses.PartialSource;
- parameter Modelica.SIunits.Frequency f(start=60) "Frequency of the source";
- parameter Modelica.SIunits.Voltage V(start=480) "RMS voltage of the source";
- parameter Modelica.SIunits.Angle phiSou = 0 "Phase shift of the source";
+ parameter Modelica.Units.SI.Frequency f(start=60) "Frequency of the source";
+ parameter Modelica.Units.SI.Voltage V(start=480) "RMS voltage of the source";
+ parameter Modelica.Units.SI.Angle phiSou = 0 "Phase shift of the source";
parameter Boolean potentialReference = true
"Serve as potential root for the reference angle theta"
annotation (Evaluate=true, Dialog(group="Reference Parameters"));
parameter Boolean definiteReference = false
"Serve as definite root for the reference angle theta"
annotation (Evaluate=true, Dialog(group="Reference Parameters"));
- constant Modelica.SIunits.Angle angle120 = 2*Modelica.Constants.pi/3
+ constant Modelica.Units.SI.Angle angle120 = 2*Modelica.Constants.pi/3
"Phase shift between the phase voltages";
OnePhase.Sources.FixedVoltage vPhase[3](
each f=f,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Sources/FixedVoltage_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Sources/FixedVoltage_N.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Sources/FixedVoltage_N.mo" 2021-09-16 11:15:38.370780685 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Sources/FixedVoltage_N.mo" 2021-09-16 11:18:49.838142487 +0200
@@ -2,16 +2,16 @@
model FixedVoltage_N "Fixed voltage source with neutral cable"
extends
Buildings.Electrical.AC.ThreePhasesUnbalanced.Sources.BaseClasses.PartialSource_N;
- parameter Modelica.SIunits.Frequency f(start = 60) "Frequency of the source";
- parameter Modelica.SIunits.Voltage V(start = 480) "RMS voltage of the source";
- parameter Modelica.SIunits.Angle phiSou = 0 "Phase shift of the source";
+ parameter Modelica.Units.SI.Frequency f(start = 60) "Frequency of the source";
+ parameter Modelica.Units.SI.Voltage V(start = 480) "RMS voltage of the source";
+ parameter Modelica.Units.SI.Angle phiSou = 0 "Phase shift of the source";
parameter Boolean potentialReference = true
"Serve as potential root for the reference angle theta"
annotation (Evaluate=true, Dialog(group="Reference Parameters"));
parameter Boolean definiteReference = false
"Serve as definite root for the reference angle theta"
annotation (Evaluate=true, Dialog(group="Reference Parameters"));
- constant Modelica.SIunits.Angle angle120 = 2*Modelica.Constants.pi/3
+ constant Modelica.Units.SI.Angle angle120 = 2*Modelica.Constants.pi/3
"Phase shift between the phase voltages";
OnePhase.Sources.FixedVoltage vPhase[3](
each f=f,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Sources/Grid.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Sources/Grid.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Sources/Grid.mo" 2021-09-16 11:15:38.370780685 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Sources/Grid.mo" 2021-09-16 11:18:49.818142554 +0200
@@ -1,8 +1,8 @@
within Buildings.Electrical.AC.ThreePhasesUnbalanced.Sources;
model Grid "Electrical grid"
- parameter Modelica.SIunits.Frequency f(start = 60) "Frequency of the source";
- parameter Modelica.SIunits.Voltage V(start = 480) "RMS voltage of the source";
- parameter Modelica.SIunits.Angle phiSou = 0 "Phase shift of the source";
+ parameter Modelica.Units.SI.Frequency f(start = 60) "Frequency of the source";
+ parameter Modelica.Units.SI.Voltage V(start = 480) "RMS voltage of the source";
+ parameter Modelica.Units.SI.Angle phiSou = 0 "Phase shift of the source";
Buildings.Electrical.AC.Interfaces.PowerOutput P[3]
"Power consumed from grid if positive, or fed to grid if negative"
annotation (Placement(transformation(extent={{100,-10},{120,10}})));
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Sources/Grid_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Sources/Grid_N.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Sources/Grid_N.mo" 2021-09-16 11:15:38.370780685 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Sources/Grid_N.mo" 2021-09-16 11:18:49.794142635 +0200
@@ -1,8 +1,8 @@
within Buildings.Electrical.AC.ThreePhasesUnbalanced.Sources;
model Grid_N "Electrical grid with neutral cable"
- parameter Modelica.SIunits.Frequency f(start = 60) "Frequency of the source";
- parameter Modelica.SIunits.Voltage V(start = 480) "RMS voltage of the source";
- parameter Modelica.SIunits.Angle phiSou = 0 "Phase shift of the source";
+ parameter Modelica.Units.SI.Frequency f(start = 60) "Frequency of the source";
+ parameter Modelica.Units.SI.Voltage V(start = 480) "RMS voltage of the source";
+ parameter Modelica.Units.SI.Angle phiSou = 0 "Phase shift of the source";
Buildings.Electrical.AC.Interfaces.PowerOutput P[3]
"Power consumed from grid if positive, or fed to grid if negative"
annotation (Placement(transformation(extent={{100,-10},{120,10}})));
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Sources/PVsimpleOriented.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Sources/PVsimpleOriented.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Sources/PVsimpleOriented.mo" 2021-09-16 11:15:38.370780685 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Sources/PVsimpleOriented.mo" 2021-09-16 11:18:49.758142756 +0200
@@ -6,9 +6,9 @@
redeclare Buildings.Electrical.AC.OnePhase.Sources.PVSimple pv_phase1,
redeclare Buildings.Electrical.AC.OnePhase.Sources.PVSimple pv_phase2,
redeclare Buildings.Electrical.AC.OnePhase.Sources.PVSimple pv_phase3);
- parameter Modelica.SIunits.Angle til "Surface tilt" annotation(Dialog(group="Orientation"));
- parameter Modelica.SIunits.Angle lat "Latitude" annotation(Dialog(group="Orientation"));
- parameter Modelica.SIunits.Angle azi "Surface Azimith" annotation(Dialog(group="Orientation"));
+ parameter Modelica.Units.SI.Angle til "Surface tilt" annotation(Dialog(group="Orientation"));
+ parameter Modelica.Units.SI.Angle lat "Latitude" annotation(Dialog(group="Orientation"));
+ parameter Modelica.Units.SI.Angle azi "Surface Azimith" annotation(Dialog(group="Orientation"));
BoundaryConditions.SolarIrradiation.DiffusePerez HDifTil(
final til=til,
final lat=lat,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Sources/PVsimpleOriented_N.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Sources/PVsimpleOriented_N.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Sources/PVsimpleOriented_N.mo" 2021-09-16 11:15:38.370780685 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Sources/PVsimpleOriented_N.mo" 2021-09-16 11:18:49.738142824 +0200
@@ -5,9 +5,9 @@
redeclare Buildings.Electrical.AC.OnePhase.Sources.PVSimple pv_phase1,
redeclare Buildings.Electrical.AC.OnePhase.Sources.PVSimple pv_phase2,
redeclare Buildings.Electrical.AC.OnePhase.Sources.PVSimple pv_phase3);
- parameter Modelica.SIunits.Angle til "Surface tilt" annotation(Dialog(group="Orientation"));
- parameter Modelica.SIunits.Angle lat "Latitude" annotation(Dialog(group="Orientation"));
- parameter Modelica.SIunits.Angle azi "Surface Azimith" annotation(Dialog(group="Orientation"));
+ parameter Modelica.Units.SI.Angle til "Surface tilt" annotation(Dialog(group="Orientation"));
+ parameter Modelica.Units.SI.Angle lat "Latitude" annotation(Dialog(group="Orientation"));
+ parameter Modelica.Units.SI.Angle azi "Surface Azimith" annotation(Dialog(group="Orientation"));
BoundaryConditions.SolarIrradiation.DiffusePerez HDifTil(
final til=til,
final lat=lat,
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Validation/IEEETests/Test4NodesFeeder/BaseClasses/IEEE4.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Validation/IEEETests/Test4NodesFeeder/BaseClasses/IEEE4.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Validation/IEEETests/Test4NodesFeeder/BaseClasses/IEEE4.mo" 2021-09-16 11:15:38.370780685 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/AC/ThreePhasesUnbalanced/Validation/IEEETests/Test4NodesFeeder/BaseClasses/IEEE4.mo" 2021-09-16 11:18:49.334144184 +0200
@@ -1,12 +1,12 @@
within Buildings.Electrical.AC.ThreePhasesUnbalanced.Validation.IEEETests.Test4NodesFeeder.BaseClasses;
partial model IEEE4 "Base model of the IEEE 4 nodes test feeder"
extends Modelica.Icons.Example;
- parameter Modelica.SIunits.Voltage VLL_side1 = 12.47e3
+ parameter Modelica.Units.SI.Voltage VLL_side1 = 12.47e3
"Voltage line to line side 1";
- parameter Modelica.SIunits.Voltage VLL_side2 = 4.16e3
+ parameter Modelica.Units.SI.Voltage VLL_side2 = 4.16e3
"Voltage line to line side 2";
- parameter Modelica.SIunits.ApparentPower VARbase = 6000e3
+ parameter Modelica.Units.SI.ApparentPower VARbase = 6000e3
"Base VA power of the transformer";
parameter Boolean line1_use_Z_y = true
@@ -14,29 +14,29 @@
parameter Boolean line2_use_Z_y = true
"Choose between Zy or Zd impedance matrix for line 2";
- parameter Modelica.SIunits.Voltage V2_ref[3] = {7107, 7140, 7121}
+ parameter Modelica.Units.SI.Voltage V2_ref[3] = {7107, 7140, 7121}
"Reference RMS voltage node 2 - IEEE results";
- parameter Modelica.SIunits.Voltage V3_ref[3] = {2247, 2269, 2256}
+ parameter Modelica.Units.SI.Voltage V3_ref[3] = {2247, 2269, 2256}
"Reference RMS voltage node 3 - IEEE results";
- parameter Modelica.SIunits.Voltage V4_ref[3] = {1918, 2061, 1981}
+ parameter Modelica.Units.SI.Voltage V4_ref[3] = {1918, 2061, 1981}
"Reference RMS voltage node 4 - IEEE results";
- parameter Modelica.SIunits.Angle Theta2_ref[3](each displayUnit="deg") = {-0.3, -120.3, 119.6}
+ parameter Modelica.Units.SI.Angle Theta2_ref[3](each displayUnit="deg") = {-0.3, -120.3, 119.6}
"Reference voltage phase angle node 2 - IEEE results";
- parameter Modelica.SIunits.Angle Theta3_ref[3](each displayUnit="deg") = {-3.7, -123.5, 116.4}
+ parameter Modelica.Units.SI.Angle Theta3_ref[3](each displayUnit="deg") = {-3.7, -123.5, 116.4}
"Reference voltage phase angle node 3 - IEEE results";
- parameter Modelica.SIunits.Angle Theta4_ref[3](each displayUnit="deg") = {-9.1, -128.3, 110.9}
+ parameter Modelica.Units.SI.Angle Theta4_ref[3](each displayUnit="deg") = {-9.1, -128.3, 110.9}
"Reference voltage phase angle node 4 - IEEE results";
- Modelica.SIunits.Voltage err_V2[3] = node2.V - V2_ref
+ Modelica.Units.SI.Voltage err_V2[3] = node2.V - V2_ref
"Error on voltage at node 2";
- Modelica.SIunits.Voltage err_V3[3] = node3.V - V3_ref
+ Modelica.Units.SI.Voltage err_V3[3] = node3.V - V3_ref
"Error on voltage at node 3";
- Modelica.SIunits.Voltage err_V4[3] = node4.V - V4_ref
+ Modelica.Units.SI.Voltage err_V4[3] = node4.V - V4_ref
"Error on voltage at node 4";
- Modelica.SIunits.Angle err_Theta2[3](each displayUnit="deg") = node2.theta - Theta2_ref
+ Modelica.Units.SI.Angle err_Theta2[3](each displayUnit="deg") = node2.theta - Theta2_ref
"Error on voltage at node 2";
- Modelica.SIunits.Angle err_Theta3[3](each displayUnit="deg") = node3.theta - Theta3_ref
+ Modelica.Units.SI.Angle err_Theta3[3](each displayUnit="deg") = node3.theta - Theta3_ref
"Error on voltage at node 3";
- Modelica.SIunits.Angle err_Theta4[3](each displayUnit="deg") = node4.theta - Theta4_ref
+ Modelica.Units.SI.Angle err_Theta4[3](each displayUnit="deg") = node4.theta - Theta4_ref
"Error on voltage at node 4";
Real err_V2_percent[3] = 100*{err_V2[i]/V2_ref[i] for i in 1:3}
"Error in RMS voltage at node 2 -- percent";
@@ -100,30 +100,30 @@
parameter Real L1 = 2000*(1.0/5280.0) "Length line 1 in miles";
parameter Real L2 = 2500*(1.0/5280.0) "Length line 2 in miles";
- parameter Modelica.SIunits.Impedance Z11_d[2] = {0.4013,1.4133}
+ parameter Modelica.Units.SI.Impedance Z11_d[2] = {0.4013,1.4133}
"Element [1,1] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z12_d[2] = {0.0953,0.8515}
+ parameter Modelica.Units.SI.Impedance Z12_d[2] = {0.0953,0.8515}
"Element [1,2] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z13_d[2] = {0.0953,0.7266}
+ parameter Modelica.Units.SI.Impedance Z13_d[2] = {0.0953,0.7266}
"Element [1,3] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z22_d[2] = {0.4013,1.4133}
+ parameter Modelica.Units.SI.Impedance Z22_d[2] = {0.4013,1.4133}
"Element [2,2] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z23_d[2] = {0.0953,0.7802}
+ parameter Modelica.Units.SI.Impedance Z23_d[2] = {0.0953,0.7802}
"Element [2,3] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z33_d[2] = {0.4013,1.4133}
+ parameter Modelica.Units.SI.Impedance Z33_d[2] = {0.4013,1.4133}
"Element [3,3] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z11_y[2] = {0.4576,1.078}
+ parameter Modelica.Units.SI.Impedance Z11_y[2] = {0.4576,1.078}
"Element [1,1] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z12_y[2] = {0.1559,0.5017}
+ parameter Modelica.Units.SI.Impedance Z12_y[2] = {0.1559,0.5017}
"Element [1,2] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z13_y[2] = {0.1535,0.3849}
+ parameter Modelica.Units.SI.Impedance Z13_y[2] = {0.1535,0.3849}
"Element [1,3] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z22_y[2] = {0.4666,1.0482}
+ parameter Modelica.Units.SI.Impedance Z22_y[2] = {0.4666,1.0482}
"Element [2,2] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z23_y[2] = {0.158,0.4236}
+ parameter Modelica.Units.SI.Impedance Z23_y[2] = {0.158,0.4236}
"Element [2,3] of impedance matrix";
- parameter Modelica.SIunits.Impedance Z33_y[2] = {0.4615,1.0651}
+ parameter Modelica.Units.SI.Impedance Z33_y[2] = {0.4615,1.0651}
"Element [3,3] of impedance matrix";
equation
connect(source.terminal, line1.terminal_n) annotation (Line(
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Conversion/DCDCConverter.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Conversion/DCDCConverter.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Conversion/DCDCConverter.mo" 2021-09-16 11:15:38.370780685 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Conversion/DCDCConverter.mo" 2021-09-16 11:18:49.106144951 +0200
@@ -5,21 +5,21 @@
redeclare package PhaseSystem_n = PhaseSystems.TwoConductor,
redeclare Interfaces.Terminal_n terminal_n,
redeclare Interfaces.Terminal_p terminal_p);
- parameter Modelica.SIunits.Voltage VHigh
+ parameter Modelica.Units.SI.Voltage VHigh
"DC voltage on side 1 of the transformer (primary side)";
- parameter Modelica.SIunits.Voltage VLow
+ parameter Modelica.Units.SI.Voltage VLow
"DC voltage on side 2 of the transformer (secondary side)";
- parameter Modelica.SIunits.Efficiency eta(max=1) "Converter efficiency";
+ parameter Modelica.Units.SI.Efficiency eta(max=1) "Converter efficiency";
parameter Boolean ground_1 = true "Connect side 1 of converter to ground" annotation(Evaluate=true, Dialog(tab = "Ground", group="side 1"));
parameter Boolean ground_2 = true "Connect side 2 of converter to ground" annotation(Evaluate=true, Dialog(tab = "Ground", group="side 2"));
- Modelica.SIunits.Power LossPower "Loss power";
+ Modelica.Units.SI.Power LossPower "Loss power";
protected
parameter Real conversionFactor = VLow/VHigh
"Ratio of high versus low voltage";
- Modelica.SIunits.Current i1,i2;
- Modelica.SIunits.Voltage v1,v2;
- Modelica.SIunits.Power P_p "Power at terminal p";
- Modelica.SIunits.Power P_n "Power at terminal n";
+ Modelica.Units.SI.Current i1,i2;
+ Modelica.Units.SI.Voltage v1,v2;
+ Modelica.Units.SI.Power P_p "Power at terminal p";
+ Modelica.Units.SI.Power P_n "Power at terminal n";
equation
Connections.potentialRoot(terminal_n.theta);
Connections.potentialRoot(terminal_p.theta);
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Lines/Examples/DCLines.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Lines/Examples/DCLines.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Lines/Examples/DCLines.mo" 2021-09-16 11:15:38.370780685 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Lines/Examples/DCLines.mo" 2021-09-16 11:18:48.842145839 +0200
@@ -5,7 +5,7 @@
parameter Boolean linearLoads = false
"Flag that selects between linearized or nonlinear load models";
parameter Real L = 10 "Length of each cable";
- Modelica.SIunits.Power Sloads = load1.S[1] + load2.S[1] +load3.S[1] +load4.S[1] +
+ Modelica.Units.SI.Power Sloads = load1.S[1] + load2.S[1] +load3.S[1] +load4.S[1] +
load5.S[1] +load6.S[1] +load7.S[1] +load8.S[1] +load9.S[1] +
load10.S[1] "Sum of the power consumed by the loads";
Line line(
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Lines/TwoPortRCLine.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Lines/TwoPortRCLine.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Lines/TwoPortRCLine.mo" 2021-09-16 11:15:38.370780685 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Lines/TwoPortRCLine.mo" 2021-09-16 11:18:48.730146216 +0200
@@ -9,9 +9,9 @@
parameter Boolean use_C = false
"Set to true to add a capacitance in the center of the line"
annotation(Dialog(tab="Model", group="Assumptions"));
- parameter Modelica.SIunits.Voltage Vc_start = V_nominal
+ parameter Modelica.Units.SI.Voltage Vc_start = V_nominal
"Initial value of the voltage of the capacitance in the middle of the line";
- Modelica.SIunits.Voltage Vc(start = Vc_start, stateSelect = StateSelect.prefer)
+ Modelica.Units.SI.Voltage Vc(start = Vc_start, stateSelect = StateSelect.prefer)
"Voltage of the capacitor";
initial equation
if C>0 and use_C then
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Loads/Conductor.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Loads/Conductor.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Loads/Conductor.mo" 2021-09-16 11:15:38.374780672 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Loads/Conductor.mo" 2021-09-16 11:18:48.694146337 +0200
@@ -4,7 +4,7 @@
redeclare package PhaseSystem = PhaseSystems.TwoConductor,
redeclare Interfaces.Terminal_n terminal);
protected
- Modelica.SIunits.Voltage absDV
+ Modelica.Units.SI.Voltage absDV
"Absolute value of the voltage difference between the two conductors (used by the linearized model)";
equation
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Loads/Resistor.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Loads/Resistor.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Loads/Resistor.mo" 2021-09-16 11:15:38.374780672 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Loads/Resistor.mo" 2021-09-16 11:18:48.618146593 +0200
@@ -6,12 +6,12 @@
final mode=Buildings.Electrical.Types.Load.FixedZ_steady_state,
final P_nominal=V_nominal^2/max(R, Modelica.Constants.small));
extends Modelica.Electrical.Analog.Interfaces.ConditionalHeatPort(T = T_ref);
- parameter Modelica.SIunits.Resistance R(start=1)
+ parameter Modelica.Units.SI.Resistance R(start=1)
"Resistance at temperature T_ref";
- parameter Modelica.SIunits.Temperature T_ref=300.15 "Reference temperature";
- parameter Modelica.SIunits.LinearTemperatureCoefficient alpha=0
+ parameter Modelica.Units.SI.Temperature T_ref=300.15 "Reference temperature";
+ parameter Modelica.Units.SI.LinearTemperatureCoefficient alpha=0
"Temperature coefficient of resistance (R_actual = R*(1 + alpha*(T_heatPort - T_ref))";
- Modelica.SIunits.Resistance R_actual
+ Modelica.Units.SI.Resistance R_actual
"Actual resistance = R*(1 + alpha*(T_heatPort - T_ref))";
equation
assert((1 + alpha*(T_heatPort - T_ref)) >= Modelica.Constants.eps, "Temperature outside of scope of model");
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Sources/BaseClasses/WindCorrection.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Sources/BaseClasses/WindCorrection.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Sources/BaseClasses/WindCorrection.mo" 2021-09-16 11:15:38.374780672 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Sources/BaseClasses/WindCorrection.mo" 2021-09-16 11:18:48.546146836 +0200
@@ -1,8 +1,8 @@
within Buildings.Electrical.DC.Sources.BaseClasses;
block WindCorrection "Block for wind correction"
extends Modelica.Blocks.Icons.Block;
- parameter Modelica.SIunits.Height h "Height over ground";
- parameter Modelica.SIunits.Height hRef
+ parameter Modelica.Units.SI.Height h "Height over ground";
+ parameter Modelica.Units.SI.Height hRef
"Reference height for wind measurement";
parameter Real n(min=0) = 0.4 "Height exponent for wind profile calculation";
Modelica.Blocks.Interfaces.RealOutput vLoc( unit="m/s")
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Sources/ConstantVoltage.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Sources/ConstantVoltage.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Sources/ConstantVoltage.mo" 2021-09-16 11:15:38.374780672 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Sources/ConstantVoltage.mo" 2021-09-16 11:18:48.534146876 +0200
@@ -5,7 +5,7 @@
redeclare Interfaces.Terminal_p terminal,
final potentialReference=true,
final definiteReference=false);
- parameter Modelica.SIunits.Voltage V(start=1) "Value of constant voltage";
+ parameter Modelica.Units.SI.Voltage V(start=1) "Value of constant voltage";
Modelica.Electrical.Analog.Interfaces.NegativePin n "Negative pin"
annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
equation
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Sources/Examples/VoltageSource.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Sources/Examples/VoltageSource.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Sources/Examples/VoltageSource.mo" 2021-09-16 11:15:38.374780672 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Sources/Examples/VoltageSource.mo" 2021-09-16 11:18:48.482147051 +0200
@@ -15,7 +15,7 @@
annotation (Placement(transformation(extent={{-14,-10},{6,10}})));
Modelica.Blocks.Sources.Sine cosine(
phase=0,
- freqHz=1,
+f =1,
offset=12,
amplitude=3) "Variable voltage signal"
annotation (Placement(transformation(extent={{-120,-4},{-100,16}})));
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Storage/BaseClasses/Charge.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Storage/BaseClasses/Charge.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Storage/BaseClasses/Charge.mo" 2021-09-16 11:15:38.374780672 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Storage/BaseClasses/Charge.mo" 2021-09-16 11:18:48.230147899 +0200
@@ -1,15 +1,15 @@
within Buildings.Electrical.DC.Storage.BaseClasses;
model Charge "Model to compute the battery charge"
extends Modelica.Blocks.Icons.Block;
- parameter Modelica.SIunits.Efficiency etaCha(max=1) = 0.9
+ parameter Modelica.Units.SI.Efficiency etaCha(max=1) = 0.9
"Efficiency during charging";
- parameter Modelica.SIunits.Efficiency etaDis(max=1) = 0.9
+ parameter Modelica.Units.SI.Efficiency etaDis(max=1) = 0.9
"Efficiency during discharging";
parameter Real SOC_start(min=0, max=1, unit="1")=0.1
"Initial state of charge";
- parameter Modelica.SIunits.Energy EMax(min=0, displayUnit="kWh")
+ parameter Modelica.Units.SI.Energy EMax(min=0, displayUnit="kWh")
"Maximum available charge";
- Modelica.SIunits.Power PAct "Actual power";
+ Modelica.Units.SI.Power PAct "Actual power";
Modelica.Blocks.Interfaces.RealInput P(final quantity="Power",
final unit="W") annotation (Placement(transformation(
extent={{-140,-20},{-100,20}}),iconTransformation(extent={{-140,-20},{
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Storage/Battery.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Storage/Battery.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Storage/Battery.mo" 2021-09-16 11:15:38.374780672 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Storage/Battery.mo" 2021-09-16 11:18:48.214147953 +0200
@@ -1,13 +1,13 @@
within Buildings.Electrical.DC.Storage;
model Battery "Simple model of a battery"
- parameter Modelica.SIunits.Efficiency etaCha(max=1) = 0.9
+ parameter Modelica.Units.SI.Efficiency etaCha(max=1) = 0.9
"Efficiency during charging";
- parameter Modelica.SIunits.Efficiency etaDis(max=1) = 0.9
+ parameter Modelica.Units.SI.Efficiency etaDis(max=1) = 0.9
"Efficiency during discharging";
parameter Real SOC_start(min=0, max=1, unit="1")=0.1 "Initial state of charge";
- parameter Modelica.SIunits.Energy EMax(min=0, displayUnit="kWh")
+ parameter Modelica.Units.SI.Energy EMax(min=0, displayUnit="kWh")
"Maximum available charge";
- parameter Modelica.SIunits.Voltage V_nominal
+ parameter Modelica.Units.SI.Voltage V_nominal
"Nominal voltage (V_nominal >= 0)";
Modelica.Blocks.Interfaces.RealInput P(unit="W")
"Power stored in battery (if positive), or extracted from battery (if negative)"
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Storage/Examples/Battery.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Storage/Examples/Battery.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Storage/Examples/Battery.mo" 2021-09-16 11:15:38.374780672 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/DC/Storage/Examples/Battery.mo" 2021-09-16 11:18:48.174148087 +0200
@@ -45,7 +45,7 @@
extent={{-10,-10},{10,10}},
rotation=90,
origin={120,-60})));
- Modelica.StateGraph.InitialStep off "Off state" annotation (Placement(
+ Modelica.StateGraph.InitialStep off(nIn = 1, nOut = 1) "Off state" annotation (Placement(
transformation(
extent={{-10,-10},{10,10}},
origin={-130,80})));
@@ -53,16 +53,16 @@
Placement(transformation(
extent={{-10,-10},{10,10}},
origin={-100,80})));
- Modelica.StateGraph.StepWithSignal charge "State to charge battery"
+ Modelica.StateGraph.StepWithSignal charge(nIn = 1, nOut = 1) "State to charge battery"
annotation (Placement(transformation(extent={{-80,70},{-60,90}})));
Modelica.StateGraph.TransitionWithSignal toHold "Transition to hold"
annotation (Placement(transformation(extent={{-50,70},{-30,90}})));
- Modelica.StateGraph.Step hold "Battery charge is hold"
+ Modelica.StateGraph.Step hold(nIn = 1, nOut = 1) "Battery charge is hold"
annotation (Placement(transformation(extent={{-20,70},{0,90}})));
Modelica.StateGraph.TransitionWithSignal toDischarge
"Transition to discharge"
annotation (Placement(transformation(extent={{10,70},{30,90}})));
- Modelica.StateGraph.StepWithSignal discharge "State to discharge battery"
+ Modelica.StateGraph.StepWithSignal discharge(nIn = 1, nOut = 1) "State to discharge battery"
annotation (Placement(transformation(extent={{40,70},{60,90}})));
Modelica.StateGraph.TransitionWithSignal toOff "Transition to off"
annotation (Placement(transformation(extent={{70,70},{90,90}})));
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Examples/RenewableSources.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Examples/RenewableSources.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Examples/RenewableSources.mo" 2021-09-16 11:15:38.374780672 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Examples/RenewableSources.mo" 2021-09-16 11:18:48.122148262 +0200
@@ -2,19 +2,19 @@
model RenewableSources
"Example model that shows the impact of renewable sources on the electrical grid"
extends Modelica.Icons.Example;
- parameter Modelica.SIunits.Frequency f = 60 "Nominal grid frequency";
- parameter Modelica.SIunits.Voltage V_nominal = 480 "Nominal grid voltage";
- parameter Modelica.SIunits.Power PLoa_nominal = 3500
+ parameter Modelica.Units.SI.Frequency f = 60 "Nominal grid frequency";
+ parameter Modelica.Units.SI.Voltage V_nominal = 480 "Nominal grid voltage";
+ parameter Modelica.Units.SI.Power PLoa_nominal = 3500
"Nominal power of a load";
- parameter Modelica.SIunits.Power PWin = PLoa_nominal*4
+ parameter Modelica.Units.SI.Power PWin = PLoa_nominal*4
"Nominal power of the wind turbine";
- parameter Modelica.SIunits.Power PSun = PLoa_nominal*1.0
+ parameter Modelica.Units.SI.Power PSun = PLoa_nominal*1.0
"Nominal power of the PV";
- parameter Modelica.SIunits.DensityOfHeatFlowRate W_m2_nominal = 1000
+ parameter Modelica.Units.SI.DensityOfHeatFlowRate W_m2_nominal = 1000
"Nominal solar power per unit area";
parameter Real eff_PV = 0.12*0.85*0.9
"Nominal solar power conversion efficiency (this should consider converion efficiency, area covered, AC/DC losses)";
- parameter Modelica.SIunits.Area A_PV = PSun/eff_PV/W_m2_nominal
+ parameter Modelica.Units.SI.Area A_PV = PSun/eff_PV/W_m2_nominal
"Nominal area of a P installation";
AC.ThreePhasesBalanced.Sources.Grid gri(
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/CapacitiveLoad.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/CapacitiveLoad.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/CapacitiveLoad.mo" 2021-09-16 11:15:38.374780672 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/CapacitiveLoad.mo" 2021-09-16 11:18:47.966148787 +0200
@@ -20,11 +20,11 @@
function j = PhaseSystem.j "J operator that rotates of 90 degrees";
Modelica.Blocks.Interfaces.RealInput pf_internal
"Hidden value of the input load for the conditional connector";
- Modelica.SIunits.ElectricCharge q[2](each stateSelect=StateSelect.prefer)
+ Modelica.Units.SI.ElectricCharge q[2](each stateSelect=StateSelect.prefer)
"Electric charge";
- Modelica.SIunits.Admittance[2] Y "Admittance";
- Modelica.SIunits.AngularVelocity omega "Angular velocity";
- Modelica.SIunits.Power Q = P*tan(-acos(pf_internal))
+ Modelica.Units.SI.Admittance[2] Y "Admittance";
+ Modelica.Units.SI.AngularVelocity omega "Angular velocity";
+ Modelica.Units.SI.Power Q = P*tan(-acos(pf_internal))
"Reactive power (negative because capacitive load)";
equation
connect(pf_in, pf_internal);
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/Impedance.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/Impedance.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/Impedance.mo" 2021-09-16 11:15:38.374780672 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/Impedance.mo" 2021-09-16 11:18:47.938148881 +0200
@@ -11,34 +11,34 @@
choice=true "Inductive",
choice=false "Capacitive",
__Dymola_radioButtons=true));
- parameter Modelica.SIunits.Resistance R(start = 1,min=0) = 1 "Resistance"
+ parameter Modelica.Units.SI.Resistance R(start = 1,min=0) = 1 "Resistance"
annotation (Dialog(enable= not use_R_in));
- parameter Modelica.SIunits.Inductance L(start=0, min=0) = 0 "Inductance"
+ parameter Modelica.Units.SI.Inductance L(start=0, min=0) = 0 "Inductance"
annotation (Dialog(enable=inductive and (not use_L_in)));
- parameter Modelica.SIunits.Capacitance C(start=0,min=0) = 0 "Capacitance"
+ parameter Modelica.Units.SI.Capacitance C(start=0,min=0) = 0 "Capacitance"
annotation (Dialog(enable=(not inductive) and (not use_C_in)));
parameter Boolean use_R_in = false "If true, R is specified by an input"
annotation(Evaluate=true, Dialog(tab = "Variable load", group="Resistance"));
- parameter Modelica.SIunits.Resistance RMin(start = R, min=Modelica.Constants.eps) = 1e-4
+ parameter Modelica.Units.SI.Resistance RMin(start = R, min=Modelica.Constants.eps) = 1e-4
"Minimum value of the resistance"
annotation(Evaluate=true, Dialog(enable = use_R_in, tab = "Variable load", group="Resistance"));
- parameter Modelica.SIunits.Resistance RMax(start = R, min=Modelica.Constants.eps) = 1e2
+ parameter Modelica.Units.SI.Resistance RMax(start = R, min=Modelica.Constants.eps) = 1e2
"Maximum value of the resistance"
annotation(Evaluate=true, Dialog(enable = use_R_in, tab = "Variable load", group="Resistance"));
parameter Boolean use_C_in = false "If true, C is specified by an input"
annotation(Evaluate=true, Dialog(tab = "Variable load", group="Capacitance"));
- parameter Modelica.SIunits.Capacitance CMin(start = C, min=Modelica.Constants.eps) = 1e-4
+ parameter Modelica.Units.SI.Capacitance CMin(start = C, min=Modelica.Constants.eps) = 1e-4
"Minimum value of the capacitance"
annotation(Evaluate=true, Dialog(enable = use_C_in, tab = "Variable load", group="Capacitance"));
- parameter Modelica.SIunits.Capacitance CMax(start = C, min=Modelica.Constants.eps) = 1e2
+ parameter Modelica.Units.SI.Capacitance CMax(start = C, min=Modelica.Constants.eps) = 1e2
"Maximum value of the capacitance"
annotation(Evaluate=true, Dialog(enable = use_C_in, tab = "Variable load", group="Capacitance"));
parameter Boolean use_L_in = false "If true, L is specified by an input"
annotation(Evaluate=true, Dialog(tab = "Variable load", group="Inductance"));
- parameter Modelica.SIunits.Inductance LMin(start = L, min=Modelica.Constants.eps) = 1e-4
+ parameter Modelica.Units.SI.Inductance LMin(start = L, min=Modelica.Constants.eps) = 1e-4
"Minimum value of the inductance"
annotation(Evaluate=true, Dialog(enable = use_L_in, tab = "Variable load", group="Inductance"));
- parameter Modelica.SIunits.Inductance LMax(start = L, min=Modelica.Constants.eps) = 1e2
+ parameter Modelica.Units.SI.Inductance LMax(start = L, min=Modelica.Constants.eps) = 1e2
"Maximum value of the inductance"
annotation(Evaluate=true, Dialog(enable = use_L_in, tab = "Variable load", group="Inductance"));
Modelica.Blocks.Interfaces.RealInput y_R(min=0, max=1) if use_R_in
@@ -66,11 +66,11 @@
"Internal signal used to compute the variable C_internal";
Modelica.Blocks.Interfaces.RealOutput y_L_internal
"Internal signal used to compute the variable L_internal";
- Modelica.SIunits.Resistance R_internal
+ Modelica.Units.SI.Resistance R_internal
"Actual resistance used to compute the impedance";
- Modelica.SIunits.Inductance L_internal
+ Modelica.Units.SI.Inductance L_internal
"Actual inductance used to compute the impedance";
- Modelica.SIunits.Capacitance C_internal
+ Modelica.Units.SI.Capacitance C_internal
"Actual capacitance used to compute the impedance";
equation
// These assertions ensures that if the variable R, L or C is computed using the inputs
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/InductiveLoad.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/InductiveLoad.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/InductiveLoad.mo" 2021-09-16 11:15:38.374780672 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/InductiveLoad.mo" 2021-09-16 11:18:47.910148975 +0200
@@ -20,11 +20,11 @@
function j = PhaseSystem.j "J operator that rotates of 90 degrees";
Modelica.Blocks.Interfaces.RealInput pf_internal
"Hidden value of the input load for the conditional connector";
- Modelica.SIunits.MagneticFlux psi[2](each stateSelect=StateSelect.prefer)
+ Modelica.Units.SI.MagneticFlux psi[2](each stateSelect=StateSelect.prefer)
"Magnetic flux";
- Modelica.SIunits.Impedance Z[2] "Impedance of the load";
- Modelica.SIunits.AngularVelocity omega "Angular frequency";
- Modelica.SIunits.Power Q = P*tan(acos(pf_internal))
+ Modelica.Units.SI.Impedance Z[2] "Impedance of the load";
+ Modelica.Units.SI.AngularVelocity omega "Angular frequency";
+ Modelica.Units.SI.Power Q = P*tan(acos(pf_internal))
"Reactive power (positive because inductive load)";
equation
connect(pf_in, pf_internal);
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/Load.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/Load.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/Load.mo" 2021-09-16 11:15:38.374780672 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/Load.mo" 2021-09-16 11:18:47.898149016 +0200
@@ -12,12 +12,12 @@
"Type of load model (e.g., steady state, dynamic, prescribed power consumption, etc.)"
annotation (Evaluate=true, Dialog(group="Modeling assumption"));
- parameter Modelica.SIunits.Power P_nominal = 0
+ parameter Modelica.Units.SI.Power P_nominal = 0
"Nominal power (negative if consumed, positive if generated). Used if mode <> Buildings.Electrical.Types.Load.VariableZ_P_input"
annotation(Dialog(group="Nominal conditions",
enable = mode <> Buildings.Electrical.Types.Load.VariableZ_P_input));
- parameter Modelica.SIunits.Voltage V_nominal(min=0, start=110)
+ parameter Modelica.Units.SI.Voltage V_nominal(min=0, start=110)
"Nominal voltage (V_nominal >= 0)"
annotation (
Evaluate=true,
@@ -28,13 +28,13 @@
max=Buildings.Electrical.Types.InitMode.linearized) = Buildings.Electrical.Types.InitMode.zero_current
"Initialization mode for homotopy operator" annotation(Dialog(tab = "Initialization"));
- Modelica.SIunits.Voltage v[:](start = PhaseSystem.phaseVoltages(V_nominal)) = terminal.v
+ Modelica.Units.SI.Voltage v[:](start = PhaseSystem.phaseVoltages(V_nominal)) = terminal.v
"Voltage vector";
- Modelica.SIunits.Current i[:](each start=0) = terminal.i
+ Modelica.Units.SI.Current i[:](each start=0) = terminal.i
"Current vector";
- Modelica.SIunits.Power S[PhaseSystem.n] = PhaseSystem.phasePowers_vi(v, -i)
+ Modelica.Units.SI.Power S[PhaseSystem.n] = PhaseSystem.phasePowers_vi(v, -i)
"Phase powers";
- Modelica.SIunits.Power P(start=0)
+ Modelica.Units.SI.Power P(start=0)
"Power of the load (negative if consumed, positive if fed into the electrical grid)";
Modelica.Blocks.Interfaces.RealInput y(min=0, max=1, unit="1") if
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/PartialConversion.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/PartialConversion.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/PartialConversion.mo" 2021-09-16 11:15:38.374780672 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/PartialConversion.mo" 2021-09-16 11:18:47.858149150 +0200
@@ -2,10 +2,10 @@
model PartialConversion
"Model representing a generic two port system for conversion"
extends Buildings.Electrical.Interfaces.PartialTwoPort;
- Modelica.SIunits.Voltage v_p "Voltage drop between the two positive pins";
- Modelica.SIunits.Voltage v_n "Voltage drop between the two negative pins";
- Modelica.SIunits.Current i_p "Current flowing through the positive pins";
- Modelica.SIunits.Current i_n "Current flowing through the negative pins";
+ Modelica.Units.SI.Voltage v_p "Voltage drop between the two positive pins";
+ Modelica.Units.SI.Voltage v_n "Voltage drop between the two negative pins";
+ Modelica.Units.SI.Current i_p "Current flowing through the positive pins";
+ Modelica.Units.SI.Current i_n "Current flowing through the negative pins";
equation
i_p = PhaseSystem_p.systemCurrent(terminal_p.i);
i_n = PhaseSystem_n.systemCurrent(terminal_n.i);
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/PartialPV.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/PartialPV.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/PartialPV.mo" 2021-09-16 11:15:38.374780672 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/PartialPV.mo" 2021-09-16 11:18:47.846149190 +0200
@@ -5,7 +5,7 @@
Buildings.Electrical.PhaseSystems.PartialPhaseSystem constrainedby
Buildings.Electrical.PhaseSystems.PartialPhaseSystem "Phase system"
annotation (choicesAllMatching=true);
- parameter Modelica.SIunits.Voltage V_nominal(min=0, start=110)
+ parameter Modelica.Units.SI.Voltage V_nominal(min=0, start=110)
"Nominal voltage (V_nominal >= 0)" annotation(Evaluate=true, Dialog(group="Nominal conditions"));
Modelica.Blocks.Interfaces.RealInput G(unit="W/m2")
"Total solar irradiation per unit area"
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/PartialPVOriented.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/PartialPVOriented.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/PartialPVOriented.mo" 2021-09-16 11:15:38.374780672 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/PartialPVOriented.mo" 2021-09-16 11:18:47.826149258 +0200
@@ -7,13 +7,13 @@
Buildings.Electrical.PhaseSystems.PartialPhaseSystem "Phase system"
annotation (choicesAllMatching=true);
- parameter Modelica.SIunits.Angle til "Surface tilt"
+ parameter Modelica.Units.SI.Angle til "Surface tilt"
annotation(Evaluate=true,Dialog(group="Orientation"));
- parameter Modelica.SIunits.Angle lat "Latitude"
+ parameter Modelica.Units.SI.Angle lat "Latitude"
annotation(Evaluate=true,Dialog(group="Orientation"));
- parameter Modelica.SIunits.Angle azi "Surface azimuth"
+ parameter Modelica.Units.SI.Angle azi "Surface azimuth"
annotation(Evaluate=true,Dialog(group="Orientation"));
- parameter Modelica.SIunits.Voltage V_nominal(min=0, start=110)
+ parameter Modelica.Units.SI.Voltage V_nominal(min=0, start=110)
"Nominal voltage (V_nominal >= 0)"
annotation(Evaluate=true, Dialog(group="Nominal conditions"));
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/PartialPvBase.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/PartialPvBase.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/PartialPvBase.mo" 2021-09-16 11:15:38.374780672 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/PartialPvBase.mo" 2021-09-16 11:18:47.790149379 +0200
@@ -1,6 +1,6 @@
within Buildings.Electrical.Interfaces;
partial model PartialPvBase "Partial model with basic parameters for PVs"
- parameter Modelica.SIunits.Area A "Net surface area";
+ parameter Modelica.Units.SI.Area A "Net surface area";
parameter Real fAct(min=0, max=1, unit="1") = 0.9
"Fraction of surface area with active solar cells";
parameter Real eta(min=0, max=1, unit="1") = 0.12
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/PartialWindTurbineBase.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/PartialWindTurbineBase.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/PartialWindTurbineBase.mo" 2021-09-16 11:15:38.374780672 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/PartialWindTurbineBase.mo" 2021-09-16 11:18:47.750149513 +0200
@@ -1,16 +1,16 @@
within Buildings.Electrical.Interfaces;
partial model PartialWindTurbineBase
"Base class for turbine model that contains basic parameters"
- final parameter Modelica.SIunits.Velocity vIn = table[1,1]
+ final parameter Modelica.Units.SI.Velocity vIn = table[1,1]
"Cut-in steady wind speed";
- final parameter Modelica.SIunits.Velocity vOut = table[size(table,1), 1]
+ final parameter Modelica.Units.SI.Velocity vOut = table[size(table,1), 1]
"Cut-out steady wind speed";
parameter Real scale(min=0)=1
"Scaling factor, used to allow adjusting the power output without changing the table";
parameter Real h "Height over ground"
annotation (Dialog(group="Wind correction"));
- parameter Modelica.SIunits.Height hRef = 10
+ parameter Modelica.Units.SI.Height hRef = 10
"Reference height for wind measurement"
annotation (Dialog(group="Wind correction"));
parameter Real nWin(min=0) = 0.4
@@ -29,7 +29,7 @@
parameter String tableName="NoName"
"Table name on file or in function usertab (see documentation)";
parameter String fileName="NoName" "File where matrix is stored";
- parameter Modelica.SIunits.Voltage V_nominal(min=0, start=110)
+ parameter Modelica.Units.SI.Voltage V_nominal(min=0, start=110)
"Nominal voltage (V_nominal >= 0)" annotation(Evaluate=true, Dialog(group="Nominal conditions"));
Modelica.Blocks.Interfaces.RealInput vWin(unit="m/s") "Steady wind speed"
annotation (Placement(transformation(
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/Source.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/Source.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/Source.mo" 2021-09-16 11:15:38.374780672 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/Source.mo" 2021-09-16 11:18:47.542150214 +0200
@@ -10,10 +10,10 @@
parameter Boolean definiteReference = false
"Serve as definite root for the reference angle theta"
annotation (Evaluate=true, Dialog(group="Reference Parameters"));
- Modelica.SIunits.Power S[PhaseSystem.n]=
+ Modelica.Units.SI.Power S[PhaseSystem.n]=
PhaseSystem.phasePowers_vi(terminal.v, terminal.i)
"Complex power S[1] = P, S[2]= Q";
- Modelica.SIunits.Angle phi=
+ Modelica.Units.SI.Angle phi=
PhaseSystem.phase(terminal.v) - PhaseSystem.phase(-terminal.i)
"Phase shift with respect to reference angle";
replaceable Buildings.Electrical.Interfaces.Terminal terminal(
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/VariableVoltageSource.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/VariableVoltageSource.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/VariableVoltageSource.mo" 2021-09-16 11:15:38.374780672 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Interfaces/VariableVoltageSource.mo" 2021-09-16 11:18:47.522150281 +0200
@@ -3,7 +3,7 @@
"Partial model of a generic variable voltage source."
extends Buildings.Electrical.Interfaces.Source;
parameter Boolean use_V_in = true "If true, the voltage is an input";
- parameter Modelica.SIunits.Voltage V = 1 "Value of constant voltage"
+ parameter Modelica.Units.SI.Voltage V = 1 "Value of constant voltage"
annotation (Dialog(enable= not use_V_in));
Modelica.Blocks.Interfaces.RealInput V_in(unit="V", min=0, start = 1) if
use_V_in "Input voltage"
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/PhaseSystems/PartialPhaseSystem.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/PhaseSystems/PartialPhaseSystem.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/PhaseSystems/PartialPhaseSystem.mo" 2021-09-16 11:15:38.374780672 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/PhaseSystems/PartialPhaseSystem.mo" 2021-09-16 11:18:47.470150456 +0200
@@ -63,7 +63,7 @@
"Rotate a vector of an angle theta (anti-counterclock)"
extends Modelica.Icons.Function;
input Real x[n];
- input Modelica.SIunits.Angle theta;
+ input Modelica.Units.SI.Angle theta;
output Real y[n];
end rotate;
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/PhaseSystems/package.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/PhaseSystems/package.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/PhaseSystems/package.mo" 2021-09-16 11:15:38.374780672 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/PhaseSystems/package.mo" 2021-09-16 11:18:47.510150322 +0200
@@ -1,10 +1,11 @@
within Buildings.Electrical;
package PhaseSystems "Phase systems used in power connectors"
extends Modelica.Icons.Package;
- import SI = Modelica.SIunits;
+ import SI = Modelica.Units.SI;
import Modelica.Constants.pi;
+
annotation (Icon(graphics={Line(
points={{-70,-52},{50,-52}},
color={95,95,95},
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Transmission/BaseClasses/BaseCable.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Transmission/BaseClasses/BaseCable.mo"
--- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Transmission/BaseClasses/BaseCable.mo" 2021-09-16 11:15:38.374780672 +0200
+++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Transmission/BaseClasses/BaseCable.mo" 2021-09-16 11:18:47.386150739 +0200
@@ -2,22 +2,23 @@
record BaseCable "Record that contains the properties of a generic cable"
parameter Buildings.Electrical.Transmission.Types.Material material = Buildings.Electrical.Transmission.Types.Material.Al
"Material of the cable";
- parameter Modelica.SIunits.Current Amp(start=0.0)=0.0
+
+ parameter Modelica.Units.SI.Current Amp(start=0.0)=0.0
"Ampacitance of the cable";
- parameter Modelica.SIunits.Temperature T_ref = 298.15
+ parameter Modelica.Units.SI.Temperature T_ref = 298.15
"Reference cable temperature";
- parameter Modelica.SIunits.Temperature M = 228.1 + 273.15
+ parameter Modelica.Units.SI.Temperature M = 228.1 + 273.15
"Temperature constant of the material";
replaceable partial function lineResistance
"Function that computes the resistance of a cable"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Length l "Length of the cable";
- input Modelica.SIunits.Frequency f = 50
+ input Modelica.Units.SI.Length l "Length of the cable";
+ input Modelica.Units.SI.Frequency f = 50
"Frequency considered in the definition of cables properties";
- output Modelica.SIunits.Resistance R "Resistance of the cable";
+ output Modelica.Units.SI.Resistance R "Resistance of the cable";
protected
- parameter Modelica.SIunits.AngularVelocity omega = 2*Modelica.Constants.pi*f;
+ parameter Modelica.Units.SI.AngularVelocity omega = 2*Modelica.Constants.pi*f;
annotation (Documentation(revisions="
"));
end lineCapacitance;
-
annotation (Documentation(revisions="
This is a base record for specifying physical properties for medium diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Utilities/Controllers/StateMachineVoltCtrl.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Utilities/Controllers/StateMachineVoltCtrl.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Utilities/Controllers/StateMachineVoltCtrl.mo" 2021-09-16 11:15:38.378780658 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Utilities/Controllers/StateMachineVoltCtrl.mo" 2021-09-16 11:18:46.278154466 +0200 @@ -2,11 +2,11 @@ model StateMachineVoltCtrl "This model represents a simple voltage controller that unplug a load when there is a voltage fluctuation higher that a given threshold." Modelica.Blocks.Interfaces.RealInput V "Voltage of the node to be controlled"; - parameter Modelica.SIunits.Voltage V_nominal + parameter Modelica.Units.SI.Voltage V_nominal "Nominal voltage of the node to be controlled"; parameter Real vThresh(min=0.0, max=1.0) = 0.1 "Threshold that activates voltage ctrl (ratio of nominal voltage)"; - parameter Modelica.SIunits.Time tDelay = 300 + parameter Modelica.Units.SI.Time tDelay = 300 "Time to wait before plugging the load back"; output Real y "Output signal that represents whether the load should be connected to the grid or not"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Utilities/Examples/TestVoltageCTRL.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Utilities/Examples/TestVoltageCTRL.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Utilities/Examples/TestVoltageCTRL.mo" 2021-09-16 11:15:38.378780658 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Utilities/Examples/TestVoltageCTRL.mo" 2021-09-16 11:18:46.258154534 +0200 @@ -15,7 +15,7 @@ annotation (Placement(transformation(extent={{-70,-36},{-50,-16}}))); Modelica.Blocks.Sources.Sine cosine( amplitude=20, - freqHz=0.1, +f =0.1, phase=0, offset=120) "Variable voltage signal" annotation (Placement(transformation(extent={{-94,-4},{-74,16}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Utilities/VoltageControl.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Utilities/VoltageControl.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Utilities/VoltageControl.mo" 2021-09-16 11:15:38.378780658 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Electrical/Utilities/VoltageControl.mo" 2021-09-16 11:18:46.242154588 +0200 @@ -4,18 +4,18 @@ Buildings.Electrical.PhaseSystems.PartialPhaseSystem constrainedby Buildings.Electrical.PhaseSystems.PartialPhaseSystem "Phase system" annotation (choicesAllMatching=true); - parameter Modelica.SIunits.Voltage V_nominal + parameter Modelica.Units.SI.Voltage V_nominal "Nominal voltage of the node to be controlled"; parameter Real vThresh(min=0.0, max=1.0) = 0.1 "Threshold that activates voltage ctrl (ratio of nominal voltage)"; - parameter Modelica.SIunits.Time tDelay = 300 + parameter Modelica.Units.SI.Time tDelay = 300 "Time to wait before plugging the load back"; - parameter Modelica.SIunits.Time T = 0.01 + parameter Modelica.Units.SI.Time T = 0.01 "Time constant representing the switching time"; parameter Real y_start = 1.0 "Initial value of the control output signal"; - final parameter Modelica.SIunits.Voltage Vmin = V_nominal*(1-vThresh) + final parameter Modelica.Units.SI.Voltage Vmin = V_nominal*(1-vThresh) "Low threshold"; - final parameter Modelica.SIunits.Voltage Vmax = V_nominal*(1+vThresh) + final parameter Modelica.Units.SI.Voltage Vmax = V_nominal*(1+vThresh) "High threshold"; Modelica.Blocks.Interfaces.RealOutput y(start = y_start, stateSelect = StateSelect.prefer) "Control signal" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/BatteryControl.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/BatteryControl.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/BatteryControl.mo" 2021-09-16 11:15:38.378780658 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/BatteryControl.mo" 2021-09-16 11:18:46.186154776 +0200 @@ -31,7 +31,7 @@ nu=2, expr={200e3,-400e3}) annotation (Placement(transformation(extent={{104,-10},{120,10}}))); - Modelica.StateGraph.InitialStep off "Off state" + Modelica.StateGraph.InitialStep off(nIn = 1, nOut = 1) "Off state" annotation (Placement(transformation(extent={{-50,80},{-30,100}}))); inner Modelica.StateGraph.StateGraphRoot stateGraphRoot annotation (Placement(transformation(extent={{-120,120},{-100,140}}))); @@ -44,9 +44,9 @@ Modelica.StateGraph.TransitionWithSignal t2(enableTimer=true, waitTime=1) "Transition to discharge" annotation (Placement(transformation(extent={{10,50},{30,70}}))); - Modelica.StateGraph.StepWithSignal charge "Charge battery" + Modelica.StateGraph.StepWithSignal charge(nIn = 1, nOut = 1) "Charge battery" annotation (Placement(transformation(extent={{40,110},{60,130}}))); - Modelica.StateGraph.StepWithSignal discharge "Discharge battery" + Modelica.StateGraph.StepWithSignal discharge(nIn = 1, nOut = 1) "Discharge battery" annotation (Placement(transformation(extent={{40,50},{60,70}}))); Modelica.StateGraph.TransitionWithSignal t3 "Transition to off" annotation (Placement(transformation(extent={{70,110},{90,130}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/ChillerSwitch.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/ChillerSwitch.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/ChillerSwitch.mo" 2021-09-16 11:15:38.378780658 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/ChillerSwitch.mo" 2021-09-16 11:18:46.142154924 +0200 @@ -17,7 +17,7 @@ displayUnit="degC") "Set temperature of chiller" annotation (Placement( transformation(extent={{-140,-80},{-100,-40}}), iconTransformation( extent={{-120,-60},{-100,-40}}))); - parameter Modelica.SIunits.Temperature deaBan + parameter Modelica.Units.SI.Temperature deaBan "Dead band of temperature to prevent chiller short cycling"; Modelica.Blocks.Logical.Hysteresis hysteresis(uLow=0, uHigh=deaBan) annotation (Placement(transformation(extent={{20,-10},{40,10}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/Examples/BatteryControl.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/Examples/BatteryControl.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/Examples/BatteryControl.mo" 2021-09-16 11:15:38.378780658 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/Examples/BatteryControl.mo" 2021-09-16 11:18:46.110155032 +0200 @@ -5,7 +5,7 @@ con "Battery control" annotation (Placement(transformation(extent={{0,0},{20,20}}))); Modelica.Blocks.Sources.Sine SOC( - freqHz=1/86400, + f =1/86400, offset=0.5, amplitude=0.6) "State of charge" annotation (Placement(transformation(extent={{-40,0},{-20,20}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSetPointControl.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSetPointControl.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSetPointControl.mo" 2021-09-16 11:15:38.378780658 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSetPointControl.mo" 2021-09-16 11:18:46.098155072 +0200 @@ -5,12 +5,12 @@ package Medium1 = Buildings.Media.Water; package Medium2 = Buildings.Media.Water; package MediumAir = Buildings.Media.Air "Medium model"; - parameter Modelica.SIunits.MassFlowRate mAir_flow_nominal=61.6*2 + parameter Modelica.Units.SI.MassFlowRate mAir_flow_nominal=61.6*2 "Nominal mass flow rate at fan"; parameter Real COPc_nominal=3 "Chiller COP"; - parameter Modelica.SIunits.MassFlowRate mCHW_flow_nominal=15.2 + parameter Modelica.Units.SI.MassFlowRate mCHW_flow_nominal=15.2 "Nominal mass flow rate at chilled water"; - parameter Modelica.SIunits.MassFlowRate mCW_flow_nominal=mCHW_flow_nominal/ + parameter Modelica.Units.SI.MassFlowRate mCW_flow_nominal=mCHW_flow_nominal/ COPc_nominal*(COPc_nominal + 1) "Nominal mass flow rate at condenser water"; parameter Real QRoo=100; @@ -113,7 +113,7 @@ Modelica.Blocks.Sources.Sine sine( amplitude=5, offset=273.15 + 25, - freqHz=1/20000) annotation (Placement(transformation( +f =1/20000) annotation (Placement(transformation( extent={{-10,-10},{10,10}}, origin={130,-94}))); Modelica.Blocks.Continuous.FirstOrder firstOrder1(y_start=273.15 + 10, T=chi.tau1 diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSwitch.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSwitch.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSwitch.mo" 2021-09-16 11:15:38.378780658 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSwitch.mo" 2021-09-16 11:18:46.058155206 +0200 @@ -2,12 +2,12 @@ model ChillerSwitch "Test model for ChillerSwitch" extends Modelica.Icons.Example; Modelica.Blocks.Sources.Sine TSet( - freqHz=0.0002, + f =0.0002, offset=12, amplitude=8) annotation (Placement(transformation(extent={{-60,-20},{-40,0}}))); Modelica.Blocks.Sources.Sine CHWST( - freqHz=0.0001, + f =0.0001, amplitude=5, offset=15) annotation (Placement(transformation(extent={{-60,20},{-40,40}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/Examples/KMinusU.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/Examples/KMinusU.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/Examples/KMinusU.mo" 2021-09-16 11:15:38.378780658 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/Examples/KMinusU.mo" 2021-09-16 11:18:46.042155260 +0200 @@ -2,7 +2,7 @@ model KMinusU "Test model for KMinusU" extends Modelica.Icons.Example; Modelica.Blocks.Sources.Sine pulse( - freqHz=0.001, + f =0.001, amplitude=0.5, offset=0.5, phase=-1.5707963267949) diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/Examples/LinearPiecewiseTwo.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/Examples/LinearPiecewiseTwo.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/Examples/LinearPiecewiseTwo.mo" 2021-09-16 11:15:38.378780658 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/Examples/LinearPiecewiseTwo.mo" 2021-09-16 11:18:46.034155287 +0200 @@ -2,7 +2,7 @@ model LinearPiecewiseTwo "Test model for LinearPiecewiseTwo" extends Modelica.Icons.Example; Modelica.Blocks.Sources.Sine pulse( - freqHz=0.001, + f =0.001, amplitude=0.5, offset=0.5, phase=-1.5707963267949) diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/Examples/RequestCounter.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/Examples/RequestCounter.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/Examples/RequestCounter.mo" 2021-09-16 11:15:38.378780658 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/Examples/RequestCounter.mo" 2021-09-16 11:18:46.022155328 +0200 @@ -8,7 +8,7 @@ annotation (Placement(transformation(extent={{-80,-40},{-60,-20}}))); Modelica.Blocks.Sources.Pulse act1(period=10) annotation (Placement(transformation(extent={{-80,40},{-60,60}}))); - Modelica.Blocks.Sources.Sine act2(freqHz=0.3, offset=1) + Modelica.Blocks.Sources.Sine act2(f =0.3, offset=1) annotation (Placement(transformation(extent={{-80,0},{-60,20}}))); equation connect(act1.y, reqCou.uAct[1]) annotation (Line( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/Examples/TrimAndRespond.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/Examples/TrimAndRespond.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/Examples/TrimAndRespond.mo" 2021-09-16 11:15:38.378780658 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/Examples/TrimAndRespond.mo" 2021-09-16 11:18:46.006155381 +0200 @@ -2,11 +2,11 @@ model TrimAndRespond "Test model for TrimAndRespond" extends Modelica.Icons.Example; - Modelica.Blocks.Sources.Sine act3(freqHz=0.002, offset=0.2) + Modelica.Blocks.Sources.Sine act3(f =0.002, offset=0.2) annotation (Placement(transformation(extent={{-80,-20},{-60,0}}))); Modelica.Blocks.Sources.Pulse act1(period=500) annotation (Placement(transformation(extent={{-80,60},{-60,80}}))); - Modelica.Blocks.Sources.Sine act2(freqHz=0.001, offset=0.3) + Modelica.Blocks.Sources.Sine act2(f =0.001, offset=0.3) annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); Buildings.Examples.ChillerPlant.BaseClasses.Controls.TrimAndRespond triAndRes[3]( each uTri=0.9, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/WSEControl.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/WSEControl.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/WSEControl.mo" 2021-09-16 11:15:38.378780658 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/Controls/WSEControl.mo" 2021-09-16 11:18:45.910155705 +0200 @@ -1,8 +1,8 @@ within Buildings.Examples.ChillerPlant.BaseClasses.Controls; model WSEControl "Control unit for WSE" - parameter Modelica.SIunits.TemperatureDifference dTOff = 1 + parameter Modelica.Units.SI.TemperatureDifference dTOff = 1 "Temperature difference to switch WSE off"; - parameter Modelica.SIunits.TemperatureDifference dTW = 1 + parameter Modelica.Units.SI.TemperatureDifference dTW = 1 "Temperature difference that is added to WSE on guard"; Modelica.Blocks.Interfaces.RealInput wseCHWST( final quantity="ThermodynamicTemperature", diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/DataCenter.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/DataCenter.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/DataCenter.mo" 2021-09-16 11:15:38.378780658 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/DataCenter.mo" 2021-09-16 11:18:45.882155799 +0200 @@ -3,22 +3,22 @@ "Primary only chiller plant system with water-side economizer" replaceable package MediumA = Buildings.Media.Air "Medium model"; replaceable package MediumW = Buildings.Media.Water "Medium model"; - parameter Modelica.SIunits.MassFlowRate mAir_flow_nominal=roo.QRoo_flow/(1005 + parameter Modelica.Units.SI.MassFlowRate mAir_flow_nominal=roo.QRoo_flow/(1005 *15) "Nominal mass flow rate at fan"; - parameter Modelica.SIunits.Power P_nominal=80E3 + parameter Modelica.Units.SI.Power P_nominal=80E3 "Nominal compressor power (at y=1)"; - parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=10 + parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=10 "Temperature difference evaporator inlet-outlet"; - parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=10 + parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=10 "Temperature difference condenser outlet-inlet"; parameter Real COPc_nominal=3 "Chiller COP"; - parameter Modelica.SIunits.MassFlowRate mCHW_flow_nominal=2*roo.QRoo_flow/( + parameter Modelica.Units.SI.MassFlowRate mCHW_flow_nominal=2*roo.QRoo_flow/( 4200*20) "Nominal mass flow rate at chilled water"; - parameter Modelica.SIunits.MassFlowRate mCW_flow_nominal=2*roo.QRoo_flow/( + parameter Modelica.Units.SI.MassFlowRate mCW_flow_nominal=2*roo.QRoo_flow/( 4200*6) "Nominal mass flow rate at condenser water"; - parameter Modelica.SIunits.PressureDifference dp_nominal=500 + parameter Modelica.Units.SI.PressureDifference dp_nominal=500 "Nominal pressure difference"; Buildings.Fluid.Movers.FlowControlled_m_flow fan( redeclare package Medium = MediumA, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/SimplifiedRoom.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/SimplifiedRoom.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/SimplifiedRoom.mo" 2021-09-16 11:15:38.378780658 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ChillerPlant/BaseClasses/SimplifiedRoom.mo" 2021-09-16 11:18:45.550156916 +0200 @@ -8,10 +8,10 @@ connectorSizing=true, tab="General", group="Ports")); - parameter Modelica.SIunits.Length rooLen "Length of the room"; - parameter Modelica.SIunits.Length rooWid "Width of the room"; - parameter Modelica.SIunits.Height rooHei "Height of the room"; - parameter Modelica.SIunits.Power QRoo_flow + parameter Modelica.Units.SI.Length rooLen "Length of the room"; + parameter Modelica.Units.SI.Length rooWid "Width of the room"; + parameter Modelica.Units.SI.Height rooHei "Height of the room"; + parameter Modelica.Units.SI.Power QRoo_flow "Heat generation of the computer room"; Buildings.Fluid.MixingVolumes.MixingVolume rooVol( @@ -41,7 +41,7 @@ duration=36000, startTime=0) annotation (Placement(transformation(extent={{-60,-40},{-40,-20}}))); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate"; Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor TAir "Room air temperature" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/DualFanDualDuct/ClosedLoop.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/DualFanDualDuct/ClosedLoop.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/DualFanDualDuct/ClosedLoop.mo" 2021-09-16 11:15:38.378780658 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/DualFanDualDuct/ClosedLoop.mo" 2021-09-16 11:18:45.482157145 +0200 @@ -12,49 +12,49 @@ parameter Boolean linearizeFlowResistance=false "= true, use linear relation between m_flow and dp for any flow rate"; - parameter Modelica.SIunits.Volume VRooCor=2698 "Room volume corridor"; - parameter Modelica.SIunits.Volume VRooSou=568.77 "Room volume south"; - parameter Modelica.SIunits.Volume VRooNor=568.77 "Room volume north"; - parameter Modelica.SIunits.Volume VRooEas=360.08 "Room volume east"; - parameter Modelica.SIunits.Volume VRooWes=360.08 "Room volume west"; + parameter Modelica.Units.SI.Volume VRooCor=2698 "Room volume corridor"; + parameter Modelica.Units.SI.Volume VRooSou=568.77 "Room volume south"; + parameter Modelica.Units.SI.Volume VRooNor=568.77 "Room volume north"; + parameter Modelica.Units.SI.Volume VRooEas=360.08 "Room volume east"; + parameter Modelica.Units.SI.Volume VRooWes=360.08 "Room volume west"; constant Real conv=1.2/3600 "Conversion factor for nominal mass flow rate"; - parameter Modelica.SIunits.MassFlowRate m0_flow_cor=3*VRooCor*conv + parameter Modelica.Units.SI.MassFlowRate m0_flow_cor=3*VRooCor*conv "Design mass flow rate core"; - parameter Modelica.SIunits.MassFlowRate m0_flow_sou=8*VRooSou*conv + parameter Modelica.Units.SI.MassFlowRate m0_flow_sou=8*VRooSou*conv "Design mass flow rate perimeter 1"; - parameter Modelica.SIunits.MassFlowRate m0_flow_eas=9*VRooEas*conv + parameter Modelica.Units.SI.MassFlowRate m0_flow_eas=9*VRooEas*conv "Design mass flow rate perimeter 2"; - parameter Modelica.SIunits.MassFlowRate m0_flow_nor=11*VRooNor*conv + parameter Modelica.Units.SI.MassFlowRate m0_flow_nor=11*VRooNor*conv "Design mass flow rate perimeter 3"; - parameter Modelica.SIunits.MassFlowRate m0_flow_wes=10*VRooWes*conv + parameter Modelica.Units.SI.MassFlowRate m0_flow_wes=10*VRooWes*conv "Design mass flow rate perimeter 4"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=m0_flow_cor + + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=m0_flow_cor + m0_flow_sou + m0_flow_eas + m0_flow_nor + m0_flow_wes "Nominal air mass flow rate"; - parameter Modelica.SIunits.MassFlowRate mAirOut_flow_nominal = 0.3*m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mAirOut_flow_nominal = 0.3*m_flow_nominal "Nominal outside air mass flow rate"; - parameter Modelica.SIunits.MassFlowRate mAirHot_flow_nominal = 0.3*m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mAirHot_flow_nominal = 0.3*m_flow_nominal "Nominal air mass flow rate for hot deck"; - parameter Modelica.SIunits.MassFlowRate mAirCol_flow_nominal = m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mAirCol_flow_nominal = m_flow_nominal "Nominal air mass flow rate for cold deck"; /////////////////////////////////////////////////////////////////////////////////////// // Water mass flow rates - parameter Modelica.SIunits.MassFlowRate mWatPre_flow_nominal = (TMixHea_nominal-273.15-(-20))*1000/15/4200*mAirOut_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mWatPre_flow_nominal = (TMixHea_nominal-273.15-(-20))*1000/15/4200*mAirOut_flow_nominal "Nominal water mass flow rate for preheat coil"; - parameter Modelica.SIunits.MassFlowRate mWatCol_flow_nominal = (28-13)*1000*1.3/4200/15*mAirCol_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mWatCol_flow_nominal = (28-13)*1000*1.3/4200/15*mAirCol_flow_nominal "Nominal water mass flow rate for cooling coil of cold deck"; - parameter Modelica.SIunits.MassFlowRate mWatHot_flow_nominal = (40-(TMixHea_nominal-273.15))*1000/15/4200*mAirHot_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mWatHot_flow_nominal = (40-(TMixHea_nominal-273.15))*1000/15/4200*mAirHot_flow_nominal "Nominal water mass flow rate for heating coil of cold deck"; // Water temperatures - parameter Modelica.SIunits.Temperature TMixHea_nominal = 0.3*(273.15+(-20)) + 0.7 * (273.15+20) + parameter Modelica.Units.SI.Temperature TMixHea_nominal = 0.3*(273.15+(-20)) + 0.7 * (273.15+20) "Mixed air temperature at winter design conditions"; - parameter Modelica.SIunits.Temperature TMixCoo_nominal = 0.3*(273.15+(33)) + 0.7 * (273.15+26) + parameter Modelica.Units.SI.Temperature TMixCoo_nominal = 0.3*(273.15+(33)) + 0.7 * (273.15+26) "Mixed air temperature at summer design conditions"; - parameter Modelica.SIunits.Temperature TSupCol_nominal = 12+273.15 + parameter Modelica.Units.SI.Temperature TSupCol_nominal = 12+273.15 "Cold deck temperature at nominal condition"; - parameter Modelica.SIunits.Angle lat=41.98*3.14159/180 "Latitude"; + parameter Modelica.Units.SI.Angle lat=41.98*3.14159/180 "Latitude"; Buildings.Fluid.Sources.Outside amb(redeclare package Medium = MediumA, nPorts=2) "Ambient conditions" @@ -145,7 +145,7 @@ Buildings.Controls.Continuous.LimPID cooCoiCon( reverseAction=true, Td=60, - initType=Modelica.Blocks.Types.InitPID.InitialState, + initType=Modelica.Blocks.Types.Init.InitialState, yMax=1, yMin=0, Ti=120, @@ -472,7 +472,7 @@ origin={380,-50}))); Buildings.Controls.Continuous.LimPID heaCoiCon( Td=60, - initType=Modelica.Blocks.Types.InitPID.InitialState, + initType=Modelica.Blocks.Types.Init.InitialState, yMax=1, yMin=0, Ti=120, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/DualFanDualDuct/Controls/CoolingCoilTemperatureSetpoint.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/DualFanDualDuct/Controls/CoolingCoilTemperatureSetpoint.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/DualFanDualDuct/Controls/CoolingCoilTemperatureSetpoint.mo" 2021-09-16 11:15:38.378780658 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/DualFanDualDuct/Controls/CoolingCoilTemperatureSetpoint.mo" 2021-09-16 11:18:45.186158140 +0200 @@ -2,8 +2,8 @@ block CoolingCoilTemperatureSetpoint "Set point scheduler for cooling coil" extends Modelica.Blocks.Icons.Block; import Buildings.Examples.VAVReheat.Controls.OperationModes; - parameter Modelica.SIunits.Temperature TOn "Setpoint during on"; - parameter Modelica.SIunits.Temperature TOff "Setpoint during off"; + parameter Modelica.Units.SI.Temperature TOn "Setpoint during on"; + parameter Modelica.Units.SI.Temperature TOff "Setpoint during off"; Modelica.Blocks.Sources.RealExpression TSetPoi( y=if (mode.y == Integer(OperationModes.occupied) or mode.y == Integer(OperationModes.unoccupiedPreCool) or diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/DualFanDualDuct/Controls/PreHeatCoil.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/DualFanDualDuct/Controls/PreHeatCoil.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/DualFanDualDuct/Controls/PreHeatCoil.mo" 2021-09-16 11:15:38.378780658 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/DualFanDualDuct/Controls/PreHeatCoil.mo" 2021-09-16 11:18:45.122158355 +0200 @@ -6,7 +6,7 @@ yMax=1, yMin=0, Td=60, - initType=Modelica.Blocks.Types.InitPID.InitialState, + initType=Modelica.Blocks.Types.Init.InitialState, Ti=120, strict=true, controllerType=Modelica.Blocks.Types.SimpleController.PI, @@ -40,14 +40,14 @@ Modelica.Blocks.Logical.Switch swiValOp "Switch to close valve if pump is not running" annotation (Placement(transformation(extent={{60,-70},{80,-50}}))); - Modelica.StateGraph.InitialStep pumOff "Pump is off" + Modelica.StateGraph.InitialStep pumOff(nIn = 1, nOut = 1) "Pump is off" annotation (Placement(transformation(extent={{-40,60},{-20,80}}))); Modelica.StateGraph.TransitionWithSignal toOn "Switch pump on" annotation (Placement(transformation(extent={{-10,60},{10,80}}))); inner Modelica.StateGraph.StateGraphRoot stateGraphRoot annotation (Placement(transformation(extent={{-80,60},{-60,80}}))); - Modelica.StateGraph.StepWithSignal pumOn "Pump on" + Modelica.StateGraph.StepWithSignal pumOn(nIn = 1, nOut = 1) "Pump on" annotation (Placement(transformation(extent={{20,60},{40,80}}))); Modelica.StateGraph.TransitionWithSignal toOff(enableTimer=true, waitTime=30* 60) "Switch pump off" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/DualFanDualDuct/Controls/RoomMixingBox.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/DualFanDualDuct/Controls/RoomMixingBox.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/DualFanDualDuct/Controls/RoomMixingBox.mo" 2021-09-16 11:15:38.378780658 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/DualFanDualDuct/Controls/RoomMixingBox.mo" 2021-09-16 11:18:45.082158491 +0200 @@ -1,7 +1,7 @@ within Buildings.Examples.DualFanDualDuct.Controls; block RoomMixingBox "Controller for room mixing box" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.MassFlowRate m_flow_min "Minimum mass flow rate"; + parameter Modelica.Units.SI.MassFlowRate m_flow_min "Minimum mass flow rate"; Buildings.Controls.OBC.CDL.Continuous.LimPID conHea( controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI, Td=60, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/DualFanDualDuct/ThermalZones/SupplyBranch.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/DualFanDualDuct/ThermalZones/SupplyBranch.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/DualFanDualDuct/ThermalZones/SupplyBranch.mo" 2021-09-16 11:15:38.378780658 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/DualFanDualDuct/ThermalZones/SupplyBranch.mo" 2021-09-16 11:18:45.022158693 +0200 @@ -20,14 +20,14 @@ parameter Boolean linearizeFlowResistance=false "= true, use linear relation between m_flow and dp for any flow rate"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Mass flow rate cold air deck"; - parameter Modelica.SIunits.MassFlowRate mAirHot_flow_nominal = 0.3*m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mAirHot_flow_nominal = 0.3*m_flow_nominal "Mass flow rate hot air deck"; - parameter Modelica.SIunits.MassFlowRate mAirCol_flow_nominal = m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mAirCol_flow_nominal = m_flow_nominal "Mass flow rate cold air deck"; - parameter Modelica.SIunits.Volume VRoo "Room volume"; + parameter Modelica.Units.SI.Volume VRoo "Room volume"; Controls.RoomMixingBox con(m_flow_min=VRoo*3*1.2/3600) "Room temperature controller" annotation (Placement(transformation(extent={{-40,0},{-20,20}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/HydronicHeating/TwoRoomsWithStorage.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/HydronicHeating/TwoRoomsWithStorage.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/HydronicHeating/TwoRoomsWithStorage.mo" 2021-09-16 11:15:38.378780658 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/HydronicHeating/TwoRoomsWithStorage.mo" 2021-09-16 11:18:44.958158908 +0200 @@ -6,34 +6,34 @@ "Medium model for air"; replaceable package MediumW = Buildings.Media.Water "Medium model"; parameter Integer nRoo = 2 "Number of rooms"; - parameter Modelica.SIunits.Volume VRoo = 4*6*3 "Volume of one room"; - parameter Modelica.SIunits.Power Q_flow_nominal = 2200 + parameter Modelica.Units.SI.Volume VRoo = 4*6*3 "Volume of one room"; + parameter Modelica.Units.SI.Power Q_flow_nominal = 2200 "Nominal power of heating plant"; // Due to the night setback, in which the radiator do not provide heat input into the room, // we scale the design power of the radiator loop parameter Real scaFacRad = 1.5 "Scaling factor to scale the power (and mass flow rate) of the radiator loop"; - parameter Modelica.SIunits.Temperature TSup_nominal=273.15 + 50 + 5 + parameter Modelica.Units.SI.Temperature TSup_nominal=273.15 + 50 + 5 "Nominal supply temperature for radiators"; - parameter Modelica.SIunits.Temperature TRet_nominal=273.15 + 40 + 5 + parameter Modelica.Units.SI.Temperature TRet_nominal=273.15 + 40 + 5 "Nominal return temperature for radiators"; - parameter Modelica.SIunits.Temperature dTRad_nominal = TSup_nominal-TRet_nominal + parameter Modelica.Units.SI.Temperature dTRad_nominal = TSup_nominal-TRet_nominal "Nominal temperature difference for radiator loop"; - parameter Modelica.SIunits.Temperature dTBoi_nominal = 20 + parameter Modelica.Units.SI.Temperature dTBoi_nominal = 20 "Nominal temperature difference for boiler loop"; - parameter Modelica.SIunits.MassFlowRate mRad_flow_nominal = scaFacRad*Q_flow_nominal/dTRad_nominal/4200 + parameter Modelica.Units.SI.MassFlowRate mRad_flow_nominal = scaFacRad*Q_flow_nominal/dTRad_nominal/4200 "Nominal mass flow rate of radiator loop"; - parameter Modelica.SIunits.MassFlowRate mBoi_flow_nominal = scaFacRad*Q_flow_nominal/dTBoi_nominal/4200 + parameter Modelica.Units.SI.MassFlowRate mBoi_flow_nominal = scaFacRad*Q_flow_nominal/dTBoi_nominal/4200 "Nominal mass flow rate of boiler loop"; - parameter Modelica.SIunits.PressureDifference dpPip_nominal = 10000 + parameter Modelica.Units.SI.PressureDifference dpPip_nominal = 10000 "Pressure difference of pipe (without valve)"; - parameter Modelica.SIunits.PressureDifference dpVal_nominal = 1000 + parameter Modelica.Units.SI.PressureDifference dpVal_nominal = 1000 "Pressure difference of valve"; - parameter Modelica.SIunits.PressureDifference dpRoo_nominal = 6000 + parameter Modelica.Units.SI.PressureDifference dpRoo_nominal = 6000 "Pressure difference of flow leg that serves a room"; - parameter Modelica.SIunits.PressureDifference dpThrWayVal_nominal = 6000 + parameter Modelica.Units.SI.PressureDifference dpThrWayVal_nominal = 6000 "Pressure difference of three-way valve"; - parameter Modelica.SIunits.PressureDifference dp_nominal= + parameter Modelica.Units.SI.PressureDifference dp_nominal= dpPip_nominal + dpVal_nominal + dpRoo_nominal + dpThrWayVal_nominal "Pressure difference of loop"; // Room model @@ -241,7 +241,7 @@ Controls.Continuous.LimPID conVal( yMax=1, yMin=0, - initType=Modelica.Blocks.Types.InitPID.InitialState, + initType=Modelica.Blocks.Types.Init.InitialState, xi_start=1, Td=60, k=0.1, @@ -478,13 +478,13 @@ "Controller for the free cooling and the mechanical cooling" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Temperature TRooCoo = 25+273.15 + parameter Modelica.Units.SI.Temperature TRooCoo = 25+273.15 "Set point for mechanical cooling"; - parameter Modelica.SIunits.Temperature TRooFre = 22+273.15 + parameter Modelica.Units.SI.Temperature TRooFre = 22+273.15 "Maximum temperature above which free cooling is enabled"; - parameter Modelica.SIunits.Temperature TOutFre = 16+273.15 + parameter Modelica.Units.SI.Temperature TOutFre = 16+273.15 "Outside temperature above which free cooling is allowed"; - parameter Modelica.SIunits.TemperatureDifference dT = 1 + parameter Modelica.Units.SI.TemperatureDifference dT = 1 "Dead-band for free cooling"; parameter Real Kp(min=0) = 1 "Proportional band for mechanical cooling"; @@ -575,21 +575,21 @@ dpDamper_nominal=0.27) "Return air damper that bypasses the heat recovery" annotation (Placement(transformation(extent={{180,450},{160,470}}))); - Modelica.StateGraph.InitialStep off "Pump and furnace off" + Modelica.StateGraph.InitialStep off(nIn = 1, nOut = 1) "Pump and furnace off" annotation (Placement(transformation(extent={{440,-20},{460,0}}))); Modelica.StateGraph.TransitionWithSignal T1 "Transition to pump on" annotation (Placement(transformation(extent={{470,-20},{490,0}}))); - Modelica.StateGraph.StepWithSignal pumOn "Pump on" + Modelica.StateGraph.StepWithSignal pumOn(nIn = 1, nOut = 1) "Pump on" annotation (Placement(transformation(extent={{500,-20},{520,0}}))); Modelica.StateGraph.Transition T3(enableTimer=true, waitTime=10) "Transition to boiler on" annotation (Placement(transformation(extent={{530,-20},{550,0}}))); - Modelica.StateGraph.StepWithSignal boiOn "Boiler on" + Modelica.StateGraph.StepWithSignal boiOn(nIn = 1, nOut = 1) "Boiler on" annotation (Placement(transformation(extent={{560,-20},{580,0}}))); Modelica.StateGraph.TransitionWithSignal T2 "Transition that switches boiler off" annotation (Placement(transformation(extent={{590,-20},{610,0}}))); - Modelica.StateGraph.StepWithSignal pumOn2 "Pump on" + Modelica.StateGraph.StepWithSignal pumOn2(nIn = 1, nOut = 1) "Pump on" annotation (Placement(transformation(extent={{620,-20},{640,0}}))); Modelica.StateGraph.Transition T4(enableTimer=true, waitTime=10) "Transition to boiler on" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ScalableBenchmarks/BuildingVAV/BaseClasses/ControlBus.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ScalableBenchmarks/BuildingVAV/BaseClasses/ControlBus.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ScalableBenchmarks/BuildingVAV/BaseClasses/ControlBus.mo" 2021-09-16 11:15:38.378780658 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ScalableBenchmarks/BuildingVAV/BaseClasses/ControlBus.mo" 2021-09-16 11:18:44.378160858 +0200 @@ -3,12 +3,12 @@ "Control bus that is adapted to the signals connected to it" extends Modelica.Icons.SignalBus; - Modelica.SIunits.Temperature TRooMin "Minimum temperature of multiple zones"; - Modelica.SIunits.Temperature TRooAve "Average temperature of multiple zones"; - Modelica.SIunits.Temperature TRooSetHea "Room heating setpoint temperature"; - Modelica.SIunits.Temperature TRooSetCoo "Room cooling setpoint temperature"; - Modelica.SIunits.Temperature TOut "Outdoor air temperature"; - Modelica.SIunits.Time dTNexOcc "Time to next occupancy period"; + Modelica.Units.SI.Temperature TRooMin "Minimum temperature of multiple zones"; + Modelica.Units.SI.Temperature TRooAve "Average temperature of multiple zones"; + Modelica.Units.SI.Temperature TRooSetHea "Room heating setpoint temperature"; + Modelica.Units.SI.Temperature TRooSetCoo "Room cooling setpoint temperature"; + Modelica.Units.SI.Temperature TOut "Outdoor air temperature"; + Modelica.Units.SI.Time dTNexOcc "Time to next occupancy period"; Boolean occupied "Occupancy status"; Integer controlMode "System operation modes"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ScalableBenchmarks/BuildingVAV/BaseClasses/FanOnOffWithDP.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ScalableBenchmarks/BuildingVAV/BaseClasses/FanOnOffWithDP.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ScalableBenchmarks/BuildingVAV/BaseClasses/FanOnOffWithDP.mo" 2021-09-16 11:15:38.378780658 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ScalableBenchmarks/BuildingVAV/BaseClasses/FanOnOffWithDP.mo" 2021-09-16 11:18:44.358160925 +0200 @@ -2,7 +2,7 @@ block FanOnOffWithDP "Controller for fan on/off and to provide prescribed dP" import Buildings.Examples.VAVReheat.Controls.OperationModes; - parameter Modelica.SIunits.PressureDifference preRis=850 + parameter Modelica.Units.SI.PressureDifference preRis=850 "Prescribed pressure difference"; Modelica.Blocks.Interfaces.RealOutput y(unit="Pa") "Supply fan requested pressure rise, or zero if fan should be off" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ScalableBenchmarks/BuildingVAV/BaseClasses/VAVBranch.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ScalableBenchmarks/BuildingVAV/BaseClasses/VAVBranch.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ScalableBenchmarks/BuildingVAV/BaseClasses/VAVBranch.mo" 2021-09-16 11:15:38.378780658 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ScalableBenchmarks/BuildingVAV/BaseClasses/VAVBranch.mo" 2021-09-16 11:18:44.318161060 +0200 @@ -5,11 +5,11 @@ replaceable package MediumW = Modelica.Media.Interfaces.PartialMedium "Medium model for water" annotation (choicesAllMatching=true); - parameter Modelica.SIunits.PressureDifference dpFixed_nominal(displayUnit="Pa")=0 + parameter Modelica.Units.SI.PressureDifference dpFixed_nominal(displayUnit="Pa")=0 "Pressure drop of duct and other resistances that are in series"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Mass flow rate of this thermal zone"; - parameter Modelica.SIunits.Volume VRoo "Room volume"; + parameter Modelica.Units.SI.Volume VRoo "Room volume"; Buildings.Controls.OBC.CDL.Interfaces.RealInput TRooHeaSet( final quantity="ThermodynamicTemperature", diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ScalableBenchmarks/BuildingVAV/Examples/OneFloor_OneZone.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ScalableBenchmarks/BuildingVAV/Examples/OneFloor_OneZone.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ScalableBenchmarks/BuildingVAV/Examples/OneFloor_OneZone.mo" 2021-09-16 11:15:38.378780658 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ScalableBenchmarks/BuildingVAV/Examples/OneFloor_OneZone.mo" 2021-09-16 11:18:44.258161263 +0200 @@ -8,14 +8,14 @@ annotation(Evaluate=true); parameter Integer nFlo(min=1) = 1 "Number of floors" annotation(Evaluate=true); - parameter Modelica.SIunits.PressureDifference dP_pre=850 + parameter Modelica.Units.SI.PressureDifference dP_pre=850 "Prescribed pressure difference"; - parameter Modelica.SIunits.Volume VRoo[nZon,nFlo] = {{6*8*2.7 for j in 1:nFlo} for i in 1:nZon} + parameter Modelica.Units.SI.Volume VRoo[nZon,nFlo] = {{6*8*2.7 for j in 1:nFlo} for i in 1:nZon} "Room volume"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal_each[nZon,nFlo]= + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal_each[nZon,nFlo]= {{7*conv*VRoo[i,j] for j in 1:nFlo} for i in 1:nZon} "Nominal flow rate to each zone"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = nZon*(7*conv)*6*8*2.7 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = nZon*(7*conv)*6*8*2.7 "Nominal system flow rate"; constant Real conv=1.2/3600 "Conversion factor for nominal mass flow rate"; @@ -189,7 +189,7 @@ Buildings.Controls.Continuous.LimPID cooCoiCon[nFlo]( each reverseAction=true, each Td=60, - each initType=Modelica.Blocks.Types.InitPID.InitialState, + each initType=Modelica.Blocks.Types.Init.InitialState, each yMax=1, each yMin=0, each controllerType=Modelica.Blocks.Types.SimpleController.PI, @@ -200,7 +200,7 @@ each yMax=1, each yMin=0, each Td=60, - each initType=Modelica.Blocks.Types.InitPID.InitialState, + each initType=Modelica.Blocks.Types.Init.InitialState, each controllerType=Modelica.Blocks.Types.SimpleController.PI, each Ti=600, each k=0.1) "Controller for heating coil" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ScalableBenchmarks/BuildingVAV/ThermalZones/MultiZone.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ScalableBenchmarks/BuildingVAV/ThermalZones/MultiZone.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ScalableBenchmarks/BuildingVAV/ThermalZones/MultiZone.mo" 2021-09-16 11:15:38.382780645 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ScalableBenchmarks/BuildingVAV/ThermalZones/MultiZone.mo" 2021-09-16 11:18:44.106161774 +0200 @@ -6,7 +6,7 @@ annotation(Evaluate=true); parameter Integer nFlo(min=1) = 1 "Number of floors" annotation(Evaluate=true); - parameter Modelica.SIunits.Angle lat=41.98*3.14159/180 "Latitude"; + parameter Modelica.Units.SI.Angle lat=41.98*3.14159/180 "Latitude"; parameter Real ampFactor[nZon]= if nZon<=5 then {abs(cos(i*3.1415926/(nZon))) for i in 1:nZon} diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ScalableBenchmarks/BuildingVAV/ThermalZones/ThermalZone.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ScalableBenchmarks/BuildingVAV/ThermalZones/ThermalZone.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ScalableBenchmarks/BuildingVAV/ThermalZones/ThermalZone.mo" 2021-09-16 11:15:38.382780645 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/ScalableBenchmarks/BuildingVAV/ThermalZones/ThermalZone.mo" 2021-09-16 11:18:44.074161881 +0200 @@ -4,23 +4,23 @@ replaceable package MediumA = Modelica.Media.Interfaces.PartialMedium "Medium model"; - parameter Modelica.SIunits.Angle lat "Latitude"; + parameter Modelica.Units.SI.Angle lat "Latitude"; parameter Real gainFactor(start=1) "IHG fluctuating amplitude factor"; parameter Real VInf_flow=(roo.AFlo*roo.hRoo)*0.5/3600 "Infiltration volume flow rate"; - final parameter Modelica.SIunits.Angle S_= + final parameter Modelica.Units.SI.Angle S_= Buildings.Types.Azimuth.S "Azimuth for south walls"; - final parameter Modelica.SIunits.Angle E_= + final parameter Modelica.Units.SI.Angle E_= Buildings.Types.Azimuth.E "Azimuth for east walls"; - final parameter Modelica.SIunits.Angle W_= + final parameter Modelica.Units.SI.Angle W_= Buildings.Types.Azimuth.W "Azimuth for west walls"; - final parameter Modelica.SIunits.Angle N_= + final parameter Modelica.Units.SI.Angle N_= Buildings.Types.Azimuth.N "Azimuth for north walls"; - final parameter Modelica.SIunits.Angle C_= + final parameter Modelica.Units.SI.Angle C_= Buildings.Types.Tilt.Ceiling "Tilt for ceiling"; - final parameter Modelica.SIunits.Angle F_= + final parameter Modelica.Units.SI.Angle F_= Buildings.Types.Tilt.Floor "Tilt for floor"; - final parameter Modelica.SIunits.Angle Z_= + final parameter Modelica.Units.SI.Angle Z_= Buildings.Types.Tilt.Wall "Tilt for wall"; final parameter HeatTransfer.Data.Solids.Plywood matFur(x=0.15, nStaRef=5) "Material for furniture" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/Boiler/System1.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/Boiler/System1.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/Boiler/System1.mo" 2021-09-16 11:15:38.382780645 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/Boiler/System1.mo" 2021-09-16 11:18:43.962162258 +0200 @@ -14,10 +14,10 @@ Modelica.Thermal.HeatTransfer.Components.ThermalConductor theCon(G=20000/30) "Thermal conductance with the ambient" annotation (Placement(transformation(extent={{20,40},{40,60}}))); - parameter Modelica.SIunits.Volume V=6*10*3 "Room volume"; - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal = V*1.2*6/3600 + parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume"; + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal = V*1.2*6/3600 "Nominal mass flow rate"; - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow = 4000 + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow = 4000 "Internal heat gains of the room"; Modelica.Thermal.HeatTransfer.Sources.FixedTemperature TOut(T=263.15) "Outside temperature" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/Boiler/System2.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/Boiler/System2.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/Boiler/System2.mo" 2021-09-16 11:15:38.382780645 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/Boiler/System2.mo" 2021-09-16 11:18:43.938162339 +0200 @@ -11,13 +11,13 @@ //-------------------------------------------------------------------------// //------------------------Step 4: Design conditions------------------------// - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 20000 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 20000 "Nominal heat flow rate of radiator"; - parameter Modelica.SIunits.Temperature TRadSup_nominal = 273.15+50 + parameter Modelica.Units.SI.Temperature TRadSup_nominal = 273.15+50 "Radiator nominal supply water temperature"; - parameter Modelica.SIunits.Temperature TRadRet_nominal = 273.15+40 + parameter Modelica.Units.SI.Temperature TRadRet_nominal = 273.15+40 "Radiator nominal return water temperature"; - parameter Modelica.SIunits.MassFlowRate mRad_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mRad_flow_nominal= Q_flow_nominal/4200/(TRadSup_nominal-TRadRet_nominal) "Radiator nominal mass flow rate"; //------------------------------------------------------------------------// @@ -31,10 +31,10 @@ Modelica.Thermal.HeatTransfer.Components.ThermalConductor theCon(G=20000/30) "Thermal conductance with the ambient" annotation (Placement(transformation(extent={{20,40},{40,60}}))); - parameter Modelica.SIunits.Volume V=6*10*3 "Room volume"; - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal = V*1.2*6/3600 + parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume"; + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal = V*1.2*6/3600 "Nominal mass flow rate"; - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow = 4000 + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow = 4000 "Internal heat gains of the room"; Modelica.Thermal.HeatTransfer.Sources.FixedTemperature TOut(T=263.15) "Outside temperature" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/Boiler/System3.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/Boiler/System3.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/Boiler/System3.mo" 2021-09-16 11:15:38.382780645 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/Boiler/System3.mo" 2021-09-16 11:18:43.898162473 +0200 @@ -7,28 +7,28 @@ replaceable package MediumW = Buildings.Media.Water "Medium model"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 20000 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 20000 "Nominal heat flow rate of radiator"; - parameter Modelica.SIunits.Temperature TRadSup_nominal = 273.15+50 + parameter Modelica.Units.SI.Temperature TRadSup_nominal = 273.15+50 "Radiator nominal supply water temperature"; - parameter Modelica.SIunits.Temperature TRadRet_nominal = 273.15+40 + parameter Modelica.Units.SI.Temperature TRadRet_nominal = 273.15+40 "Radiator nominal return water temperature"; - parameter Modelica.SIunits.MassFlowRate mRad_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mRad_flow_nominal= Q_flow_nominal/4200/(TRadSup_nominal-TRadRet_nominal) "Radiator nominal mass flow rate"; //-------------------------Step 4: Boiler design values-------------------------// - parameter Modelica.SIunits.Temperature TBoiSup_nominal = 273.15+70 + parameter Modelica.Units.SI.Temperature TBoiSup_nominal = 273.15+70 "Boiler nominal supply water temperature"; - parameter Modelica.SIunits.Temperature TBoiRet_min = 273.15+60 + parameter Modelica.Units.SI.Temperature TBoiRet_min = 273.15+60 "Boiler minimum return water temperature"; - parameter Modelica.SIunits.MassFlowRate mBoi_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mBoi_flow_nominal= Q_flow_nominal/4200/(TBoiSup_nominal-TBoiRet_min) "Boiler nominal mass flow rate"; //------------------------------------------------------------------------------// //----------------Radiator loop: Three-way valve: mass flow rate----------------// - parameter Modelica.SIunits.MassFlowRate mRadVal_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mRadVal_flow_nominal= Q_flow_nominal/4200/(TBoiSup_nominal-TRadRet_nominal) "Radiator nominal mass flow rate"; //------------------------------------------------------------------------------// @@ -42,10 +42,10 @@ Modelica.Thermal.HeatTransfer.Components.ThermalConductor theCon(G=20000/30) "Thermal conductance with the ambient" annotation (Placement(transformation(extent={{20,40},{40,60}}))); - parameter Modelica.SIunits.Volume V=6*10*3 "Room volume"; - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal = V*1.2*6/3600 + parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume"; + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal = V*1.2*6/3600 "Nominal mass flow rate"; - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow = 4000 + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow = 4000 "Internal heat gains of the room"; Modelica.Thermal.HeatTransfer.Sources.FixedTemperature TOut(T=263.15) "Outside temperature" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/Boiler/System4.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/Boiler/System4.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/Boiler/System4.mo" 2021-09-16 11:15:38.382780645 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/Boiler/System4.mo" 2021-09-16 11:18:43.822162729 +0200 @@ -7,28 +7,28 @@ replaceable package MediumW = Buildings.Media.Water "Medium model"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 20000 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 20000 "Nominal heat flow rate of radiator"; - parameter Modelica.SIunits.Temperature TRadSup_nominal = 273.15+50 + parameter Modelica.Units.SI.Temperature TRadSup_nominal = 273.15+50 "Radiator nominal supply water temperature"; - parameter Modelica.SIunits.Temperature TRadRet_nominal = 273.15+40 + parameter Modelica.Units.SI.Temperature TRadRet_nominal = 273.15+40 "Radiator nominal return water temperature"; - parameter Modelica.SIunits.MassFlowRate mRad_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mRad_flow_nominal= Q_flow_nominal/4200/(TRadSup_nominal-TRadRet_nominal) "Radiator nominal mass flow rate"; //-------------------------Step 4: Boiler design values-------------------------// - parameter Modelica.SIunits.Temperature TBoiSup_nominal = 273.15+70 + parameter Modelica.Units.SI.Temperature TBoiSup_nominal = 273.15+70 "Boiler nominal supply water temperature"; - parameter Modelica.SIunits.Temperature TBoiRet_min = 273.15+60 + parameter Modelica.Units.SI.Temperature TBoiRet_min = 273.15+60 "Boiler minimum return water temperature"; - parameter Modelica.SIunits.MassFlowRate mBoi_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mBoi_flow_nominal= Q_flow_nominal/4200/(TBoiSup_nominal-TBoiRet_min) "Boiler nominal mass flow rate"; //------------------------------------------------------------------------------// //----------------Radiator loop: Three-way valve: mass flow rate----------------// - parameter Modelica.SIunits.MassFlowRate mRadVal_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mRadVal_flow_nominal= Q_flow_nominal/4200/(TBoiSup_nominal-TRadRet_nominal) "Radiator nominal mass flow rate"; //------------------------------------------------------------------------------// @@ -42,10 +42,10 @@ Modelica.Thermal.HeatTransfer.Components.ThermalConductor theCon(G=20000/30) "Thermal conductance with the ambient" annotation (Placement(transformation(extent={{20,40},{40,60}}))); - parameter Modelica.SIunits.Volume V=6*10*3 "Room volume"; - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal = V*1.2*6/3600 + parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume"; + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal = V*1.2*6/3600 "Nominal mass flow rate"; - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow = 4000 + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow = 4000 "Internal heat gains of the room"; Modelica.Thermal.HeatTransfer.Sources.FixedTemperature TOut(T=263.15) "Outside temperature" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/Boiler/System5.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/Boiler/System5.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/Boiler/System5.mo" 2021-09-16 11:15:38.382780645 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/Boiler/System5.mo" 2021-09-16 11:18:43.526163724 +0200 @@ -7,28 +7,28 @@ replaceable package MediumW = Buildings.Media.Water "Medium model"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 20000 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 20000 "Nominal heat flow rate of radiator"; - parameter Modelica.SIunits.Temperature TRadSup_nominal = 273.15+50 + parameter Modelica.Units.SI.Temperature TRadSup_nominal = 273.15+50 "Radiator nominal supply water temperature"; - parameter Modelica.SIunits.Temperature TRadRet_nominal = 273.15+40 + parameter Modelica.Units.SI.Temperature TRadRet_nominal = 273.15+40 "Radiator nominal return water temperature"; - parameter Modelica.SIunits.MassFlowRate mRad_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mRad_flow_nominal= Q_flow_nominal/4200/(TRadSup_nominal-TRadRet_nominal) "Radiator nominal mass flow rate"; //-------------------------Step 4: Boiler design values-------------------------// - parameter Modelica.SIunits.Temperature TBoiSup_nominal = 273.15+70 + parameter Modelica.Units.SI.Temperature TBoiSup_nominal = 273.15+70 "Boiler nominal supply water temperature"; - parameter Modelica.SIunits.Temperature TBoiRet_min = 273.15+60 + parameter Modelica.Units.SI.Temperature TBoiRet_min = 273.15+60 "Boiler minimum return water temperature"; - parameter Modelica.SIunits.MassFlowRate mBoi_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mBoi_flow_nominal= Q_flow_nominal/4200/(TBoiSup_nominal-TBoiRet_min) "Boiler nominal mass flow rate"; //------------------------------------------------------------------------------// //----------------Radiator loop: Three-way valve: mass flow rate----------------// - parameter Modelica.SIunits.MassFlowRate mRadVal_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mRadVal_flow_nominal= Q_flow_nominal/4200/(TBoiSup_nominal-TRadRet_nominal) "Radiator nominal mass flow rate"; //------------------------------------------------------------------------------// @@ -42,10 +42,10 @@ Modelica.Thermal.HeatTransfer.Components.ThermalConductor theCon(G=20000/30) "Thermal conductance with the ambient" annotation (Placement(transformation(extent={{20,40},{40,60}}))); - parameter Modelica.SIunits.Volume V=6*10*3 "Room volume"; - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal = V*1.2*6/3600 + parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume"; + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal = V*1.2*6/3600 "Nominal mass flow rate"; - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow = 4000 + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow = 4000 "Internal heat gains of the room"; Modelica.Thermal.HeatTransfer.Sources.FixedTemperature TOut(T=263.15) "Outside temperature" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/Boiler/System6.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/Boiler/System6.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/Boiler/System6.mo" 2021-09-16 11:15:38.382780645 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/Boiler/System6.mo" 2021-09-16 11:18:43.422164075 +0200 @@ -7,27 +7,27 @@ replaceable package MediumW = Buildings.Media.Water "Medium model"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 20000 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 20000 "Nominal heat flow rate of radiator"; - parameter Modelica.SIunits.Temperature TRadSup_nominal = 273.15+50 + parameter Modelica.Units.SI.Temperature TRadSup_nominal = 273.15+50 "Radiator nominal supply water temperature"; - parameter Modelica.SIunits.Temperature TRadRet_nominal = 273.15+40 + parameter Modelica.Units.SI.Temperature TRadRet_nominal = 273.15+40 "Radiator nominal return water temperature"; - parameter Modelica.SIunits.MassFlowRate mRad_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mRad_flow_nominal= Q_flow_nominal/4200/(TRadSup_nominal-TRadRet_nominal) "Radiator nominal mass flow rate"; - parameter Modelica.SIunits.Temperature TBoiSup_nominal = 273.15+70 + parameter Modelica.Units.SI.Temperature TBoiSup_nominal = 273.15+70 "Boiler nominal supply water temperature"; - parameter Modelica.SIunits.Temperature TBoiRet_min = 273.15+60 + parameter Modelica.Units.SI.Temperature TBoiRet_min = 273.15+60 "Boiler minimum return water temperature"; - parameter Modelica.SIunits.MassFlowRate mBoi_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mBoi_flow_nominal= Q_flow_nominal/4200/(TBoiSup_nominal-TBoiRet_min) "Boiler nominal mass flow rate"; //------------------------------------------------------------------------------// //----------------Radiator loop: Three-way valve: mass flow rate----------------// - parameter Modelica.SIunits.MassFlowRate mRadVal_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mRadVal_flow_nominal= Q_flow_nominal/4200/(TBoiSup_nominal-TRadRet_nominal) "Radiator nominal mass flow rate"; @@ -40,10 +40,10 @@ Modelica.Thermal.HeatTransfer.Components.ThermalConductor theCon(G=20000/30) "Thermal conductance with the ambient" annotation (Placement(transformation(extent={{20,40},{40,60}}))); - parameter Modelica.SIunits.Volume V=6*10*3 "Room volume"; - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal = V*1.2*6/3600 + parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume"; + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal = V*1.2*6/3600 "Nominal mass flow rate"; - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow = 4000 + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow = 4000 "Internal heat gains of the room"; Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow preHea "Prescribed heat flow" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/Boiler/System7.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/Boiler/System7.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/Boiler/System7.mo" 2021-09-16 11:15:38.382780645 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/Boiler/System7.mo" 2021-09-16 11:18:43.314164438 +0200 @@ -7,27 +7,27 @@ replaceable package MediumW = Buildings.Media.Water "Medium model"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 20000 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 20000 "Nominal heat flow rate of radiator"; - parameter Modelica.SIunits.Temperature TRadSup_nominal = 273.15+50 + parameter Modelica.Units.SI.Temperature TRadSup_nominal = 273.15+50 "Radiator nominal supply water temperature"; - parameter Modelica.SIunits.Temperature TRadRet_nominal = 273.15+40 + parameter Modelica.Units.SI.Temperature TRadRet_nominal = 273.15+40 "Radiator nominal return water temperature"; - parameter Modelica.SIunits.MassFlowRate mRad_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mRad_flow_nominal= Q_flow_nominal/4200/(TRadSup_nominal-TRadRet_nominal) "Radiator nominal mass flow rate"; - parameter Modelica.SIunits.Temperature TBoiSup_nominal = 273.15+70 + parameter Modelica.Units.SI.Temperature TBoiSup_nominal = 273.15+70 "Boiler nominal supply water temperature"; - parameter Modelica.SIunits.Temperature TBoiRet_min = 273.15+60 + parameter Modelica.Units.SI.Temperature TBoiRet_min = 273.15+60 "Boiler minimum return water temperature"; - parameter Modelica.SIunits.MassFlowRate mBoi_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mBoi_flow_nominal= Q_flow_nominal/4200/(TBoiSup_nominal-TBoiRet_min) "Boiler nominal mass flow rate"; //------------------------------------------------------------------------------// //----------------Radiator loop: Three-way valve: mass flow rate----------------// - parameter Modelica.SIunits.MassFlowRate mRadVal_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mRadVal_flow_nominal= Q_flow_nominal/4200/(TBoiSup_nominal-TRadRet_nominal) "Radiator nominal mass flow rate"; @@ -40,10 +40,10 @@ Modelica.Thermal.HeatTransfer.Components.ThermalConductor theCon(G=20000/30) "Thermal conductance with the ambient" annotation (Placement(transformation(extent={{20,40},{40,60}}))); - parameter Modelica.SIunits.Volume V=6*10*3 "Room volume"; - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal = V*1.2*6/3600 + parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume"; + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal = V*1.2*6/3600 "Nominal mass flow rate"; - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow = 4000 + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow = 4000 "Internal heat gains of the room"; Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow preHea "Prescribed heat flow" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/CDL/BaseClasses/PartialOpenLoop.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/CDL/BaseClasses/PartialOpenLoop.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/CDL/BaseClasses/PartialOpenLoop.mo" 2021-09-16 11:15:38.382780645 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/CDL/BaseClasses/PartialOpenLoop.mo" 2021-09-16 11:18:43.074165245 +0200 @@ -4,25 +4,25 @@ replaceable package MediumA = Buildings.Media.Air "Medium model for air"; replaceable package MediumW = Buildings.Media.Water "Medium model for water"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 20000 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 20000 "Nominal heat flow rate of radiator"; - parameter Modelica.SIunits.Temperature TRadSup_nominal = 273.15+50 + parameter Modelica.Units.SI.Temperature TRadSup_nominal = 273.15+50 "Radiator nominal supply water temperature"; - parameter Modelica.SIunits.Temperature TRadRet_nominal = 273.15+40 + parameter Modelica.Units.SI.Temperature TRadRet_nominal = 273.15+40 "Radiator nominal return water temperature"; - parameter Modelica.SIunits.MassFlowRate mRad_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mRad_flow_nominal= Q_flow_nominal/4200/(TRadSup_nominal-TRadRet_nominal) "Radiator nominal mass flow rate"; - parameter Modelica.SIunits.Temperature TBoiSup_nominal = 273.15+70 + parameter Modelica.Units.SI.Temperature TBoiSup_nominal = 273.15+70 "Boiler nominal supply water temperature"; - parameter Modelica.SIunits.Temperature TBoiRet_min = 273.15+60 + parameter Modelica.Units.SI.Temperature TBoiRet_min = 273.15+60 "Boiler minimum return water temperature"; - parameter Modelica.SIunits.MassFlowRate mBoi_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mBoi_flow_nominal= Q_flow_nominal/4200/(TBoiSup_nominal-TBoiRet_min) "Boiler nominal mass flow rate"; - parameter Modelica.SIunits.MassFlowRate mRadVal_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mRadVal_flow_nominal= Q_flow_nominal/4200/(TBoiSup_nominal-TRadRet_nominal) "Radiator nominal mass flow rate"; @@ -36,10 +36,10 @@ Modelica.Thermal.HeatTransfer.Components.ThermalConductor theCon(G=20000/30) "Thermal conductance with the ambient" annotation (Placement(transformation(extent={{20,40},{40,60}}))); - parameter Modelica.SIunits.Volume V=6*10*3 "Room volume"; - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal = V*1.2*6/3600 + parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume"; + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal = V*1.2*6/3600 "Nominal mass flow rate"; - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow = 4000 + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow = 4000 "Internal heat gains of the room"; Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow preHea "Prescribed heat flow" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/CDL/Controls/BoilerReturn.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/CDL/Controls/BoilerReturn.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/CDL/Controls/BoilerReturn.mo" 2021-09-16 11:15:38.382780645 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/CDL/Controls/BoilerReturn.mo" 2021-09-16 11:18:42.998165500 +0200 @@ -5,7 +5,7 @@ displayUnit="degC") = 333.15 "Set point for boiler temperature"; parameter Real k=0.1 "Gain of controller"; - parameter Modelica.SIunits.Time Ti=120 "Time constant of integrator block"; + parameter Modelica.Units.SI.Time Ti=120 "Time constant of integrator block"; Buildings.Controls.OBC.CDL.Interfaces.RealInput TRet( final unit="K", displayUnit="degC") diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/CDL/Controls/RadiatorSupply.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/CDL/Controls/RadiatorSupply.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/CDL/Controls/RadiatorSupply.mo" 2021-09-16 11:15:38.382780645 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/CDL/Controls/RadiatorSupply.mo" 2021-09-16 11:18:42.918165769 +0200 @@ -15,7 +15,7 @@ "Room air temperature at which supply water temperature is at TSupMax"; parameter Real k=0.1 "Gain of controller"; - parameter Modelica.SIunits.Time Ti=120 "Time constant of integrator block"; + parameter Modelica.Units.SI.Time Ti=120 "Time constant of integrator block"; Buildings.Controls.OBC.CDL.Interfaces.RealInput TRoo( final unit="K", diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/SpaceCooling/System1.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/SpaceCooling/System1.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/SpaceCooling/System1.mo" 2021-09-16 11:15:38.382780645 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/SpaceCooling/System1.mo" 2021-09-16 11:18:42.538167048 +0200 @@ -14,10 +14,10 @@ Modelica.Thermal.HeatTransfer.Components.ThermalConductor theCon(G=10000/30) "Thermal conductance with the ambient" annotation (Placement(transformation(extent={{20,40},{40,60}}))); - parameter Modelica.SIunits.Volume V=6*10*3 "Room volume"; - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal = V*6/3600 + parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume"; + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal = V*6/3600 "Nominal mass flow rate"; - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow = 1000 + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow = 1000 "Internal heat gains of the room"; Modelica.Thermal.HeatTransfer.Sources.FixedTemperature TOut(T=263.15) "Outside temperature" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/SpaceCooling/System2.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/SpaceCooling/System2.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/SpaceCooling/System2.mo" 2021-09-16 11:15:38.382780645 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/SpaceCooling/System2.mo" 2021-09-16 11:18:42.518167115 +0200 @@ -17,46 +17,46 @@ Modelica.Thermal.HeatTransfer.Components.ThermalConductor theCon(G=10000/30) "Thermal conductance with the ambient" annotation (Placement(transformation(extent={{20,40},{40,60}}))); - parameter Modelica.SIunits.Volume V=6*10*3 "Room volume"; + parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume"; ////////////////////////////////////////////////////////// // Heat recovery effectiveness parameter Real eps = 0.8 "Heat recovery effectiveness"; ///////////////////////////////////////////////////////// // Air temperatures at design conditions - parameter Modelica.SIunits.Temperature TASup_nominal = 273.15+18 + parameter Modelica.Units.SI.Temperature TASup_nominal = 273.15+18 "Nominal air temperature supplied to room"; - parameter Modelica.SIunits.Temperature TRooSet = 273.15+24 + parameter Modelica.Units.SI.Temperature TRooSet = 273.15+24 "Nominal room air temperature"; - parameter Modelica.SIunits.Temperature TOut_nominal = 273.15+30 + parameter Modelica.Units.SI.Temperature TOut_nominal = 273.15+30 "Design outlet air temperature"; - parameter Modelica.SIunits.Temperature THeaRecLvg= + parameter Modelica.Units.SI.Temperature THeaRecLvg= TOut_nominal - eps*(TOut_nominal-TRooSet) "Air temperature leaving the heat recovery"; ///////////////////////////////////////////////////////// // Cooling loads and air mass flow rates - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow= + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow= 1000 "Internal heat gains of the room"; - parameter Modelica.SIunits.HeatFlowRate QRooC_flow_nominal= + parameter Modelica.Units.SI.HeatFlowRate QRooC_flow_nominal= -QRooInt_flow-10E3/30*(TOut_nominal-TRooSet) "Nominal cooling load of the room"; - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal= 1.3*QRooC_flow_nominal/1006/(TASup_nominal-TRooSet) "Nominal air mass flow rate, increased by factor 1.3 to allow for recovery after temperature setback"; - parameter Modelica.SIunits.TemperatureDifference dTFan = 2 + parameter Modelica.Units.SI.TemperatureDifference dTFan = 2 "Estimated temperature raise across fan that needs to be made up by the cooling coil"; - parameter Modelica.SIunits.HeatFlowRate QCoiC_flow_nominal=4* + parameter Modelica.Units.SI.HeatFlowRate QCoiC_flow_nominal=4* (QRooC_flow_nominal + mA_flow_nominal*(TASup_nominal-THeaRecLvg-dTFan)*1006) "Cooling load of coil, taking into account economizer, and increased due to latent heat removal"; ///////////////////////////////////////////////////////// // Water temperatures and mass flow rates - parameter Modelica.SIunits.Temperature TWSup_nominal = 273.15+16 + parameter Modelica.Units.SI.Temperature TWSup_nominal = 273.15+16 "Water supply temperature"; - parameter Modelica.SIunits.Temperature TWRet_nominal = 273.15+12 + parameter Modelica.Units.SI.Temperature TWRet_nominal = 273.15+12 "Water return temperature"; - parameter Modelica.SIunits.MassFlowRate mW_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mW_flow_nominal= QCoiC_flow_nominal/(TWRet_nominal-TWSup_nominal)/4200 "Nominal water mass flow rate"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/SpaceCooling/System3.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/SpaceCooling/System3.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/SpaceCooling/System3.mo" 2021-09-16 11:15:38.382780645 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/Tutorial/SpaceCooling/System3.mo" 2021-09-16 11:18:42.474167263 +0200 @@ -17,46 +17,46 @@ Modelica.Thermal.HeatTransfer.Components.ThermalConductor theCon(G=10000/30) "Thermal conductance with the ambient" annotation (Placement(transformation(extent={{20,40},{40,60}}))); - parameter Modelica.SIunits.Volume V=6*10*3 "Room volume"; + parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume"; ////////////////////////////////////////////////////////// // Heat recovery effectiveness parameter Real eps = 0.8 "Heat recovery effectiveness"; ///////////////////////////////////////////////////////// // Air temperatures at design conditions - parameter Modelica.SIunits.Temperature TASup_nominal = 273.15+18 + parameter Modelica.Units.SI.Temperature TASup_nominal = 273.15+18 "Nominal air temperature supplied to room"; - parameter Modelica.SIunits.Temperature TRooSet = 273.15+24 + parameter Modelica.Units.SI.Temperature TRooSet = 273.15+24 "Nominal room air temperature"; - parameter Modelica.SIunits.Temperature TOut_nominal = 273.15+30 + parameter Modelica.Units.SI.Temperature TOut_nominal = 273.15+30 "Design outlet air temperature"; - parameter Modelica.SIunits.Temperature THeaRecLvg= + parameter Modelica.Units.SI.Temperature THeaRecLvg= TOut_nominal - eps*(TOut_nominal-TRooSet) "Air temperature leaving the heat recovery"; ///////////////////////////////////////////////////////// // Cooling loads and air mass flow rates - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow= + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow= 1000 "Internal heat gains of the room"; - parameter Modelica.SIunits.HeatFlowRate QRooC_flow_nominal= + parameter Modelica.Units.SI.HeatFlowRate QRooC_flow_nominal= -QRooInt_flow-10E3/30*(TOut_nominal-TRooSet) "Nominal cooling load of the room"; - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal= 1.3*QRooC_flow_nominal/1006/(TASup_nominal-TRooSet) "Nominal air mass flow rate, increased by factor 1.3 to allow for recovery after temperature setback"; - parameter Modelica.SIunits.TemperatureDifference dTFan = 2 + parameter Modelica.Units.SI.TemperatureDifference dTFan = 2 "Estimated temperature raise across fan that needs to be made up by the cooling coil"; - parameter Modelica.SIunits.HeatFlowRate QCoiC_flow_nominal=4* + parameter Modelica.Units.SI.HeatFlowRate QCoiC_flow_nominal=4* (QRooC_flow_nominal + mA_flow_nominal*(TASup_nominal-THeaRecLvg-dTFan)*1006) "Cooling load of coil, taking into account economizer, and increased due to latent heat removal"; ///////////////////////////////////////////////////////// // Water temperatures and mass flow rates - parameter Modelica.SIunits.Temperature TWSup_nominal = 273.15+16 + parameter Modelica.Units.SI.Temperature TWSup_nominal = 273.15+16 "Water supply temperature"; - parameter Modelica.SIunits.Temperature TWRet_nominal = 273.15+12 + parameter Modelica.Units.SI.Temperature TWRet_nominal = 273.15+12 "Water return temperature"; - parameter Modelica.SIunits.MassFlowRate mW_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate mW_flow_nominal= QCoiC_flow_nominal/(TWRet_nominal-TWSup_nominal)/4200 "Nominal water mass flow rate"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVCO2/BaseClasses/RoomVAV.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVCO2/BaseClasses/RoomVAV.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVCO2/BaseClasses/RoomVAV.mo" 2021-09-16 11:15:38.382780645 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVCO2/BaseClasses/RoomVAV.mo" 2021-09-16 11:18:42.350167680 +0200 @@ -3,10 +3,10 @@ replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium in the component"; - parameter Modelica.SIunits.Volume VRoo "Volume of room"; - parameter Modelica.SIunits.Volume VPle "Volume of plenum"; - parameter Modelica.SIunits.Area ADam "Damper face area"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal + parameter Modelica.Units.SI.Volume VRoo "Volume of room"; + parameter Modelica.Units.SI.Volume VPle "Volume of plenum"; + parameter Modelica.Units.SI.Area ADam "Damper face area"; + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate"; parameter Real l(min=1e-10, max=1) = 0.0001 "Damper leakage, ratio of flow coefficients k(y=0)/k(y=1)" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVCO2/BaseClasses/Suite.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVCO2/BaseClasses/Suite.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVCO2/BaseClasses/Suite.mo" 2021-09-16 11:15:38.382780645 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVCO2/BaseClasses/Suite.mo" 2021-09-16 11:18:42.314167801 +0200 @@ -9,7 +9,7 @@ annotation (Placement(transformation(extent={{-110,110},{-90,130}}))); parameter Real scaM_flow "Scaling factor for mass flow rate"; - parameter Modelica.SIunits.MassFlowRate m0Tot_flow= + parameter Modelica.Units.SI.MassFlowRate m0Tot_flow= scaM_flow*(5.196+2.8428+1.0044+0.9612+0.3624+0.1584); parameter Real l(min=1e-10, max=1) = 0.0001 "Damper leakage, ratio of flow coefficients k(y=0)/k(y=1)" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVCO2/VAVSystemCTControl.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVCO2/VAVSystemCTControl.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVCO2/VAVSystemCTControl.mo" 2021-09-16 11:15:38.382780645 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVCO2/VAVSystemCTControl.mo" 2021-09-16 11:18:42.194168204 +0200 @@ -4,15 +4,15 @@ extends Modelica.Icons.Example; package Medium = Buildings.Media.Air(extraPropertiesNames={"CO2"}); - parameter Modelica.SIunits.MassFlowRate mMIT_flow = roo.m0Tot_flow + parameter Modelica.Units.SI.MassFlowRate mMIT_flow = roo.m0Tot_flow "Nominal mass flow rate of MIT system model as in ASHRAE 825-RP"; -parameter Modelica.SIunits.PressureDifference dpSuiSup_nominal(displayUnit="Pa") = 95 +parameter Modelica.Units.SI.PressureDifference dpSuiSup_nominal(displayUnit="Pa") = 95 "Pressure drop supply air leg with splitters of one suite (obtained from simulation)"; -parameter Modelica.SIunits.PressureDifference dpSuiRet_nominal(displayUnit="Pa") = 233 +parameter Modelica.Units.SI.PressureDifference dpSuiRet_nominal(displayUnit="Pa") = 233 "Pressure drop return air leg with splitters of one suite (obtained from simulation)"; -parameter Modelica.SIunits.PressureDifference dpFanSupMIT_nominal(displayUnit="Pa") = 1050 +parameter Modelica.Units.SI.PressureDifference dpFanSupMIT_nominal(displayUnit="Pa") = 1050 "Pressure increase over supply fan in MIT system model as in ASHRAE 825-RP (obtained from simulation)"; -parameter Modelica.SIunits.PressureDifference dpFanRetMIT_nominal(displayUnit="Pa") = 347 +parameter Modelica.Units.SI.PressureDifference dpFanRetMIT_nominal(displayUnit="Pa") = 347 "Pressure increase over supply fan in MIT system model as in ASHRAE 825-RP (obtained from simulation)"; parameter Real scaM_flow = 1 "Scaling factor for mass flow rate"; parameter Real scaDpFanSup_nominal = 1 @@ -79,7 +79,7 @@ yMin=0, Td=60, k=0.1, - initType=Modelica.Blocks.Types.InitPID.InitialState, + initType=Modelica.Blocks.Types.Init.InitialState, controllerType=Modelica.Blocks.Types.SimpleController.P) "Controller for supply fan" annotation (Placement(transformation(extent={{-20,60},{0,80}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/ASHRAE2006.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/ASHRAE2006.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/ASHRAE2006.mo" 2021-09-16 11:15:38.382780645 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/ASHRAE2006.mo" 2021-09-16 11:18:42.142168379 +0200 @@ -54,7 +54,7 @@ yMax=1, yMin=0, Td=60, - initType=Modelica.Blocks.Types.InitPID.InitialState, + initType=Modelica.Blocks.Types.Init.InitialState, controllerType=Modelica.Blocks.Types.SimpleController.PI, k=0.02, Ti=300) @@ -63,7 +63,7 @@ Buildings.Controls.Continuous.LimPID cooCoiCon( reverseAction=true, Td=60, - initType=Modelica.Blocks.Types.InitPID.InitialState, + initType=Modelica.Blocks.Types.Init.InitialState, yMax=1, yMin=0, controllerType=Modelica.Blocks.Types.SimpleController.PI, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/BaseClasses/MixingBox.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/BaseClasses/MixingBox.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/BaseClasses/MixingBox.mo" 2021-09-16 11:15:38.382780645 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/BaseClasses/MixingBox.mo" 2021-09-16 11:18:42.038168730 +0200 @@ -16,7 +16,7 @@ parameter Real deltaM = 0.3 "Fraction of nominal mass flow rate where transition to turbulent occurs" annotation(Dialog(enable=use_deltaM)); - parameter Modelica.SIunits.Velocity v_nominal=1 "Nominal face velocity"; + parameter Modelica.Units.SI.Velocity v_nominal=1 "Nominal face velocity"; parameter Boolean roundDuct = false "Set to true for round duct, false for square cross section" @@ -29,24 +29,24 @@ "set to true if dp_nominal includes the pressure loss of the open damper" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.MassFlowRate mOut_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mOut_flow_nominal "Mass flow rate outside air damper" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.PressureDifference dpOut_nominal(min=0, displayUnit="Pa") + parameter Modelica.Units.SI.PressureDifference dpOut_nominal(min=0, displayUnit="Pa") "Pressure drop outside air leg" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.MassFlowRate mRec_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mRec_flow_nominal "Mass flow rate recirculation air damper" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.PressureDifference dpRec_nominal(min=0, displayUnit="Pa") + parameter Modelica.Units.SI.PressureDifference dpRec_nominal(min=0, displayUnit="Pa") "Pressure drop recirculation air leg" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.MassFlowRate mExh_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mExh_flow_nominal "Mass flow rate exhaust air damper" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.PressureDifference dpExh_nominal(min=0, displayUnit="Pa") + parameter Modelica.Units.SI.PressureDifference dpExh_nominal(min=0, displayUnit="Pa") "Pressure drop exhaust air leg" annotation (Dialog(group="Nominal condition")); @@ -71,7 +71,7 @@ "Flow coefficient for y=1, k1 = pressure drop divided by dynamic pressure" annotation (Dialog(tab="Damper coefficients")); - parameter Modelica.SIunits.Time riseTime=15 + parameter Modelica.Units.SI.Time riseTime=15 "Rise time of the filter (time to reach 99.6 % of an opening step)" annotation (Dialog(tab="Dynamics", group="Filtered opening")); parameter Modelica.Blocks.Types.Init init=Modelica.Blocks.Types.Init.InitialOutput diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/BaseClasses/PartialOpenLoop.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/BaseClasses/PartialOpenLoop.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/BaseClasses/PartialOpenLoop.mo" 2021-09-16 11:15:38.382780645 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/BaseClasses/PartialOpenLoop.mo" 2021-09-16 11:18:41.974168945 +0200 @@ -7,51 +7,51 @@ constant Integer numZon=5 "Total number of served VAV boxes"; - parameter Modelica.SIunits.Volume VRooCor=AFloCor*flo.hRoo + parameter Modelica.Units.SI.Volume VRooCor=AFloCor*flo.hRoo "Room volume corridor"; - parameter Modelica.SIunits.Volume VRooSou=AFloSou*flo.hRoo + parameter Modelica.Units.SI.Volume VRooSou=AFloSou*flo.hRoo "Room volume south"; - parameter Modelica.SIunits.Volume VRooNor=AFloNor*flo.hRoo + parameter Modelica.Units.SI.Volume VRooNor=AFloNor*flo.hRoo "Room volume north"; - parameter Modelica.SIunits.Volume VRooEas=AFloEas*flo.hRoo "Room volume east"; - parameter Modelica.SIunits.Volume VRooWes=AFloWes*flo.hRoo "Room volume west"; + parameter Modelica.Units.SI.Volume VRooEas=AFloEas*flo.hRoo "Room volume east"; + parameter Modelica.Units.SI.Volume VRooWes=AFloWes*flo.hRoo "Room volume west"; - parameter Modelica.SIunits.Area AFloCor=flo.cor.AFlo "Floor area corridor"; - parameter Modelica.SIunits.Area AFloSou=flo.sou.AFlo "Floor area south"; - parameter Modelica.SIunits.Area AFloNor=flo.nor.AFlo "Floor area north"; - parameter Modelica.SIunits.Area AFloEas=flo.eas.AFlo "Floor area east"; - parameter Modelica.SIunits.Area AFloWes=flo.wes.AFlo "Floor area west"; + parameter Modelica.Units.SI.Area AFloCor=flo.cor.AFlo "Floor area corridor"; + parameter Modelica.Units.SI.Area AFloSou=flo.sou.AFlo "Floor area south"; + parameter Modelica.Units.SI.Area AFloNor=flo.nor.AFlo "Floor area north"; + parameter Modelica.Units.SI.Area AFloEas=flo.eas.AFlo "Floor area east"; + parameter Modelica.Units.SI.Area AFloWes=flo.wes.AFlo "Floor area west"; - parameter Modelica.SIunits.Area AFlo[numZon]={flo.cor.AFlo,flo.sou.AFlo,flo.eas.AFlo, + parameter Modelica.Units.SI.Area AFlo[numZon]={flo.cor.AFlo,flo.sou.AFlo,flo.eas.AFlo, flo.nor.AFlo,flo.wes.AFlo} "Floor area of each zone"; - final parameter Modelica.SIunits.Area ATot=sum(AFlo) "Total floor area"; + final parameter Modelica.Units.SI.Area ATot=sum(AFlo) "Total floor area"; constant Real conv=1.2/3600 "Conversion factor for nominal mass flow rate"; - parameter Modelica.SIunits.MassFlowRate mCor_flow_nominal=6*VRooCor*conv + parameter Modelica.Units.SI.MassFlowRate mCor_flow_nominal=6*VRooCor*conv "Design mass flow rate core"; - parameter Modelica.SIunits.MassFlowRate mSou_flow_nominal=6*VRooSou*conv + parameter Modelica.Units.SI.MassFlowRate mSou_flow_nominal=6*VRooSou*conv "Design mass flow rate perimeter 1"; - parameter Modelica.SIunits.MassFlowRate mEas_flow_nominal=9*VRooEas*conv + parameter Modelica.Units.SI.MassFlowRate mEas_flow_nominal=9*VRooEas*conv "Design mass flow rate perimeter 2"; - parameter Modelica.SIunits.MassFlowRate mNor_flow_nominal=6*VRooNor*conv + parameter Modelica.Units.SI.MassFlowRate mNor_flow_nominal=6*VRooNor*conv "Design mass flow rate perimeter 3"; - parameter Modelica.SIunits.MassFlowRate mWes_flow_nominal=7*VRooWes*conv + parameter Modelica.Units.SI.MassFlowRate mWes_flow_nominal=7*VRooWes*conv "Design mass flow rate perimeter 4"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.7*(mCor_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.7*(mCor_flow_nominal + mSou_flow_nominal + mEas_flow_nominal + mNor_flow_nominal + mWes_flow_nominal) "Nominal mass flow rate"; - parameter Modelica.SIunits.Angle lat=41.98*3.14159/180 "Latitude"; + parameter Modelica.Units.SI.Angle lat=41.98*3.14159/180 "Latitude"; - parameter Modelica.SIunits.Temperature THeaOn=293.15 + parameter Modelica.Units.SI.Temperature THeaOn=293.15 "Heating setpoint during on"; - parameter Modelica.SIunits.Temperature THeaOff=285.15 + parameter Modelica.Units.SI.Temperature THeaOff=285.15 "Heating setpoint during off"; - parameter Modelica.SIunits.Temperature TCooOn=297.15 + parameter Modelica.Units.SI.Temperature TCooOn=297.15 "Cooling setpoint during on"; - parameter Modelica.SIunits.Temperature TCooOff=303.15 + parameter Modelica.Units.SI.Temperature TCooOff=303.15 "Cooling setpoint during off"; - parameter Modelica.SIunits.PressureDifference dpBuiStaSet(min=0) = 12 + parameter Modelica.Units.SI.PressureDifference dpBuiStaSet(min=0) = 12 "Building static pressure"; parameter Real yFanMin = 0.1 "Minimum fan speed"; @@ -515,11 +515,11 @@ protected model Results "Model to store the results of the simulation" - parameter Modelica.SIunits.Area A "Floor area"; - input Modelica.SIunits.Power PFan "Fan energy"; - input Modelica.SIunits.Power PHea "Heating energy"; - input Modelica.SIunits.Power PCooSen "Sensible cooling energy"; - input Modelica.SIunits.Power PCooLat "Latent cooling energy"; + parameter Modelica.Units.SI.Area A "Floor area"; + input Modelica.Units.SI.Power PFan "Fan energy"; + input Modelica.Units.SI.Power PHea "Heating energy"; + input Modelica.Units.SI.Power PCooSen "Sensible cooling energy"; + input Modelica.Units.SI.Power PCooLat "Latent cooling energy"; Real EFan( unit="J/m2", diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/CoolingCoilTemperatureSetpoint.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/CoolingCoilTemperatureSetpoint.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/CoolingCoilTemperatureSetpoint.mo" 2021-09-16 11:15:38.382780645 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/CoolingCoilTemperatureSetpoint.mo" 2021-09-16 11:18:41.582170262 +0200 @@ -2,9 +2,9 @@ block CoolingCoilTemperatureSetpoint "Set point scheduler for cooling coil" extends Modelica.Blocks.Icons.Block; import Buildings.Examples.VAVReheat.Controls.OperationModes; - parameter Modelica.SIunits.Temperature TCooOn=273.15+12 + parameter Modelica.Units.SI.Temperature TCooOn=273.15+12 "Cooling setpoint during on"; - parameter Modelica.SIunits.Temperature TCooOff=273.15+30 + parameter Modelica.Units.SI.Temperature TCooOff=273.15+30 "Cooling setpoint during off"; Modelica.Blocks.Sources.RealExpression TSupSetCoo( y=if (mode.y == Integer(OperationModes.occupied) or diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/DuctStaticPressureSetpoint.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/DuctStaticPressureSetpoint.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/DuctStaticPressureSetpoint.mo" 2021-09-16 11:15:38.382780645 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/DuctStaticPressureSetpoint.mo" 2021-09-16 11:18:41.562170330 +0200 @@ -1,13 +1,13 @@ within Buildings.Examples.VAVReheat.Controls; model DuctStaticPressureSetpoint "Computes the duct static pressure setpoint" extends Modelica.Blocks.Interfaces.MISO; - parameter Modelica.SIunits.AbsolutePressure pMin(displayUnit="Pa") = 100 + parameter Modelica.Units.SI.AbsolutePressure pMin(displayUnit="Pa") = 100 "Minimum duct static pressure setpoint"; - parameter Modelica.SIunits.AbsolutePressure pMax(displayUnit="Pa") = 410 + parameter Modelica.Units.SI.AbsolutePressure pMax(displayUnit="Pa") = 410 "Maximum duct static pressure setpoint"; parameter Real k=0.1 "Gain of controller"; - parameter Modelica.SIunits.Time Ti=60 "Time constant of integrator block"; - parameter Modelica.SIunits.Time Td=60 "Time constant of derivative block"; + parameter Modelica.Units.SI.Time Ti=60 "Time constant of integrator block"; + parameter Modelica.Units.SI.Time Td=60 "Time constant of derivative block"; parameter Modelica.Blocks.Types.SimpleController controllerType=Modelica.Blocks.Types.SimpleController.PID "Type of controller"; Buildings.Controls.Continuous.LimPID limPID( @@ -15,7 +15,7 @@ k=k, Ti=Ti, Td=Td, - initType=Modelica.Blocks.Types.InitPID.InitialState, + initType=Modelica.Blocks.Types.Init.InitialState, reverseAction=true) annotation (Placement(transformation(extent={{-20,40},{0,60}}))); protected diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/Economizer.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/Economizer.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/Economizer.mo" 2021-09-16 11:15:38.382780645 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/Economizer.mo" 2021-09-16 11:18:41.534170424 +0200 @@ -1,11 +1,11 @@ within Buildings.Examples.VAVReheat.Controls; block Economizer "Controller for economizer" import Buildings.Examples.VAVReheat.Controls.OperationModes; - parameter Modelica.SIunits.Temperature TFreSet=277.15 + parameter Modelica.Units.SI.Temperature TFreSet=277.15 "Lower limit for mixed air temperature for freeze protection"; - parameter Modelica.SIunits.TemperatureDifference dT(min=0.1) = 1 + parameter Modelica.Units.SI.TemperatureDifference dT(min=0.1) = 1 "Temperture offset to activate economizer"; - parameter Modelica.SIunits.VolumeFlowRate VOut_flow_min(min=0) + parameter Modelica.Units.SI.VolumeFlowRate VOut_flow_min(min=0) "Minimum outside air volume flow rate"; Modelica.Blocks.Interfaces.RealInput TSupHeaSet @@ -40,7 +40,7 @@ Modelica.Blocks.Sources.Constant uni(k=1) "Unity signal" annotation (Placement(transformation(extent={{-60,-20},{-40,0}}))); parameter Real k=1 "Gain of controller"; - parameter Modelica.SIunits.Time Ti "Time constant of integrator block"; + parameter Modelica.Units.SI.Time Ti "Time constant of integrator block"; Modelica.Blocks.Interfaces.RealOutput yOA "Control signal for outside air damper" annotation (Placement( transformation(extent={{200,70},{220,90}}), iconTransformation(extent={ diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/EconomizerTemperatureControl.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/EconomizerTemperatureControl.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/EconomizerTemperatureControl.mo" 2021-09-16 11:15:38.382780645 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/EconomizerTemperatureControl.mo" 2021-09-16 11:18:41.486170585 +0200 @@ -13,7 +13,7 @@ "Controller for mixed air temperature" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); parameter Real k=1 "Gain of controller"; - parameter Modelica.SIunits.Time Ti "Time constant of integrator block"; + parameter Modelica.Units.SI.Time Ti "Time constant of integrator block"; Modelica.Blocks.Logical.Switch swi1 annotation (Placement(transformation(extent={{0,-10},{20,10}}))); Modelica.Blocks.Logical.Switch swi2 diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/Examples/OperationModes.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/Examples/OperationModes.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/Examples/OperationModes.mo" 2021-09-16 11:15:38.382780645 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/Examples/OperationModes.mo" 2021-09-16 11:18:41.454170693 +0200 @@ -45,7 +45,7 @@ annotation (Placement(transformation(extent={{-20,-130},{0,-110}}))); Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow preHeaFlo1 annotation (Placement(transformation(extent={{112,-130},{132,-110}}))); - Buildings.Controls.Continuous.LimPID PID(initType=Modelica.Blocks.Types.InitPID.InitialState) + Buildings.Controls.Continuous.LimPID PID(initType=Modelica.Blocks.Types.Init.InitialState) annotation (Placement(transformation(extent={{-80,-130},{-60,-110}}))); Modelica.Blocks.Logical.Switch switch2 annotation (Placement(transformation(extent={{20,-130},{40,-110}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/FanVFD.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/FanVFD.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/FanVFD.mo" 2021-09-16 11:15:38.382780645 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/FanVFD.mo" 2021-09-16 11:18:41.390170909 +0200 @@ -38,7 +38,7 @@ annotation (Dialog(group="Setpoint tracking")); parameter Real k=0.5 "Gain of controller" annotation (Dialog(group="Setpoint tracking")); - parameter Modelica.SIunits.Time Ti=15 "Time constant of integrator block" + parameter Modelica.Units.SI.Time Ti=15 "Time constant of integrator block" annotation (Dialog(group="Setpoint tracking")); Buildings.Controls.OBC.CDL.Logical.Switch swi diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/ModeSelector.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/ModeSelector.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/ModeSelector.mo" 2021-09-16 11:15:38.386780633 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/ModeSelector.mo" 2021-09-16 11:18:41.354171030 +0200 @@ -1,6 +1,6 @@ within Buildings.Examples.VAVReheat.Controls; model ModeSelector "Finite State Machine for the operational modes" - Modelica.StateGraph.InitialStep initialStep(nIn=0) + Modelica.StateGraph.InitialStep initialStep(nOut = 1, nIn = 0) annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); Modelica.StateGraph.Transition start "Starts the system" annotation (Placement(transformation(extent={{-50,20},{-30,40}}))); @@ -19,13 +19,13 @@ waitTime=60, condition=TRooMinErrHea.y > delTRooOnOff/2) annotation (Placement(transformation(extent={{28,20},{48,40}}))); - parameter Modelica.SIunits.TemperatureDifference delTRooOnOff(min=0.1)=1 + parameter Modelica.Units.SI.TemperatureDifference delTRooOnOff(min=0.1)=1 "Deadband in room temperature between occupied on and occupied off"; - parameter Modelica.SIunits.Temperature TRooSetHeaOcc=293.15 + parameter Modelica.Units.SI.Temperature TRooSetHeaOcc=293.15 "Set point for room air temperature during heating mode"; - parameter Modelica.SIunits.Temperature TRooSetCooOcc=299.15 + parameter Modelica.Units.SI.Temperature TRooSetCooOcc=299.15 "Set point for room air temperature during cooling mode"; - parameter Modelica.SIunits.Temperature TSetHeaCoiOut=303.15 + parameter Modelica.Units.SI.Temperature TSetHeaCoiOut=303.15 "Set point for air outlet temperature at central heating coil"; Modelica.StateGraph.Transition t1(condition=delTRooOnOff/2 < -TRooMinErrHea.y, enableTimer=true, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/PreCoolingStarter.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/PreCoolingStarter.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/PreCoolingStarter.mo" 2021-09-16 11:15:38.386780633 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/PreCoolingStarter.mo" 2021-09-16 11:18:41.238171420 +0200 @@ -1,9 +1,9 @@ within Buildings.Examples.VAVReheat.Controls; block PreCoolingStarter "Outputs true when precooling should start" extends Modelica.Blocks.Interfaces.BooleanSignalSource; - parameter Modelica.SIunits.Temperature TOutLim = 286.15 + parameter Modelica.Units.SI.Temperature TOutLim = 286.15 "Limit for activating precooling"; - parameter Modelica.SIunits.Temperature TRooSetCooOcc + parameter Modelica.Units.SI.Temperature TRooSetCooOcc "Set point for room air temperature during cooling mode"; ControlBus controlBus annotation (Placement(transformation(extent={{-72,50},{-52,70}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/RoomTemperatureSetpoint.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/RoomTemperatureSetpoint.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/RoomTemperatureSetpoint.mo" 2021-09-16 11:15:38.386780633 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/RoomTemperatureSetpoint.mo" 2021-09-16 11:18:41.218171487 +0200 @@ -2,13 +2,13 @@ block RoomTemperatureSetpoint "Set point scheduler for room temperature" extends Modelica.Blocks.Icons.Block; import Buildings.Examples.VAVReheat.Controls.OperationModes; - parameter Modelica.SIunits.Temperature THeaOn=293.15 + parameter Modelica.Units.SI.Temperature THeaOn=293.15 "Heating setpoint during on"; - parameter Modelica.SIunits.Temperature THeaOff=285.15 + parameter Modelica.Units.SI.Temperature THeaOff=285.15 "Heating setpoint during off"; - parameter Modelica.SIunits.Temperature TCooOn=297.15 + parameter Modelica.Units.SI.Temperature TCooOn=297.15 "Cooling setpoint during on"; - parameter Modelica.SIunits.Temperature TCooOff=303.15 + parameter Modelica.Units.SI.Temperature TCooOff=303.15 "Cooling setpoint during off"; ControlBus controlBus annotation (Placement(transformation(extent={{10,50},{30,70}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/RoomVAV.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/RoomVAV.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/RoomVAV.mo" 2021-09-16 11:15:38.386780633 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/RoomVAV.mo" 2021-09-16 11:18:41.190171581 +0200 @@ -9,10 +9,10 @@ annotation (Dialog(group="Cooling controller")); parameter Real kCoo=0.1 "Gain of controller" annotation (Dialog(group="Cooling controller")); - parameter Modelica.SIunits.Time TiCoo=120 "Time constant of integrator block" + parameter Modelica.Units.SI.Time TiCoo=120 "Time constant of integrator block" annotation (Dialog(group="Cooling controller", enable=cooController==Buildings.Controls.OBC.CDL.Types.SimpleController.PI or cooController==Buildings.Controls.OBC.CDL.Types.SimpleController.PID)); - parameter Modelica.SIunits.Time TdCoo=60 "Time constant of derivative block" + parameter Modelica.Units.SI.Time TdCoo=60 "Time constant of derivative block" annotation (Dialog(group="Cooling controller", enable=cooController==Buildings.Controls.OBC.CDL.Types.SimpleController.PD or cooController==Buildings.Controls.OBC.CDL.Types.SimpleController.PID)); parameter Buildings.Controls.OBC.CDL.Types.SimpleController heaController= @@ -20,10 +20,10 @@ annotation (Dialog(group="Heating controller")); parameter Real kHea=0.1 "Gain of controller" annotation (Dialog(group="Heating controller")); - parameter Modelica.SIunits.Time TiHea=120 "Time constant of integrator block" + parameter Modelica.Units.SI.Time TiHea=120 "Time constant of integrator block" annotation (Dialog(group="Heating controller", enable=heaController==Buildings.Controls.OBC.CDL.Types.SimpleController.PI or heaController==Buildings.Controls.OBC.CDL.Types.SimpleController.PID)); - parameter Modelica.SIunits.Time TdHea=60 "Time constant of derivative block" + parameter Modelica.Units.SI.Time TdHea=60 "Time constant of derivative block" annotation (Dialog(group="Heating controller", enable=heaController==Buildings.Controls.OBC.CDL.Types.SimpleController.PD or heaController==Buildings.Controls.OBC.CDL.Types.SimpleController.PID)); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/State.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/State.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/State.mo" 2021-09-16 11:15:38.386780633 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Controls/State.mo" 2021-09-16 11:18:41.154171702 +0200 @@ -1,7 +1,7 @@ within Buildings.Examples.VAVReheat.Controls; model State "Block that outputs the mode if the state is active, or zero otherwise" - extends Modelica.StateGraph.StepWithSignal; + extends Modelica.StateGraph.StepWithSignal(nIn = 1, nOut = 1); parameter OperationModes mode "Enter enumeration of mode"; Modelica.Blocks.Interfaces.IntegerOutput y "Mode signal (=0 if not active)" annotation (Placement(transformation(extent={{100,-70},{120,-50}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Guideline36.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Guideline36.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Guideline36.mo" 2021-09-16 11:15:38.386780633 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/Guideline36.mo" 2021-09-16 11:18:41.146171729 +0200 @@ -4,14 +4,14 @@ extends Modelica.Icons.Example; extends Buildings.Examples.VAVReheat.BaseClasses.PartialOpenLoop; - parameter Modelica.SIunits.VolumeFlowRate VPriSysMax_flow=m_flow_nominal/1.2 + parameter Modelica.Units.SI.VolumeFlowRate VPriSysMax_flow=m_flow_nominal/1.2 "Maximum expected system primary airflow rate at design stage"; - parameter Modelica.SIunits.VolumeFlowRate minZonPriFlo[numZon]={ + parameter Modelica.Units.SI.VolumeFlowRate minZonPriFlo[numZon]={ mCor_flow_nominal,mSou_flow_nominal,mEas_flow_nominal,mNor_flow_nominal, mWes_flow_nominal}/1.2 "Minimum expected zone primary flow rate"; - parameter Modelica.SIunits.Time samplePeriod=120 + parameter Modelica.Units.SI.Time samplePeriod=120 "Sample period of component, set to the same value as the trim and respond that process yPreSetReq"; - parameter Modelica.SIunits.PressureDifference dpDisRetMax=40 + parameter Modelica.Units.SI.PressureDifference dpDisRetMax=40 "Maximum return fan discharge static pressure setpoint"; Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Controller conVAVCor( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/ThermalZones/Floor.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/ThermalZones/Floor.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/ThermalZones/Floor.mo" 2021-09-16 11:15:38.386780633 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/ThermalZones/Floor.mo" 2021-09-16 11:18:41.006172200 +0200 @@ -8,11 +8,11 @@ parameter HeatTransfer.Types.InteriorConvection intConMod=Buildings.HeatTransfer.Types.InteriorConvection.Temperature "Convective heat transfer model for room-facing surfaces of opaque constructions"; - parameter Modelica.SIunits.Angle lat "Latitude"; + parameter Modelica.Units.SI.Angle lat "Latitude"; parameter Real winWalRat( min=0.01, max=0.99) = 0.33 "Window to wall ratio for exterior walls"; - parameter Modelica.SIunits.Length hWin = 1.5 "Height of windows"; + parameter Modelica.Units.SI.Length hWin = 1.5 "Height of windows"; parameter HeatTransfer.Data.Solids.Plywood matFur(x=0.15, nStaRef=5) "Material for furniture" annotation (Placement(transformation(extent={{140,460},{160,480}}))); @@ -77,7 +77,7 @@ annotation (Placement(transformation(extent={{240,460},{260,480}}))); parameter Real kIntNor(min=0, max=1) = 1 "Gain factor to scale internal heat gain in north zone"; - constant Modelica.SIunits.Height hRoo=2.74 "Room height"; + constant Modelica.Units.SI.Height hRoo=2.74 "Room height"; parameter Boolean sampleModel = false "Set to true to time-sample the model, which can give shorter simulation time if there is already time sampling in the system model" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/ThermalZones/RoomLeakage.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/ThermalZones/RoomLeakage.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/ThermalZones/RoomLeakage.mo" 2021-09-16 11:15:38.386780633 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/ThermalZones/RoomLeakage.mo" 2021-09-16 11:18:40.582173626 +0200 @@ -3,7 +3,7 @@ extends Buildings.BaseClasses.BaseIcon; replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium in the component" annotation (choicesAllMatching=true); - parameter Modelica.SIunits.Volume VRoo "Room volume"; + parameter Modelica.Units.SI.Volume VRoo "Room volume"; parameter Boolean use_windPressure=false "Set to true to enable wind pressure" annotation(Evaluate=true); @@ -32,8 +32,8 @@ "Air change per hour due to infiltration" annotation (Placement(transformation(extent={{12,30},{32,50}}))); parameter Real s "Side ratio, s=length of this wall/length of adjacent wall"; - parameter Modelica.SIunits.Angle azi "Surface azimuth (South:0, West:pi/2)"; + parameter Modelica.Units.SI.Angle azi "Surface azimuth (South:0, West:pi/2)"; equation connect(res.port_b, port_b) annotation (Line(points={{40,6.10623e-16},{55, 6.10623e-16},{55,1.16573e-15},{70,1.16573e-15},{70,5.55112e-16},{100, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/ThermalZones/VAVBranch.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/ThermalZones/VAVBranch.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/ThermalZones/VAVBranch.mo" 2021-09-16 11:15:38.386780633 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Examples/VAVReheat/ThermalZones/VAVBranch.mo" 2021-09-16 11:18:40.562173693 +0200 @@ -9,9 +9,9 @@ parameter Boolean allowFlowReversal=true "= false to simplify equations, assuming, but not enforcing, no flow reversal"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Mass flow rate of this thermal zone"; - parameter Modelica.SIunits.Volume VRoo "Room volume"; + parameter Modelica.Units.SI.Volume VRoo "Room volume"; Buildings.Fluid.Actuators.Dampers.PressureIndependent vav( redeclare package Medium = MediumA, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Examples/BaseClasses/HeatingCoolingHotWater3Clusters.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Examples/BaseClasses/HeatingCoolingHotWater3Clusters.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Examples/BaseClasses/HeatingCoolingHotWater3Clusters.mo" 2021-09-16 11:15:38.386780633 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Examples/BaseClasses/HeatingCoolingHotWater3Clusters.mo" 2021-09-16 11:18:40.462174029 +0200 @@ -3,14 +3,14 @@ "Load models for Buildings.Experimental.DistrictHeatingCooling.Examples.HeatingCoolingHotWater3Clusters" package Medium = Buildings.Media.Water "Fluid in the pipes"; - parameter Modelica.SIunits.Temperature TChiSup_nominal = 273.15 + 16 + parameter Modelica.Units.SI.Temperature TChiSup_nominal = 273.15 + 16 "Chilled water leaving temperature at the evaporator" annotation (Dialog(group="Nominal conditions")); - parameter Modelica.SIunits.Temperature THeaSup_nominal = 273.15+30 + parameter Modelica.Units.SI.Temperature THeaSup_nominal = 273.15+30 "Supply temperature space heating system at TOut_nominal" annotation (Dialog(group="Nominal conditions")); - parameter Modelica.SIunits.Temperature THeaRet_nominal = 273.15+25 + parameter Modelica.Units.SI.Temperature THeaRet_nominal = 273.15+25 "Return temperature space heating system at TOut_nominal" annotation (Dialog(group="Nominal conditions")); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Examples/BaseClasses/SubStationBoundaryCondition.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Examples/BaseClasses/SubStationBoundaryCondition.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Examples/BaseClasses/SubStationBoundaryCondition.mo" 2021-09-16 11:15:38.386780633 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Examples/BaseClasses/SubStationBoundaryCondition.mo" 2021-09-16 11:18:40.382174298 +0200 @@ -4,7 +4,7 @@ extends Buildings.BaseClasses.BaseIcon; replaceable package Medium = Modelica.Media.Interfaces.PartialMedium annotation (choicesAllMatching=true); - parameter Modelica.SIunits.TemperatureDifference dTApp(min=0) = 2 + parameter Modelica.Units.SI.TemperatureDifference dTApp(min=0) = 2 "Approach temperature"; parameter Boolean warmSide "Set to true if these are the boundary conditions for the warm side inlet"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Examples/HeatingCoolingHotWater3Clusters.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Examples/HeatingCoolingHotWater3Clusters.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Examples/HeatingCoolingHotWater3Clusters.mo" 2021-09-16 11:15:38.386780633 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Examples/HeatingCoolingHotWater3Clusters.mo" 2021-09-16 11:18:40.366174352 +0200 @@ -7,18 +7,18 @@ extends Modelica.Icons.Example; package Medium = Buildings.Media.Water "Fluid in the pipes"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 2.5E6 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 2.5E6 "Nominal heat flow rate, positive for heating, negative for cooling"; - parameter Modelica.SIunits.Temperature TSetHeaLea = 273.15+12 + parameter Modelica.Units.SI.Temperature TSetHeaLea = 273.15+12 "Set point for leaving fluid temperature warm supply" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.Temperature TSetCooLea = 273.15+16 + parameter Modelica.Units.SI.Temperature TSetCooLea = 273.15+16 "Set point for leaving fluid temperature cold supply" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.TemperatureDifference dT_nominal( + parameter Modelica.Units.SI.TemperatureDifference dT_nominal( min=0.5, displayUnit="K") = TSetCooLea-TSetHeaLea "Temperature difference between warm and cold pipe" @@ -27,7 +27,7 @@ parameter Real R_nominal(unit="Pa/m") = 100 "Pressure drop per meter at nominal flow rate"; - final parameter Modelica.SIunits.MassFlowRate m_flow_nominal = Q_flow_nominal/4200/dT_nominal + final parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = Q_flow_nominal/4200/dT_nominal "Nominal mass flow rate"; Plants.HeatingCoolingCarnot_T pla( redeclare package Medium = Medium, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Examples/IdealSystem3Clusters.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Examples/IdealSystem3Clusters.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Examples/IdealSystem3Clusters.mo" 2021-09-16 11:15:38.386780633 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Examples/IdealSystem3Clusters.mo" 2021-09-16 11:18:40.242174769 +0200 @@ -4,24 +4,24 @@ extends Modelica.Icons.Example; package Medium = Buildings.Media.Water "Fluid in the pipes"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 3*2E6 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 3*2E6 "Nominal heat flow rate, positive for heating, negative for cooling"; - parameter Modelica.SIunits.Temperature TSetHeaLea = 273.15+8 + parameter Modelica.Units.SI.Temperature TSetHeaLea = 273.15+8 "Set point for leaving fluid temperature warm supply" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.Temperature TSetCooLea = 273.15+14 + parameter Modelica.Units.SI.Temperature TSetCooLea = 273.15+14 "Set point for leaving fluid temperature cold supply" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.TemperatureDifference dT_nominal( + parameter Modelica.Units.SI.TemperatureDifference dT_nominal( min=0.5, displayUnit="K") = TSetCooLea-TSetHeaLea "Temperature difference between warm and cold pipe" annotation(Dialog(group="Design parameter")); - final parameter Modelica.SIunits.MassFlowRate m_flow_nominal = Q_flow_nominal/4200/dT_nominal + final parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = Q_flow_nominal/4200/dT_nominal "Nominal mass flow rate"; Plants.Ideal_T pla( redeclare package Medium = Medium, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Plants/HeatingCoolingCarnot_T.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Plants/HeatingCoolingCarnot_T.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Plants/HeatingCoolingCarnot_T.mo" 2021-09-16 11:15:38.386780633 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Plants/HeatingCoolingCarnot_T.mo" 2021-09-16 11:18:40.134175132 +0200 @@ -6,12 +6,12 @@ final allowFlowReversal = true, final dp(start=0)); - parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=-10 + parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=-10 "Temperature difference evaporator outlet-inlet of heat pump"; - parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=10 + parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=10 "Temperature difference condenser outlet-inlet of chiller"; - parameter Modelica.SIunits.Pressure dp_nominal(displayUnit="Pa")=30000 + parameter Modelica.Units.SI.Pressure dp_nominal(displayUnit="Pa")=30000 "Pressure difference at nominal flow rate" annotation(Dialog(group="Design parameter")); @@ -54,7 +54,7 @@ Buildings.Media.Air "Medium model for the heat sink" annotation (choicesAllMatching = true); - parameter Modelica.SIunits.TemperatureDifference dTSin = 2 + parameter Modelica.Units.SI.TemperatureDifference dTSin = 2 "Temperature difference over heat source or sink"; final parameter Medium.ThermodynamicState staSin_default = Medium.setState_pTX( @@ -62,7 +62,7 @@ p=MediumSin.p_default, X=MediumSin.X_default[1:MediumSin.nXi]) "Medium state at default properties"; - final parameter Modelica.SIunits.SpecificHeatCapacity cpSin_default= + final parameter Modelica.Units.SI.SpecificHeatCapacity cpSin_default= Medium.specificHeatCapacityCp(staSin_default) "Specific heat capacity of the fluid"; @@ -70,7 +70,7 @@ T=Medium.T_default, p=Medium.p_default, X=Medium.X_default[1:Medium.nXi]) "Medium state at default properties"; - final parameter Modelica.SIunits.SpecificHeatCapacity cp_default= + final parameter Modelica.Units.SI.SpecificHeatCapacity cp_default= Medium.specificHeatCapacityCp(sta_default) "Specific heat capacity of the fluid"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Plants/Ideal_T.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Plants/Ideal_T.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Plants/Ideal_T.mo" 2021-09-16 11:15:38.386780633 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Plants/Ideal_T.mo" 2021-09-16 11:18:40.078175321 +0200 @@ -6,7 +6,7 @@ final allowFlowReversal = true, final dp(start=0)); - parameter Modelica.SIunits.Pressure dp_nominal(displayUnit="Pa")=30000 + parameter Modelica.Units.SI.Pressure dp_nominal(displayUnit="Pa")=30000 "Pressure difference at nominal flow rate" annotation(Dialog(group="Design parameter")); @@ -26,7 +26,7 @@ T=Medium.T_default, p=Medium.p_default, X=Medium.X_default[1:Medium.nXi]) "Medium state at default properties"; - final parameter Modelica.SIunits.SpecificHeatCapacity cp_default= + final parameter Modelica.Units.SI.SpecificHeatCapacity cp_default= Medium.specificHeatCapacityCp(sta_default) "Specific heat capacity of the fluid"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Plants/LakeWaterHeatExchanger_T.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Plants/LakeWaterHeatExchanger_T.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Plants/LakeWaterHeatExchanger_T.mo" 2021-09-16 11:15:38.386780633 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Plants/LakeWaterHeatExchanger_T.mo" 2021-09-16 11:18:40.050175415 +0200 @@ -14,21 +14,21 @@ parameter Boolean disableHeatExchanger = false "Set to true to disable the heat exchanger"; - parameter Modelica.SIunits.TemperatureDifference TApp( + parameter Modelica.Units.SI.TemperatureDifference TApp( min=0, displayUnit="K") = 0.5 "Approach temperature difference"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate" annotation(Dialog(group = "Nominal condition")); - parameter Modelica.SIunits.PressureDifference dpValve_nominal( + parameter Modelica.Units.SI.PressureDifference dpValve_nominal( displayUnit="Pa", min=0) = 1000 "Nominal pressure drop of fully open valve" annotation(Dialog(group="Nominal condition")); - parameter Modelica.SIunits.PressureDifference dpHex_nominal( + parameter Modelica.Units.SI.PressureDifference dpHex_nominal( displayUnit="Pa", min=0) "Pressure drop of heat exchanger pipe and other resistances in the heat exchanger flow leg that are in series with the valve" @@ -222,13 +222,12 @@ {50,76},{50,72}}, color={0,0,127})); protected model Controller "Controller for bay water heat exchanger" - parameter Modelica.SIunits.MassFlowRate m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate" annotation(Dialog(group = "Nominal condition")); Modelica.Blocks.Nonlinear.Limiter limTem( uMax=1, uMin=0, - limitsAtInit=false, strict=true) "Signal limiter for switching valve" annotation (Placement(transformation(extent={{20,60},{40,80}}))); @@ -254,7 +253,6 @@ Modelica.Blocks.Nonlinear.Limiter limFlo( uMax=1, uMin=0, - limitsAtInit=false, strict=true) "Signal limiter for switching valve" annotation (Placement(transformation(extent={{20,120},{40,140}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Plants/Validation/LakeWaterHeatExchanger_T_Heating.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Plants/Validation/LakeWaterHeatExchanger_T_Heating.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Plants/Validation/LakeWaterHeatExchanger_T_Heating.mo" 2021-09-16 11:15:38.386780633 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Plants/Validation/LakeWaterHeatExchanger_T_Heating.mo" 2021-09-16 11:18:39.934175805 +0200 @@ -4,7 +4,7 @@ extends Modelica.Icons.Example; package Medium = Buildings.Media.Water "Fluid in the pipes"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 100 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 100 "Nominal mass flow rate"; LakeWaterHeatExchanger_T hex(redeclare package Medium = Medium, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Plants/Validation/Plant_Carnot_T_ClosedLoop.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Plants/Validation/Plant_Carnot_T_ClosedLoop.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Plants/Validation/Plant_Carnot_T_ClosedLoop.mo" 2021-09-16 11:15:38.386780633 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Plants/Validation/Plant_Carnot_T_ClosedLoop.mo" 2021-09-16 11:18:39.906175899 +0200 @@ -4,28 +4,28 @@ extends Modelica.Icons.Example; package Medium = Buildings.Media.Water "Fluid in the pipes"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 10E3 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 10E3 "Nominal heat flow rate, positive for heating, negative for cooling"; - parameter Modelica.SIunits.Temperature TSetHeaLea = 273.15+8 + parameter Modelica.Units.SI.Temperature TSetHeaLea = 273.15+8 "Set point for leaving fluid temperature warm supply" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.Temperature TSetCooLea = 273.15+14 + parameter Modelica.Units.SI.Temperature TSetCooLea = 273.15+14 "Set point for leaving fluid temperature cold supply" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.Pressure dp_nominal(displayUnit="Pa")=30000 + parameter Modelica.Units.SI.Pressure dp_nominal(displayUnit="Pa")=30000 "Pressure difference at nominal flow rate" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.TemperatureDifference dT_nominal( + parameter Modelica.Units.SI.TemperatureDifference dT_nominal( min=0.5, displayUnit="K") = TSetCooLea-TSetHeaLea "Temperature difference between warm and cold pipe" annotation(Dialog(group="Design parameter")); - final parameter Modelica.SIunits.MassFlowRate m_flow_nominal = Q_flow_nominal/4200/dT_nominal + final parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = Q_flow_nominal/4200/dT_nominal "Nominal mass flow rate"; HeatingCoolingCarnot_T pla( redeclare package Medium = Medium, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Plants/Validation/Plant_T.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Plants/Validation/Plant_T.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Plants/Validation/Plant_T.mo" 2021-09-16 11:15:38.386780633 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Plants/Validation/Plant_T.mo" 2021-09-16 11:18:39.710176558 +0200 @@ -3,28 +3,28 @@ extends Modelica.Icons.Example; package Medium = Buildings.Media.Water "Fluid in the pipes"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 1E6 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 1E6 "Nominal heat flow rate, positive for heating, negative for cooling"; - parameter Modelica.SIunits.Temperature TSetHeaLea = 273.15+8 + parameter Modelica.Units.SI.Temperature TSetHeaLea = 273.15+8 "Set point for leaving fluid temperature warm supply" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.Temperature TSetCooLea = 273.15+14 + parameter Modelica.Units.SI.Temperature TSetCooLea = 273.15+14 "Set point for leaving fluid temperature cold supply" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.Pressure dp_nominal(displayUnit="Pa")=30000 + parameter Modelica.Units.SI.Pressure dp_nominal(displayUnit="Pa")=30000 "Pressure difference at nominal flow rate" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.TemperatureDifference dT_nominal( + parameter Modelica.Units.SI.TemperatureDifference dT_nominal( min=0.5, displayUnit="K") = TSetCooLea-TSetHeaLea "Temperature difference between warm and cold pipe" annotation(Dialog(group="Design parameter")); - final parameter Modelica.SIunits.MassFlowRate m_flow_nominal = Q_flow_nominal/4200/dT_nominal + final parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = Q_flow_nominal/4200/dT_nominal "Nominal mass flow rate"; Ideal_T pla( redeclare package Medium = Medium, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Plants/Validation/Plant_T_ClosedLoop.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Plants/Validation/Plant_T_ClosedLoop.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Plants/Validation/Plant_T_ClosedLoop.mo" 2021-09-16 11:15:38.386780633 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Plants/Validation/Plant_T_ClosedLoop.mo" 2021-09-16 11:18:39.690176625 +0200 @@ -4,28 +4,28 @@ extends Modelica.Icons.Example; package Medium = Buildings.Media.Water "Fluid in the pipes"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 10E3 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 10E3 "Nominal heat flow rate, positive for heating, negative for cooling"; - parameter Modelica.SIunits.Temperature TSetHeaLea = 273.15+8 + parameter Modelica.Units.SI.Temperature TSetHeaLea = 273.15+8 "Set point for leaving fluid temperature warm supply" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.Temperature TSetCooLea = 273.15+14 + parameter Modelica.Units.SI.Temperature TSetCooLea = 273.15+14 "Set point for leaving fluid temperature cold supply" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.Pressure dp_nominal(displayUnit="Pa")=30000 + parameter Modelica.Units.SI.Pressure dp_nominal(displayUnit="Pa")=30000 "Pressure difference at nominal flow rate" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.TemperatureDifference dT_nominal( + parameter Modelica.Units.SI.TemperatureDifference dT_nominal( min=0.5, displayUnit="K") = TSetCooLea-TSetHeaLea "Temperature difference between warm and cold pipe" annotation(Dialog(group="Design parameter")); - final parameter Modelica.SIunits.MassFlowRate m_flow_nominal = Q_flow_nominal/4200/dT_nominal + final parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = Q_flow_nominal/4200/dT_nominal "Nominal mass flow rate"; Ideal_T pla( redeclare package Medium = Medium, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/SubStations/BaseClasses/HeatingOrCooling.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/SubStations/BaseClasses/HeatingOrCooling.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/SubStations/BaseClasses/HeatingOrCooling.mo" 2021-09-16 11:15:38.386780633 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/SubStations/BaseClasses/HeatingOrCooling.mo" 2021-09-16 11:18:39.646176773 +0200 @@ -5,7 +5,7 @@ final dp(start=0), final allowFlowReversal=false); - parameter Modelica.SIunits.Pressure dp_nominal(displayUnit="Pa")=30000 + parameter Modelica.Units.SI.Pressure dp_nominal(displayUnit="Pa")=30000 "Pressure difference at nominal flow rate" annotation(Dialog(group="Design parameter")); @@ -16,7 +16,7 @@ parameter Real deltaM=0.1 "Fraction of nominal flow rate where flow transitions to laminar" annotation (Dialog(tab="Flow resistance")); - parameter Modelica.SIunits.Time tau=30 + parameter Modelica.Units.SI.Time tau=30 "Time constant at nominal flow (if energyDynamics <> SteadyState)" annotation (Dialog(tab="Dynamics")); parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState @@ -31,7 +31,7 @@ T=Medium.T_default, p=Medium.p_default, X=Medium.X_default[1:Medium.nXi]) "Medium state at default properties"; - final parameter Modelica.SIunits.SpecificHeatCapacity cp_default= + final parameter Modelica.Units.SI.SpecificHeatCapacity cp_default= Medium.specificHeatCapacityCp(sta_default) "Specific heat capacity of the fluid"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/SubStations/Cooling.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/SubStations/Cooling.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/SubStations/Cooling.mo" 2021-09-16 11:15:38.386780633 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/SubStations/Cooling.mo" 2021-09-16 11:18:39.622176853 +0200 @@ -4,13 +4,13 @@ Buildings.Experimental.DistrictHeatingCooling.SubStations.BaseClasses.HeatingOrCooling( final m_flow_nominal = -Q_flow_nominal/cp_default/dTHex, mPum_flow(final k=-1/(cp_default*dTHex))); - parameter Modelica.SIunits.TemperatureDifference dTHex( + parameter Modelica.Units.SI.TemperatureDifference dTHex( min=0.5, displayUnit="K") = 4 "Temperature difference over the heat exchanger (positive)" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal(max=0) + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal(max=0) "Nominal heat flow rate added to medium (Q_flow_nominal <= 0)"; Modelica.Blocks.Interfaces.RealInput Q_flow( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/SubStations/Heating.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/SubStations/Heating.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/SubStations/Heating.mo" 2021-09-16 11:15:38.386780633 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/SubStations/Heating.mo" 2021-09-16 11:18:39.610176894 +0200 @@ -5,13 +5,13 @@ final m_flow_nominal = -Q_flow_nominal/cp_default/dTHex, mPum_flow(final k=-1/(cp_default*dTHex))); - parameter Modelica.SIunits.TemperatureDifference dTHex( + parameter Modelica.Units.SI.TemperatureDifference dTHex( max=-0.5, displayUnit="K") = -4 "Temperature difference over the heat exchanger (negative)" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal( + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal( min=0) "Nominal heat flow rate added to medium (Q_flow_nominal > 0)"; Modelica.Blocks.Interfaces.RealInput Q_flow( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/SubStations/VaporCompression/BaseClasses/Validation/GetPeakLoad.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/SubStations/VaporCompression/BaseClasses/Validation/GetPeakLoad.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/SubStations/VaporCompression/BaseClasses/Validation/GetPeakLoad.mo" 2021-09-16 11:15:38.386780633 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/SubStations/VaporCompression/BaseClasses/Validation/GetPeakLoad.mo" 2021-09-16 11:18:39.526177176 +0200 @@ -1,19 +1,19 @@ within Buildings.Experimental.DistrictHeatingCooling.SubStations.VaporCompression.BaseClasses.Validation; model GetPeakLoad "Model that validates the getPeakLoad function" extends Modelica.Icons.Example; - parameter Modelica.SIunits.HeatFlowRate QCoo_flow= + parameter Modelica.Units.SI.HeatFlowRate QCoo_flow= Buildings.Experimental.DistrictHeatingCooling.SubStations.VaporCompression.BaseClasses.getPeakLoad( string="#Peak space cooling load", filNam=Modelica.Utilities.Files.loadResource( "modelica://Buildings/Resources/Data/Experimental/DistrictHeatingCooling/SubStations/VaporCompression/RefBldgLargeOfficeNew2004_7.1_5.0_3C_USA_CA_SAN_FRANCISCO.mos")) "Peak heat flow rate"; - parameter Modelica.SIunits.HeatFlowRate QHea_flow= + parameter Modelica.Units.SI.HeatFlowRate QHea_flow= Buildings.Experimental.DistrictHeatingCooling.SubStations.VaporCompression.BaseClasses.getPeakLoad( string="#Peak space heating load", filNam=Modelica.Utilities.Files.loadResource( "modelica://Buildings/Resources/Data/Experimental/DistrictHeatingCooling/SubStations/VaporCompression/RefBldgLargeOfficeNew2004_7.1_5.0_3C_USA_CA_SAN_FRANCISCO.mos")) "Peak heat flow rate"; - parameter Modelica.SIunits.HeatFlowRate QWatHea_flow= + parameter Modelica.Units.SI.HeatFlowRate QWatHea_flow= Buildings.Experimental.DistrictHeatingCooling.SubStations.VaporCompression.BaseClasses.getPeakLoad( string="#Peak water heating load", filNam=Modelica.Utilities.Files.loadResource( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/SubStations/VaporCompression/HeatingCoolingHotwaterTimeSeries_dT.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/SubStations/VaporCompression/HeatingCoolingHotwaterTimeSeries_dT.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/SubStations/VaporCompression/HeatingCoolingHotwaterTimeSeries_dT.mo" 2021-09-16 11:15:38.386780633 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/SubStations/VaporCompression/HeatingCoolingHotwaterTimeSeries_dT.mo" 2021-09-16 11:18:39.498177271 +0200 @@ -10,24 +10,24 @@ parameter Real gaiHea(min=0) = gaiCoo "Gain to scale heating load"; parameter Real gaiHotWat(min=0) = gaiHea "Gain to scale hot water load"; - parameter Modelica.SIunits.Temperature TColMin = 273.15+8 + parameter Modelica.Units.SI.Temperature TColMin = 273.15+8 "Minimum temperature of district cold water supply"; - parameter Modelica.SIunits.Temperature THotMax = 273.15+18 + parameter Modelica.Units.SI.Temperature THotMax = 273.15+18 "Maximum temperature of district hot water supply"; - parameter Modelica.SIunits.TemperatureDifference dTCooCon_nominal( + parameter Modelica.Units.SI.TemperatureDifference dTCooCon_nominal( min=0.5, displayUnit="K") = 4 "Temperature difference condenser of the chiller (positive)" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.TemperatureDifference dTHeaEva_nominal( + parameter Modelica.Units.SI.TemperatureDifference dTHeaEva_nominal( max=-0.5, displayUnit="K") = -4 "Temperature difference evaporator of the heat pump for space heating (negative)" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.TemperatureDifference dTCooEva_nominal=-4 + parameter Modelica.Units.SI.TemperatureDifference dTCooEva_nominal=-4 "Temperature difference evaporator of the chiller"; parameter String filNam "Name of data file with heating and cooling load" @@ -35,53 +35,53 @@ loadSelector(filter="Load file (*.mos)", caption="Select load file"))); - parameter Modelica.SIunits.HeatFlowRate QCoo_flow_nominal(max=-Modelica.Constants.eps)= gaiCoo * + parameter Modelica.Units.SI.HeatFlowRate QCoo_flow_nominal(max=-Modelica.Constants.eps)= gaiCoo * Buildings.Experimental.DistrictHeatingCooling.SubStations.VaporCompression.BaseClasses.getPeakLoad( string="#Peak space cooling load", filNam=filNam) "Design heat flow rate" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.HeatFlowRate QHea_flow_nominal(min=Modelica.Constants.eps)= gaiHea * + parameter Modelica.Units.SI.HeatFlowRate QHea_flow_nominal(min=Modelica.Constants.eps)= gaiHea * Buildings.Experimental.DistrictHeatingCooling.SubStations.VaporCompression.BaseClasses.getPeakLoad( string="#Peak space heating load", filNam=filNam) "Design heat flow rate" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.HeatFlowRate QHotWat_flow_nominal(min=Modelica.Constants.eps)= gaiHotWat * + parameter Modelica.Units.SI.HeatFlowRate QHotWat_flow_nominal(min=Modelica.Constants.eps)= gaiHotWat * Buildings.Experimental.DistrictHeatingCooling.SubStations.VaporCompression.BaseClasses.getPeakLoad( string="#Peak water heating load", filNam=filNam) "Design heat flow rate for domestic hot water" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.Temperature TChiSup_nominal = 273.15 + 16 + parameter Modelica.Units.SI.Temperature TChiSup_nominal = 273.15 + 16 "Chilled water leaving temperature at the evaporator" annotation (Dialog(group="Nominal conditions")); - parameter Modelica.SIunits.Temperature THeaSup_nominal = 273.15+30 + parameter Modelica.Units.SI.Temperature THeaSup_nominal = 273.15+30 "Supply temperature space heating system at TOut_nominal" annotation (Dialog(group="Nominal conditions")); - parameter Modelica.SIunits.Temperature THeaRet_nominal = 273.15+25 + parameter Modelica.Units.SI.Temperature THeaRet_nominal = 273.15+25 "Return temperature space heating system at TOut_nominal" annotation (Dialog(group="Nominal conditions")); - parameter Modelica.SIunits.Temperature TOut_nominal + parameter Modelica.Units.SI.Temperature TOut_nominal "Outside design temperature for heating" annotation (Dialog(group="Nominal conditions")); - parameter Modelica.SIunits.TemperatureDifference dTHotWatCon_nominal(min=0)=60-40 + parameter Modelica.Units.SI.TemperatureDifference dTHotWatCon_nominal(min=0)=60-40 "Temperature difference condenser of hot water heat pump"; - parameter Modelica.SIunits.Pressure dp_nominal(displayUnit="Pa")=30000 + parameter Modelica.Units.SI.Pressure dp_nominal(displayUnit="Pa")=30000 "Pressure difference at nominal flow rate (for each flow leg)" annotation(Dialog(group="Design parameter")); - final parameter Modelica.SIunits.MassFlowRate mCooCon_flow_nominal(min=0)= + final parameter Modelica.Units.SI.MassFlowRate mCooCon_flow_nominal(min=0)= -QCoo_flow_nominal/cp_default/dTCooCon_nominal "Design mass flow rate for cooling at district side" annotation(Dialog(group="Design parameter")); - final parameter Modelica.SIunits.MassFlowRate mHeaEva_flow_nominal(min=0)= + final parameter Modelica.Units.SI.MassFlowRate mHeaEva_flow_nominal(min=0)= -QHea_flow_nominal/cp_default/dTHeaEva_nominal "Design mass flow rate for space heating at district side" annotation(Dialog(group="Design parameter")); - final parameter Modelica.SIunits.MassFlowRate mHotWatEva_flow_nominal(min=0)= + final parameter Modelica.Units.SI.MassFlowRate mHotWatEva_flow_nominal(min=0)= QHotWat_flow_nominal/cp_default/dTHotWatCon_nominal "Design mass flow rate for domestic hot water at district side" annotation(Dialog(group="Design parameter")); @@ -175,7 +175,7 @@ noEvent(actualStream(chi.port_b1.Xi_outflow))) if show_T "Medium properties in port_b1 of chiller outlet"; - constant Modelica.SIunits.SpecificHeatCapacity cp_default=4184 + constant Modelica.Units.SI.SpecificHeatCapacity cp_default=4184 "Specific heat capacity of the fluid"; Buildings.Fluid.HeatPumps.Carnot_TCon heaPum( @@ -265,7 +265,7 @@ T=Medium.T_default, p=Medium.p_default, X=Medium.X_default[1:Medium.nXi]) "Medium state at default properties"; - final parameter Modelica.SIunits.SpecificHeatCapacity cp_default_check= + final parameter Modelica.Units.SI.SpecificHeatCapacity cp_default_check= Medium.specificHeatCapacityCp(sta_default) "Specific heat capacity of the fluid"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Validation/HeatingCoolingHotWaterSmall.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Validation/HeatingCoolingHotWaterSmall.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Validation/HeatingCoolingHotWaterSmall.mo" 2021-09-16 11:15:38.386780633 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Validation/HeatingCoolingHotWaterSmall.mo" 2021-09-16 11:18:39.282177997 +0200 @@ -4,18 +4,18 @@ extends Modelica.Icons.Example; package Medium = Buildings.Media.Water "Fluid in the pipes"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 6E5 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 6E5 "Nominal heat flow rate, positive for heating, negative for cooling"; - parameter Modelica.SIunits.Temperature TSetHeaLea = 273.15+12 + parameter Modelica.Units.SI.Temperature TSetHeaLea = 273.15+12 "Set point for leaving fluid temperature warm supply" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.Temperature TSetCooLea = 273.15+16 + parameter Modelica.Units.SI.Temperature TSetCooLea = 273.15+16 "Set point for leaving fluid temperature cold supply" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.TemperatureDifference dT_nominal( + parameter Modelica.Units.SI.TemperatureDifference dT_nominal( min=0.5, displayUnit="K") = TSetCooLea-TSetHeaLea "Temperature difference between warm and cold pipe" @@ -24,7 +24,7 @@ parameter Real R_nominal(unit="Pa/m") = 100 "Pressure drop per meter at nominal flow rate"; - final parameter Modelica.SIunits.MassFlowRate m_flow_nominal = Q_flow_nominal/4200/dT_nominal + final parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = Q_flow_nominal/4200/dT_nominal "Nominal mass flow rate"; Plants.HeatingCoolingCarnot_T pla( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Validation/IdealSmallSystem.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Validation/IdealSmallSystem.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Validation/IdealSmallSystem.mo" 2021-09-16 11:15:38.386780633 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Experimental/DistrictHeatingCooling/Validation/IdealSmallSystem.mo" 2021-09-16 11:18:39.242178131 +0200 @@ -3,24 +3,24 @@ extends Modelica.Icons.Example; package Medium = Buildings.Media.Water "Fluid in the pipes"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 0.5E6 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 0.5E6 "Nominal heat flow rate, positive for heating, negative for cooling"; - parameter Modelica.SIunits.Temperature TSetHeaLea = 273.15+8 + parameter Modelica.Units.SI.Temperature TSetHeaLea = 273.15+8 "Set point for leaving fluid temperature warm supply" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.Temperature TSetCooLea = 273.15+14 + parameter Modelica.Units.SI.Temperature TSetCooLea = 273.15+14 "Set point for leaving fluid temperature cold supply" annotation(Dialog(group="Design parameter")); - parameter Modelica.SIunits.TemperatureDifference dT_nominal( + parameter Modelica.Units.SI.TemperatureDifference dT_nominal( min=0.5, displayUnit="K") = TSetCooLea-TSetHeaLea "Temperature difference between warm and cold pipe" annotation(Dialog(group="Design parameter")); - final parameter Modelica.SIunits.MassFlowRate m_flow_nominal = Q_flow_nominal/4200/dT_nominal + final parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = Q_flow_nominal/4200/dT_nominal "Nominal mass flow rate"; parameter Real R_nominal(unit="Pa/m") = 100 diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/BaseClasses/ActuatorSignal.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/BaseClasses/ActuatorSignal.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/BaseClasses/ActuatorSignal.mo" 2021-09-16 11:15:38.386780633 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/BaseClasses/ActuatorSignal.mo" 2021-09-16 11:18:39.194178293 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/BaseClasses/PartialDamperExponential.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/BaseClasses/PartialDamperExponential.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/BaseClasses/PartialDamperExponential.mo" 2021-09-16 11:15:38.386780633 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/BaseClasses/PartialDamperExponential.mo" 2021-09-16 11:18:39.154178427 +0200 @@ -6,10 +6,10 @@ final m_flow_turbulent=if use_deltaM then deltaM * m_flow_nominal else eta_default*ReC*sqrt(A)*facRouDuc); extends Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo" 2021-09-16 11:15:38.386780633 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo" 2021-09-16 11:18:39.118178548 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo" 2021-09-16 11:15:38.386780633 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo" 2021-09-16 11:18:39.082178669 +0200 @@ -10,7 +10,7 @@ rhoStd=Medium.density_pTX(101325, 273.15+4, Medium.X_default)); extends Buildings.Fluid.Actuators.BaseClasses.ActuatorSignal; - parameter Modelica.SIunits.PressureDifference dpFixed_nominal(displayUnit="Pa", min=0) = 0 + parameter Modelica.Units.SI.PressureDifference dpFixed_nominal(displayUnit="Pa", min=0) = 0 "Pressure drop of pipe and other resistances that are in series" annotation(Dialog(group = "Nominal condition")); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/BaseClasses/ValveParameters.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/BaseClasses/ValveParameters.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/BaseClasses/ValveParameters.mo" 2021-09-16 11:15:38.386780633 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/BaseClasses/ValveParameters.mo" 2021-09-16 11:18:38.902179275 +0200 @@ -14,7 +14,7 @@ "Cv (US) flow coefficient [USG/min/(psi)^(1/2)]" annotation(Dialog(group = "Flow Coefficient", enable = (CvData==Buildings.Fluid.Types.CvTypes.Cv))); - parameter Modelica.SIunits.Area Av( + parameter Modelica.Units.SI.Area Av( fixed= if CvData==Buildings.Fluid.Types.CvTypes.Av then true else false) "Av (metric) flow coefficient" annotation(Dialog(group = "Flow Coefficient", @@ -23,10 +23,11 @@ parameter Real deltaM = 0.02 "Fraction of nominal flow rate where linearization starts, if y=1" annotation(Dialog(group="Pressure-flow linearization")); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal + + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate" annotation(Dialog(group = "Nominal condition")); - parameter Modelica.SIunits.PressureDifference dpValve_nominal( + parameter Modelica.Units.SI.PressureDifference dpValve_nominal( displayUnit="Pa", min=0, fixed= if CvData==Buildings.Fluid.Types.CvTypes.OpPoint then true else false) @@ -34,10 +35,9 @@ annotation(Dialog(group="Nominal condition", enable = (CvData==Buildings.Fluid.Types.CvTypes.OpPoint))); - parameter Modelica.SIunits.Density rhoStd + parameter Modelica.Units.SI.Density rhoStd "Inlet density for which valve coefficients are defined" annotation(Dialog(group="Nominal condition", tab="Advanced")); - protected parameter Real Kv_SI( min=0, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Dampers/MixingBox.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Dampers/MixingBox.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Dampers/MixingBox.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Dampers/MixingBox.mo" 2021-09-16 11:18:38.754179772 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Dampers/MixingBoxMinimumFlow.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Dampers/MixingBoxMinimumFlow.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Dampers/MixingBoxMinimumFlow.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Dampers/MixingBoxMinimumFlow.mo" 2021-09-16 11:18:38.706179934 +0200 @@ -4,14 +4,14 @@ extends Buildings.Fluid.Actuators.Dampers.MixingBox; import Modelica.Constants; - parameter Modelica.SIunits.MassFlowRate mOutMin_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mOutMin_flow_nominal "Mass flow rate minimum outside air damper" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.PressureDifference dpDamOutMin_nominal( + parameter Modelica.Units.SI.PressureDifference dpDamOutMin_nominal( min=0, displayUnit="Pa") "Pressure drop of damper in minimum outside air leg" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.PressureDifference dpFixOutMin_nominal( + parameter Modelica.Units.SI.PressureDifference dpFixOutMin_nominal( min=0, displayUnit="Pa") = 0 "Pressure drop of duct and other resistances in minimum outside air leg" annotation (Dialog(group="Nominal condition")); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Dampers/PressureIndependent.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Dampers/PressureIndependent.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Dampers/PressureIndependent.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Dampers/PressureIndependent.mo" 2021-09-16 11:18:38.670180055 +0200 @@ -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= Buildings.Utilities.Math.Functions.smoothMax(dp, -dp, dp_small) "Regularized absolute value of pressure drop"; Real mSqu_flow = Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Dampers/Validation/PressureIndependent.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Dampers/Validation/PressureIndependent.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Dampers/Validation/PressureIndependent.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Dampers/Validation/PressureIndependent.mo" 2021-09-16 11:18:38.606180270 +0200 @@ -4,10 +4,10 @@ extends Modelica.Icons.Example; package Medium = Buildings.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"; Buildings.Fluid.Actuators.Dampers.Exponential damExp( redeclare final package Medium = Medium, @@ -49,7 +49,7 @@ annotation (Placement(transformation(extent={{0,-90},{20,-70}}))); Controls.Continuous.LimPID conPID(k=10, Ti=0.001, - 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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Motors/IdealMotor.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Motors/IdealMotor.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Motors/IdealMotor.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Motors/IdealMotor.mo" 2021-09-16 11:18:38.542180485 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo" 2021-09-16 11:18:38.098181978 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Valves/TwoWayTable.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Valves/TwoWayTable.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Valves/TwoWayTable.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Valves/TwoWayTable.mo" 2021-09-16 11:18:38.066182085 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mo" 2021-09-16 11:18:38.034182193 +0200 @@ -4,9 +4,9 @@ extends Modelica.Icons.Example; package Medium = Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mo" 2021-09-16 11:18:37.994182327 +0200 @@ -6,9 +6,9 @@ package Medium = Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck.mo" 2021-09-16 11:18:37.938182515 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck2.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck2.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck2.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck2.mo" 2021-09-16 11:18:37.926182556 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck.mo" 2021-09-16 11:18:37.914182596 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck2.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck2.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck2.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck2.mo" 2021-09-16 11:18:37.902182636 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/Validation/InverseFlowFunctions.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/Validation/InverseFlowFunctions.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/Validation/InverseFlowFunctions.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/Validation/InverseFlowFunctions.mo" 2021-09-16 11:18:37.890182677 +0200 @@ -1,15 +1,15 @@ within Buildings.Fluid.BaseClasses.FlowModels.Validation; model InverseFlowFunctions "Test model for flow function and its inverse" extends Modelica.Icons.Example; - Modelica.SIunits.MassFlowRate m_flow; - Modelica.SIunits.PressureDifference dp(displayUnit="Pa") "Pressure difference"; - Modelica.SIunits.PressureDifference dpCalc(displayUnit="Pa") + Modelica.Units.SI.MassFlowRate m_flow; + Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") "Pressure difference"; + Modelica.Units.SI.PressureDifference dpCalc(displayUnit="Pa") "Pressure difference computed by the flow functions"; - Modelica.SIunits.Pressure deltaDp(displayUnit="Pa") + Modelica.Units.SI.Pressure deltaDp(displayUnit="Pa") "Pressure difference between input and output to the functions"; - Modelica.SIunits.Time dTime= 2; + Modelica.Units.SI.Time dTime= 2; parameter Real k = 0.5; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 1 "Nominal flow rate"; + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 1 "Nominal flow rate"; equation dp = (time-0.5)/dTime * 20; m_flow=FlowModels.basicFlowFunction_dp(dp=dp, k=k, m_flow_turbulent=m_flow_nominal*0.3); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_dp.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_dp.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_dp.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_dp.mo" 2021-09-16 11:18:37.878182717 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_m_flow.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_m_flow.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_m_flow.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_m_flow.mo" 2021-09-16 11:18:37.866182757 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo" 2021-09-16 11:18:37.854182798 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der.mo" 2021-09-16 11:18:37.834182865 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der2.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der2.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der2.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der2.mo" 2021-09-16 11:18:37.818182919 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo" 2021-09-16 11:18:37.806182959 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der.mo" 2021-09-16 11:18:37.790183013 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der2.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der2.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der2.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der2.mo" 2021-09-16 11:18:37.778183053 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/PartialResistance.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/PartialResistance.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/PartialResistance.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/PartialResistance.mo" 2021-09-16 11:18:37.590183686 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/PartialThreeWayResistance.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/PartialThreeWayResistance.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/PartialThreeWayResistance.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/BaseClasses/PartialThreeWayResistance.mo" 2021-09-16 11:18:37.570183753 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Boilers/BoilerPolynomial.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Boilers/BoilerPolynomial.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Boilers/BoilerPolynomial.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Boilers/BoilerPolynomial.mo" 2021-09-16 11:18:37.494184008 +0200 @@ -6,8 +6,8 @@ show_T = true, final tau=VWat*rho_default/m_flow_nominal); - parameter Modelica.SIunits.Power Q_flow_nominal "Nominal heating power"; - parameter Modelica.SIunits.Temperature T_nominal = 353.15 + parameter Modelica.Units.SI.Power Q_flow_nominal "Nominal heating power"; + parameter Modelica.Units.SI.Temperature T_nominal = 353.15 "Temperature used to compute nominal efficiency (only used if efficiency curve depends on temperature)"; // Assumptions parameter Buildings.Fluid.Types.EfficiencyCurves effCur=Buildings.Fluid.Types.EfficiencyCurves.Constant @@ -17,16 +17,16 @@ parameter Buildings.Fluid.Data.Fuels.Generic fue "Fuel type" annotation (choicesAllMatching = true); - parameter Modelica.SIunits.ThermalConductance UA=0.05*Q_flow_nominal/30 + parameter Modelica.Units.SI.ThermalConductance UA=0.05*Q_flow_nominal/30 "Overall UA value"; - parameter Modelica.SIunits.Volume VWat = 1.5E-6*Q_flow_nominal + parameter Modelica.Units.SI.Volume VWat = 1.5E-6*Q_flow_nominal "Water volume of boiler" annotation(Dialog(tab = "Dynamics", enable = not (energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState))); - parameter Modelica.SIunits.Mass mDry = 1.5E-3*Q_flow_nominal + parameter Modelica.Units.SI.Mass mDry = 1.5E-3*Q_flow_nominal "Mass of boiler that will be lumped to water heat capacity" annotation(Dialog(tab = "Dynamics", enable = not (energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState))); - Modelica.SIunits.Efficiency eta= + Modelica.Units.SI.Efficiency eta= if effCur ==Buildings.Fluid.Types.EfficiencyCurves.Constant then a[1] elseif effCur ==Buildings.Fluid.Types.EfficiencyCurves.Polynomial then @@ -36,13 +36,13 @@ else 0 "Boiler efficiency"; - Modelica.SIunits.Power QFue_flow = y * Q_flow_nominal/eta_nominal + Modelica.Units.SI.Power QFue_flow = y * Q_flow_nominal/eta_nominal "Heat released by fuel"; - Modelica.SIunits.Power QWat_flow = eta * QFue_flow + Modelica.Units.SI.Power QWat_flow = eta * QFue_flow "Heat transfer from gas into water"; - Modelica.SIunits.MassFlowRate mFue_flow = QFue_flow/fue.h + Modelica.Units.SI.MassFlowRate mFue_flow = QFue_flow/fue.h "Fuel mass flow rate"; - Modelica.SIunits.VolumeFlowRate VFue_flow = mFue_flow/fue.d + Modelica.Units.SI.VolumeFlowRate VFue_flow = mFue_flow/fue.d "Fuel volume flow rate"; Modelica.Blocks.Interfaces.RealInput y(min=0, max=1) "Part load ratio" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Boilers/Examples/BoilerPolynomial.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Boilers/Examples/BoilerPolynomial.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Boilers/Examples/BoilerPolynomial.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Boilers/Examples/BoilerPolynomial.mo" 2021-09-16 11:18:37.442184183 +0200 @@ -2,12 +2,12 @@ model BoilerPolynomial "Test model" extends Modelica.Icons.Example; package Medium = Buildings.Media.Water "Medium model"; - parameter Modelica.SIunits.Power Q_flow_nominal = 3000 "Nominal power"; - parameter Modelica.SIunits.Temperature dT_nominal = 20 + parameter Modelica.Units.SI.Power Q_flow_nominal = 3000 "Nominal power"; + parameter Modelica.Units.SI.Temperature dT_nominal = 20 "Nominal temperature difference"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = Q_flow_nominal/dT_nominal/4200 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = Q_flow_nominal/dT_nominal/4200 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal = 3000 + parameter Modelica.Units.SI.PressureDifference dp_nominal = 3000 "Pressure drop at m_flow_nominal"; Buildings.Fluid.Sources.Boundary_pT sin( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Boilers/Examples/BoilerPolynomialClosedLoop.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Boilers/Examples/BoilerPolynomialClosedLoop.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Boilers/Examples/BoilerPolynomialClosedLoop.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Boilers/Examples/BoilerPolynomialClosedLoop.mo" 2021-09-16 11:18:37.418184264 +0200 @@ -2,10 +2,10 @@ model BoilerPolynomialClosedLoop "Boiler with closed loop control" extends Modelica.Icons.Example; package Medium = Buildings.Media.Water "Medium model"; - parameter Modelica.SIunits.Power Q_flow_nominal = 20000 "Nominal power"; - parameter Modelica.SIunits.Temperature dT_nominal = 20 + parameter Modelica.Units.SI.Power Q_flow_nominal = 20000 "Nominal power"; + parameter Modelica.Units.SI.Temperature dT_nominal = 20 "Nominal temperature difference"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = Q_flow_nominal/dT_nominal/4200 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = Q_flow_nominal/dT_nominal/4200 "Nominal mass flow rate"; Buildings.Fluid.Boilers.BoilerPolynomial boi( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/AssertPower.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/AssertPower.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/AssertPower.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/AssertPower.mo" 2021-09-16 11:18:37.334184546 +0200 @@ -2,9 +2,9 @@ model AssertPower "Assert if electric power is outside boundaries" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Power PEleMax + parameter Modelica.Units.SI.Power PEleMax "Maximum power output"; - parameter Modelica.SIunits.Power PEleMin + parameter Modelica.Units.SI.Power PEleMin "Minimum power output"; parameter Boolean use_powerRateLimit "If true, the rate at which net power output can change is limited"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/AssertWaterFlow.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/AssertWaterFlow.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/AssertWaterFlow.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/AssertWaterFlow.mo" 2021-09-16 11:18:37.306184640 +0200 @@ -2,7 +2,7 @@ model AssertWaterFlow "Assert if water flow is outside boundaries" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.MassFlowRate mWatMin_flow + parameter Modelica.Units.SI.MassFlowRate mWatMin_flow "Minimum cooling water mass flow rate"; Buildings.Controls.OBC.CDL.Interfaces.BooleanInput runSig diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/AssertWaterTemperature.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/AssertWaterTemperature.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/AssertWaterTemperature.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/AssertWaterTemperature.mo" 2021-09-16 11:18:37.286184707 +0200 @@ -3,9 +3,9 @@ "Assert if water outlet temperature is outside boundaries" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Temperature TWatMax + parameter Modelica.Units.SI.Temperature TWatMax "Maximum cooling water temperature"; - parameter Modelica.SIunits.TemperatureDifference THys = 0.5 + parameter Modelica.Units.SI.TemperatureDifference THys = 0.5 "Hysteresis value to check temperature difference" annotation (Dialog(tab="Advanced")); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/Controller.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/Controller.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/Controller.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/Controller.mo" 2021-09-16 11:18:37.270184761 +0200 @@ -5,7 +5,7 @@ replaceable parameter Buildings.Fluid.CHPs.Data.Generic per "Performance data" annotation (Placement(transformation(extent={{200,158},{220,178}}))); - parameter Modelica.SIunits.Time waitTime=60 + parameter Modelica.Units.SI.Time waitTime=60 "Wait time before transition from pump-on mode fires" annotation (Dialog(tab="Dynamics")); @@ -43,10 +43,10 @@ "Type of operating mode" annotation (Placement(transformation(extent={{260,-20},{300,20}}), iconTransformation(extent={{100,-10},{120,10}}))); - Modelica.StateGraph.Step staBy(nOut=2) + Modelica.StateGraph.Step staBy(nIn = 1, nOut = 2) "Standby step" annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); - Modelica.StateGraph.Step pumOn(nOut=2) + Modelica.StateGraph.Step pumOn(nIn = 1, nOut = 2) "Pump on step" annotation (Placement(transformation(extent={{0,-10},{20,10}}))); Modelica.StateGraph.StepWithSignal warUp(nIn=2, nOut=2) @@ -125,7 +125,7 @@ annotation (Placement(transformation(extent={{90,-50},{110,-30}}))); Modelica.StateGraph.TransitionWithSignal transition6 "Run in normal mode" annotation (Placement(transformation(extent={{150,-10},{170,10}}))); - Modelica.StateGraph.InitialStep plaOff(final nIn=3) "Plant is off" + Modelica.StateGraph.InitialStep plaOff(nOut = 1, final nIn = 3) "Plant is off" annotation (Placement(transformation(extent={{-120,-10},{-100,10}}))); Modelica.StateGraph.TransitionWithSignal transition4( final enableTimer=true, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/EngineTemperature.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/EngineTemperature.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/EngineTemperature.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/EngineTemperature.mo" 2021-09-16 11:18:37.074185420 +0200 @@ -2,13 +2,13 @@ model EngineTemperature "Heat exchange within the engine control volume" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.ThermalConductance UAHex + parameter Modelica.Units.SI.ThermalConductance UAHex "Thermal conductance between the engine and cooling water"; - parameter Modelica.SIunits.ThermalConductance UALos + parameter Modelica.Units.SI.ThermalConductance UALos "Thermal conductance between the engine and surroundings"; - parameter Modelica.SIunits.HeatCapacity capEng + parameter Modelica.Units.SI.HeatCapacity capEng "Thermal capacitance of the engine control volume"; - parameter Modelica.SIunits.Temperature TEngIni + parameter Modelica.Units.SI.Temperature TEngIni "Initial engine temperature"; Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a TRoo @@ -30,8 +30,8 @@ iconTransformation(extent={{100,-20},{140,20}}))); protected - constant Modelica.SIunits.Density rhoWat=1000 "Water density"; - constant Modelica.SIunits.SpecificHeatCapacity cWat=4180 "Water specific heat"; + constant Modelica.Units.SI.Density rhoWat=1000 "Water density"; + constant Modelica.Units.SI.SpecificHeatCapacity cWat=4180 "Water specific heat"; Modelica.Thermal.HeatTransfer.Components.ThermalConductor theConHX( final G=UAHex) "Thermal conductance between engine and cooling water volume" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/FilterPower.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/FilterPower.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/FilterPower.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/FilterPower.mo" 2021-09-16 11:18:37.042185528 +0200 @@ -2,9 +2,9 @@ model FilterPower "Constraints for electric power" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Power PEleMax + parameter Modelica.Units.SI.Power PEleMax "Maximum power output"; - parameter Modelica.SIunits.Power PEleMin + parameter Modelica.Units.SI.Power PEleMin "Minimum power output"; parameter Boolean use_powerRateLimit "If true, the rate at which net power output can change is limited"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/PowerConsumption.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/PowerConsumption.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/PowerConsumption.mo" 2021-09-16 11:15:38.390780618 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/PowerConsumption.mo" 2021-09-16 11:18:36.810186307 +0200 @@ -3,9 +3,9 @@ "Power consumption during stand-by and cool-down modes" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Power PStaBy + parameter Modelica.Units.SI.Power PStaBy "Standby electric power"; - parameter Modelica.SIunits.Power PCooDow + parameter Modelica.Units.SI.Power PCooDow "Cooldown electric power"; Buildings.Fluid.CHPs.BaseClasses.Interfaces.ModeTypeInput opeMod diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/Validation/StandBy.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/Validation/StandBy.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/Validation/StandBy.mo" 2021-09-16 11:15:38.394780605 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/Validation/StandBy.mo" 2021-09-16 11:18:36.562187142 +0200 @@ -16,9 +16,9 @@ "Standby to pump on mode" annotation (Placement(transformation(extent={{10,70},{30,90}}))); - Modelica.StateGraph.Step staBy(nOut=2) "Plant is in standby mode" + Modelica.StateGraph.Step staBy(nIn = 1, nOut = 2) "Plant is in standby mode" annotation (Placement(transformation(extent={{-20,70},{0,90}}))); - Modelica.StateGraph.Step pumOn(nOut=2) "Plant pump is on" + Modelica.StateGraph.Step pumOn(nIn = 1, nOut = 2) "Plant pump is on" annotation (Placement(transformation(extent={{40,70},{60,90}}))); protected Modelica.Blocks.Sources.BooleanTable avaSig(table={300,600,900,1260}) @@ -29,7 +29,7 @@ Modelica.Blocks.Sources.BooleanTable runSig(table={1200,1260}) "Plant run signal" annotation (Placement(transformation(extent={{-20,-10},{0,10}}))); - Modelica.StateGraph.InitialStep off(nIn=2) "Off mode" + Modelica.StateGraph.InitialStep off(nOut = 1, nIn = 2) "Off mode" annotation (Placement(transformation(extent={{-80,70},{-60,90}}))); inner Modelica.StateGraph.StateGraphRoot stateGraphRoot annotation (Placement(transformation(extent={{60,-80},{80,-60}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/WarmUpLeaving.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/WarmUpLeaving.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/WarmUpLeaving.mo" 2021-09-16 11:15:38.394780605 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/BaseClasses/WarmUpLeaving.mo" 2021-09-16 11:18:36.478187424 +0200 @@ -2,11 +2,11 @@ model WarmUpLeaving "Model evaluating the condition for transitioning from warm-up to normal mode" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Time timeDelayStart + parameter Modelica.Units.SI.Time timeDelayStart "Time delay between activation and power generation"; - parameter Modelica.SIunits.Temperature TEngNom + parameter Modelica.Units.SI.Temperature TEngNom "Nominal engine operating temperature"; - parameter Modelica.SIunits.Power PEleMax=0 + parameter Modelica.Units.SI.Power PEleMax=0 "Maximum power output" annotation (Dialog(enable=not warmUpByTimeDelay)); parameter Boolean warmUpByTimeDelay diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/Data/Generic.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/Data/Generic.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/Data/Generic.mo" 2021-09-16 11:15:38.394780605 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/Data/Generic.mo" 2021-09-16 11:18:36.422187612 +0200 @@ -31,34 +31,34 @@ The independent variable x1 is the fuel mass flow rate. From index 1 to 3, coefficients correspond to the following terms: constant, x1, x1^2"; - parameter Modelica.SIunits.ThermalConductance UAHex + parameter Modelica.Units.SI.ThermalConductance UAHex "Thermal conductance between the engine and cooling water"; - parameter Modelica.SIunits.ThermalConductance UALos + parameter Modelica.Units.SI.ThermalConductance UALos "Thermal conductance between the engine and surroundings"; - parameter Modelica.SIunits.HeatCapacity capEng + parameter Modelica.Units.SI.HeatCapacity capEng "Thermal capacitance of the engine control volume"; - parameter Modelica.SIunits.HeatCapacity capHeaRec + parameter Modelica.Units.SI.HeatCapacity capHeaRec "Thermal capacitance of heat recovery portion"; parameter Boolean warmUpByTimeDelay=true "If true, the plant will be in warm-up mode depending on the delay time, otherwise depending on engine temperature "; - parameter Modelica.SIunits.Time timeDelayStart = 60 + parameter Modelica.Units.SI.Time timeDelayStart = 60 "Time delay between activation and power generation"; - parameter Modelica.SIunits.Temperature TEngNom = 273.15+100 + parameter Modelica.Units.SI.Temperature TEngNom = 273.15+100 "Nominal engine operating temperature"; parameter Boolean coolDownOptional=false "If true, cooldown is optional. The model will complete cooldown before switching to standby, but if reactivated during cooldown period, it will immediately switch into warm-up mode"; - parameter Modelica.SIunits.Time timeDelayCool = 0 + parameter Modelica.Units.SI.Time timeDelayCool = 0 "Cooldown period"; - parameter Modelica.SIunits.Power PEleMax + parameter Modelica.Units.SI.Power PEleMax "Maximum power output"; - parameter Modelica.SIunits.Power PEleMin = 0 + parameter Modelica.Units.SI.Power PEleMin = 0 "Minimum power output"; - parameter Modelica.SIunits.MassFlowRate mWatMin_flow = 0 + parameter Modelica.Units.SI.MassFlowRate mWatMin_flow = 0 "Minimum cooling water mass flow rate"; - parameter Modelica.SIunits.Temperature TWatMax=373.15 + parameter Modelica.Units.SI.Temperature TWatMax=373.15 "Maximum cooling water temperature"; parameter Boolean use_powerRateLimit=false "If true, the rate at which net power output can change is limited"; @@ -68,9 +68,9 @@ "Maximum rate at which net power output can change"; parameter Real dmFueMax_flow(final unit="kg/s2") "Maximum rate at which fuel mass flow rate can change"; - parameter Modelica.SIunits.Power PStaBy + parameter Modelica.Units.SI.Power PStaBy "Standby electric power"; - parameter Modelica.SIunits.Power PCooDow + parameter Modelica.Units.SI.Power PCooDow "Cooldown electric power"; parameter Real LHVFue(final unit="J/kg") = 47.614e6 "Lower heating value of fuel"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/ThermalElectricalFollowing.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/ThermalElectricalFollowing.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/ThermalElectricalFollowing.mo" 2021-09-16 11:15:38.394780605 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/CHPs/ThermalElectricalFollowing.mo" 2021-09-16 11:18:36.190188391 +0200 @@ -12,9 +12,9 @@ parameter Boolean switchThermalElectricalFollowing = true "Set to true for switching between thermal and electrical following, to false for electrical following only"; - parameter Modelica.SIunits.Temperature TEngIni = Medium.T_default + parameter Modelica.Units.SI.Temperature TEngIni = Medium.T_default "Initial engine temperature"; - parameter Modelica.SIunits.Time waitTime=60 + parameter Modelica.Units.SI.Time waitTime=60 "Wait time before transition from pump-on mode fires" annotation (Dialog(tab="Dynamics")); parameter Controls.OBC.CDL.Types.SimpleController watOutCon= @@ -25,12 +25,12 @@ parameter Real k=1 "Gain of controller" annotation (Dialog(group="Cooling water outlet temperature controller", enable=switchThermalElectricalFollowing)); - parameter Modelica.SIunits.Time Ti=0.5 "Time constant of integrator block" + parameter Modelica.Units.SI.Time Ti=0.5 "Time constant of integrator block" annotation (Dialog(group="Cooling water outlet temperature controller", enable=switchThermalElectricalFollowing and (watOutCon==Buildings.Controls.OBC.CDL.Types.SimpleController.PI or watOutCon==Buildings.Controls.OBC.CDL.Types.SimpleController.PID))); - parameter Modelica.SIunits.Time Td=0.1 "Time constant of derivative block" + parameter Modelica.Units.SI.Time Td=0.1 "Time constant of derivative block" annotation (Dialog(group="Cooling water outlet temperature controller", enable=switchThermalElectricalFollowing and (watOutCon==Buildings.Controls.OBC.CDL.Types.SimpleController.PD or @@ -177,8 +177,8 @@ "Room temperature" annotation (Placement(transformation(extent={{-140,-130},{-120,-110}}))); protected - constant Modelica.SIunits.Density rhoWat=1000 "Water density"; - constant Modelica.SIunits.SpecificHeatCapacity cWat=4180 "Water specific heat"; + constant Modelica.Units.SI.Density rhoWat=1000 "Water density"; + constant Modelica.Units.SI.SpecificHeatCapacity cWat=4180 "Water specific heat"; equation connect(fil.PEle, hys.u) annotation (Line(points={{-118,90},{-80,90},{-80,110}, {-62,110}}, color={0,0,127})); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/AbsorptionIndirectSteam.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/AbsorptionIndirectSteam.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/AbsorptionIndirectSteam.mo" 2021-09-16 11:15:38.394780605 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/AbsorptionIndirectSteam.mo" 2021-09-16 11:18:36.018188970 +0200 @@ -20,7 +20,7 @@ "Performance data" annotation (choicesAllMatching= true, Placement(transformation(extent={{60,72},{80,92}}))); - parameter Modelica.SIunits.HeatFlowRate Q_flow_small = -per.QEva_flow_nominal*1E-6 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_small = -per.QEva_flow_nominal*1E-6 "Small value for heat flow rate or power, used to avoid division by zero" annotation(Dialog(tab="Advanced")); @@ -68,7 +68,7 @@ deltaX=Q_flow_small/10)) "Setpoint heat flow rate of the evaporator" annotation (Placement(transformation(extent={{-92,-28},{-72,-8}}))); - Modelica.SIunits.SpecificEnthalpy hEvaSet=Medium2.specificEnthalpy_pTX( + Modelica.Units.SI.SpecificEnthalpy hEvaSet=Medium2.specificEnthalpy_pTX( p=port_b2.p, T=TSet, X=cat( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/BaseClasses/AbsorptionIndirectSteam.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/BaseClasses/AbsorptionIndirectSteam.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/BaseClasses/AbsorptionIndirectSteam.mo" 2021-09-16 11:15:38.394780605 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/BaseClasses/AbsorptionIndirectSteam.mo" 2021-09-16 11:18:35.962189158 +0200 @@ -7,7 +7,7 @@ "Performance data" annotation (choicesAllMatching = true,Placement(transformation(extent={{60,72}, {80,92}}))); - parameter Modelica.SIunits.HeatFlowRate Q_flow_small + parameter Modelica.Units.SI.HeatFlowRate Q_flow_small "Small value for heat flow rate or power, used to avoid division by zero" annotation(HideResult=true); @@ -64,9 +64,9 @@ annotation (Placement(transformation(extent={{100,-90},{120,-70}}), iconTransformation(extent={{100,-90}, {120,-70}}))); - Modelica.SIunits.Efficiency genHIR + Modelica.Units.SI.Efficiency genHIR "Ratio of the generator heat input to chiller operating capacity"; - Modelica.SIunits.Efficiency EIRP(min=0) + Modelica.Units.SI.Efficiency EIRP(min=0) "Ratio of the actual absorber pumping power to the nominal pumping power"; Real capFunEva(min=0) "Evaporator capacity factor function of temperature curve"; @@ -77,12 +77,12 @@ Real genEvaT(min=0) "Heat input modifier based on the evaporator outlet temperature"; - Modelica.SIunits.HeatFlowRate QEva_flow_ava + Modelica.Units.SI.HeatFlowRate QEva_flow_ava "Cooling capacity available at the evaporator"; protected - Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TConEnt_degC + Modelica.Units.NonSI.Temperature_degC TConEnt_degC "Condenser entering water temperature in degC"; - Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TEvaLvg_degC + Modelica.Units.NonSI.Temperature_degC TEvaLvg_degC "Evaporator leaving water temperature in degC"; initial equation @@ -92,8 +92,8 @@ "In " + getInstanceName() + ": Parameter Q_flow_small must be larger than zero."); equation - TConEnt_degC=Modelica.SIunits.Conversions.to_degC(TConEnt); - TEvaLvg_degC=Modelica.SIunits.Conversions.to_degC(TEvaLvg); + TConEnt_degC = Modelica.Units.Conversions.to_degC(TConEnt); + TEvaLvg_degC = Modelica.Units.Conversions.to_degC(TEvaLvg); if on then capFunEva = Buildings.Utilities.Math.Functions.smoothMax( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/BaseClasses/Carnot.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/BaseClasses/Carnot.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/BaseClasses/Carnot.mo" 2021-09-16 11:15:38.394780605 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/BaseClasses/Carnot.mo" 2021-09-16 11:18:35.934189252 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/BaseClasses/PartialCarnot_y.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/BaseClasses/PartialCarnot_y.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/BaseClasses/PartialCarnot_y.mo" 2021-09-16 11:15:38.394780605 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/BaseClasses/PartialCarnot_y.mo" 2021-09-16 11:18:35.862189494 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/BaseClasses/PartialElectric.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/BaseClasses/PartialElectric.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/BaseClasses/PartialElectric.mo" 2021-09-16 11:15:38.394780605 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/BaseClasses/PartialElectric.mo" 2021-09-16 11:18:35.822189629 +0200 @@ -22,14 +22,14 @@ annotation (Placement(transformation(extent={{-140,-50},{-100,-10}}), iconTransformation(extent={{-140,-50},{-100,-10}}))); - Modelica.SIunits.Temperature TEvaEnt "Evaporator entering temperature"; - Modelica.SIunits.Temperature TEvaLvg "Evaporator leaving temperature"; - Modelica.SIunits.Temperature TConEnt "Condenser entering temperature"; - Modelica.SIunits.Temperature TConLvg "Condenser leaving temperature"; - - Modelica.SIunits.Efficiency COP "Coefficient of performance"; - Modelica.SIunits.HeatFlowRate QCon_flow "Condenser heat input"; - Modelica.SIunits.HeatFlowRate QEva_flow "Evaporator heat input"; + Modelica.Units.SI.Temperature TEvaEnt "Evaporator entering temperature"; + Modelica.Units.SI.Temperature TEvaLvg "Evaporator leaving temperature"; + Modelica.Units.SI.Temperature TConEnt "Condenser entering temperature"; + Modelica.Units.SI.Temperature TConLvg "Condenser leaving temperature"; + + Modelica.Units.SI.Efficiency COP "Coefficient of performance"; + Modelica.Units.SI.HeatFlowRate QCon_flow "Condenser heat input"; + Modelica.Units.SI.HeatFlowRate QEva_flow "Evaporator heat input"; Modelica.Blocks.Interfaces.RealOutput P(final quantity="Power", unit="W") "Electric power consumed by compressor" annotation (Placement(transformation(extent={{100,80},{120,100}}), @@ -37,44 +37,44 @@ Real capFunT(min=0, unit="1") "Cooling capacity factor function of temperature curve"; - Modelica.SIunits.Efficiency EIRFunT + Modelica.Units.SI.Efficiency EIRFunT "Power input to cooling capacity ratio function of temperature curve"; - Modelica.SIunits.Efficiency EIRFunPLR + Modelica.Units.SI.Efficiency EIRFunPLR "Power input to cooling capacity ratio function of part load ratio"; Real PLR1(min=0, unit="1") "Part load ratio"; Real PLR2(min=0, unit="1") "Part load ratio"; Real CR(min=0, unit="1") "Cycling ratio"; protected - Modelica.SIunits.HeatFlowRate QEva_flow_ava(nominal=QEva_flow_nominal,start=QEva_flow_nominal) + Modelica.Units.SI.HeatFlowRate QEva_flow_ava(nominal=QEva_flow_nominal,start=QEva_flow_nominal) "Cooling capacity available at evaporator"; - Modelica.SIunits.HeatFlowRate QEva_flow_set(nominal=QEva_flow_nominal,start=QEva_flow_nominal) + Modelica.Units.SI.HeatFlowRate QEva_flow_set(nominal=QEva_flow_nominal,start=QEva_flow_nominal) "Cooling capacity required to cool to set point temperature"; - Modelica.SIunits.SpecificEnthalpy hSet + Modelica.Units.SI.SpecificEnthalpy hSet "Enthalpy setpoint for leaving chilled water"; // Performance data - parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal(max=0) + parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal(max=0) "Reference capacity (negative number)"; - parameter Modelica.SIunits.Efficiency COP_nominal + parameter Modelica.Units.SI.Efficiency COP_nominal "Reference coefficient of performance"; parameter Real PLRMax(min=0, unit="1") "Maximum part load ratio"; parameter Real PLRMinUnl(min=0, unit="1") "Minimum part unload ratio"; parameter Real PLRMin(min=0, unit="1") "Minimum part load ratio"; - parameter Modelica.SIunits.Efficiency etaMotor(max=1) + parameter Modelica.Units.SI.Efficiency etaMotor(max=1) "Fraction of compressor motor heat entering refrigerant"; - parameter Modelica.SIunits.MassFlowRate mEva_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mEva_flow_nominal "Nominal mass flow at evaporator"; - parameter Modelica.SIunits.MassFlowRate mCon_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mCon_flow_nominal "Nominal mass flow at condenser"; - parameter Modelica.SIunits.Temperature TEvaLvg_nominal + parameter Modelica.Units.SI.Temperature TEvaLvg_nominal "Temperature of fluid leaving evaporator at nominal condition"; - final parameter Modelica.SIunits.Conversions.NonSIunits.Temperature_degC + final parameter Modelica.Units.NonSI.Temperature_degC TEvaLvg_nominal_degC= - Modelica.SIunits.Conversions.to_degC(TEvaLvg_nominal) + Modelica.Units.Conversions.to_degC(TEvaLvg_nominal) "Temperature of fluid leaving evaporator at nominal condition"; - Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TEvaLvg_degC + Modelica.Units.NonSI.Temperature_degC TEvaLvg_degC "Temperature of fluid leaving evaporator"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_small = QEva_flow_nominal*1E-9 + parameter Modelica.Units.SI.HeatFlowRate Q_flow_small = QEva_flow_nominal*1E-9 "Small value for heat flow rate or power, used to avoid division by zero"; Buildings.HeatTransfer.Sources.PrescribedHeatFlow preHeaFloEva "Prescribed heat flow rate" @@ -101,7 +101,7 @@ // Evaporator temperatures TEvaEnt = Medium2.temperature(Medium2.setState_phX(port_a2.p, inStream(port_a2.h_outflow))); TEvaLvg = vol2.heatPort.T; - TEvaLvg_degC=Modelica.SIunits.Conversions.to_degC(TEvaLvg); + TEvaLvg_degC=Modelica.Units.Conversions.to_degC(TEvaLvg); // Enthalpy of temperature setpoint hSet = Medium2.specificEnthalpy_pTX( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Carnot_TEva.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Carnot_TEva.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Carnot_TEva.mo" 2021-09-16 11:15:38.394780605 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Carnot_TEva.mo" 2021-09-16 11:18:35.758189844 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Data/AbsorptionIndirectSteam.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Data/AbsorptionIndirectSteam.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Data/AbsorptionIndirectSteam.mo" 2021-09-16 11:15:38.394780605 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Data/AbsorptionIndirectSteam.mo" 2021-09-16 11:18:35.714189991 +0200 @@ -5,10 +5,10 @@ record Generic "Generic data record for absorption indirect chiller" extends Modelica.Icons.Record; - parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal(final max=0) + parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal(final max=0) "Nominal evaporator cooling capacity (negative number)" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.Power P_nominal "Nominal absorber pump power" + parameter Modelica.Units.SI.Power P_nominal "Nominal absorber pump power" annotation (Dialog(group="Nominal condition")); parameter Real PLRMax(min=0) @@ -18,16 +18,16 @@ "Minimum part load ratio" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.MassFlowRate mCon_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mCon_flow_nominal "Nominal mass flow rate at condenser" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.MassFlowRate mEva_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mEva_flow_nominal "Nominal mass flow rate at evaporator" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.PressureDifference dpCon_nominal(displayUnit="Pa") = 30000 + parameter Modelica.Units.SI.PressureDifference dpCon_nominal(displayUnit="Pa") = 30000 "Pressure difference at condenser at nominal mass flow rate" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.PressureDifference dpEva_nominal(displayUnit="Pa") = 30000 + parameter Modelica.Units.SI.PressureDifference dpEva_nominal(displayUnit="Pa") = 30000 "Pressure difference at evaporator at nominal mass flow rate" annotation (Dialog(group="Nominal condition")); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Data/BaseClasses.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Data/BaseClasses.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Data/BaseClasses.mo" 2021-09-16 11:15:38.394780605 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Data/BaseClasses.mo" 2021-09-16 11:18:35.698190045 +0200 @@ -4,7 +4,7 @@ record Chiller "Base classes for chiller models" extends Modelica.Icons.Record; - parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal(max=0) + parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal(max=0) "Reference capacity (negative number)" annotation (Dialog(group="Nominal condition")); parameter Real COP_nominal "Reference coefficient of performance" @@ -17,13 +17,13 @@ parameter Real etaMotor(min=0, max=1) "Fraction of compressor motor heat entering refrigerant"; - parameter Modelica.SIunits.MassFlowRate mEva_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mEva_flow_nominal "Nominal mass flow at evaporator" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.MassFlowRate mCon_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mCon_flow_nominal "Nominal mass flow at condenser" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.Temperature TEvaLvg_nominal + parameter Modelica.Units.SI.Temperature TEvaLvg_nominal "Temperature of fluid leaving evaporator at nominal condition" annotation (Dialog(group="Nominal condition")); @@ -39,13 +39,13 @@ annotation (Dialog(group="Performance curves")); parameter Real EIRFunPLR[nEIRFunPLR] "Coefficients for EIRFunPLR" annotation (Dialog(group="Performance curves")); - parameter Modelica.SIunits.Temperature TEvaLvgMin + + parameter Modelica.Units.SI.Temperature TEvaLvgMin "Minimum value for leaving evaporator temperature" annotation (Dialog(group="Performance curves")); - parameter Modelica.SIunits.Temperature TEvaLvgMax + parameter Modelica.Units.SI.Temperature TEvaLvgMax "Maximum value for leaving evaporator temperature" annotation (Dialog(group="Performance curves")); - annotation (preferredView="info", Documentation(info="
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Data/ElectricEIR.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Data/ElectricEIR.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Data/ElectricEIR.mo" 2021-09-16 11:15:38.394780605 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Data/ElectricEIR.mo" 2021-09-16 11:18:35.674190126 +0200 @@ -6,17 +6,17 @@ final nCapFunT=6, final nEIRFunT=6, final nEIRFunPLR=3); - parameter Modelica.SIunits.Temperature TConEnt_nominal + + parameter Modelica.Units.SI.Temperature TConEnt_nominal "Temperature of fluid entering condenser at nominal condition" annotation (Dialog(group="Nominal condition")); - parameter Modelica.SIunits.Temperature TConEntMin + parameter Modelica.Units.SI.Temperature TConEntMin "Minimum value for entering condenser temperature" annotation (Dialog(group="Performance curves")); - parameter Modelica.SIunits.Temperature TConEntMax + parameter Modelica.Units.SI.Temperature TConEntMax "Maximum value for entering condenser temperature" annotation (Dialog(group="Performance curves")); - annotation ( defaultComponentName="datChi", defaultComponentPrefixes="parameter", diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Data/ElectricReformulatedEIR.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Data/ElectricReformulatedEIR.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Data/ElectricReformulatedEIR.mo" 2021-09-16 11:15:38.398780592 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Data/ElectricReformulatedEIR.mo" 2021-09-16 11:18:34.718193339 +0200 @@ -6,13 +6,13 @@ final nCapFunT=6, final nEIRFunT=6, final nEIRFunPLR=10); - parameter Modelica.SIunits.Temperature TConLvg_nominal + parameter Modelica.Units.SI.Temperature TConLvg_nominal "Temperature of fluid leaving condenser at nominal condition"; - parameter Modelica.SIunits.Temperature TConLvgMin + parameter Modelica.Units.SI.Temperature TConLvgMin "Minimum value for leaving condenser temperature" annotation (Dialog(group="Performance curves")); - Modelica.SIunits.Temperature TConLvgMax + Modelica.Units.SI.Temperature TConLvgMax "Maximum value for leaving condenser temperature" annotation (Dialog(group="Performance curves")); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/ElectricEIR.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/ElectricEIR.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/ElectricEIR.mo" 2021-09-16 11:15:38.398780592 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/ElectricEIR.mo" 2021-09-16 11:18:33.322198031 +0200 @@ -17,12 +17,12 @@ Placement(transformation(extent={{40,80},{60,100}}))); protected - final parameter Modelica.SIunits.Conversions.NonSIunits.Temperature_degC + final parameter Modelica.Units.NonSI.Temperature_degC TConEnt_nominal_degC= - Modelica.SIunits.Conversions.to_degC(per.TConEnt_nominal) + Modelica.Units.Conversions.to_degC(per.TConEnt_nominal) "Temperature of fluid entering condenser at nominal condition"; - Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TConEnt_degC + Modelica.Units.NonSI.Temperature_degC TConEnt_degC "Temperature of fluid entering condenser"; initial equation // Verify correctness of performance curves, and write warning if error is bigger than 10% @@ -32,7 +32,7 @@ "Capacity as function of temperature ", "per.capFunT"); equation - TConEnt_degC=Modelica.SIunits.Conversions.to_degC(TConEnt); + TConEnt_degC=Modelica.Units.Conversions.to_degC(TConEnt); if on then // Compute the chiller capacity fraction, using a biquadratic curve. diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/ElectricReformulatedEIR.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/ElectricReformulatedEIR.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/ElectricReformulatedEIR.mo" 2021-09-16 11:15:38.398780592 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/ElectricReformulatedEIR.mo" 2021-09-16 11:18:33.298198112 +0200 @@ -18,12 +18,12 @@ Placement(transformation(extent={{40,80},{60,100}}))); protected - final parameter Modelica.SIunits.Conversions.NonSIunits.Temperature_degC + final parameter Modelica.Units.NonSI.Temperature_degC TConLvg_nominal_degC= - Modelica.SIunits.Conversions.to_degC(per.TConLvg_nominal) + Modelica.Units.Conversions.to_degC(per.TConLvg_nominal) "Temperature of fluid leaving condenser at nominal condition"; - Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TConLvg_degC + Modelica.Units.NonSI.Temperature_degC TConLvg_degC "Temperature of fluid leaving condenser"; initial equation // Verify correctness of performance curves, and write warning if error is bigger than 10% @@ -33,7 +33,7 @@ "Capacity as a function of temperature ", "per.capFunT"); equation - TConLvg_degC=Modelica.SIunits.Conversions.to_degC(TConLvg); + TConLvg_degC=Modelica.Units.Conversions.to_degC(TConLvg); if on then // Compute the chiller capacity fraction, using a biquadratic curve. diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Examples/BaseClasses/PartialElectric.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Examples/BaseClasses/PartialElectric.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Examples/BaseClasses/PartialElectric.mo" 2021-09-16 11:15:38.398780592 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Examples/BaseClasses/PartialElectric.mo" 2021-09-16 11:18:33.218198380 +0200 @@ -4,16 +4,16 @@ package Medium1 = Buildings.Media.Water "Medium model"; package Medium2 = Buildings.Media.Water "Medium model"; - parameter Modelica.SIunits.Power P_nominal + parameter Modelica.Units.SI.Power P_nominal "Nominal compressor power (at y=1)"; - parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=10 + parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=10 "Temperature difference evaporator inlet-outlet"; - parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=10 + parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=10 "Temperature difference condenser outlet-inlet"; parameter Real COPc_nominal = 3 "Chiller COP"; - parameter Modelica.SIunits.MassFlowRate mEva_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mEva_flow_nominal "Nominal mass flow rate at evaporator"; - parameter Modelica.SIunits.MassFlowRate mCon_flow_nominal + parameter Modelica.Units.SI.MassFlowRate mCon_flow_nominal "Nominal mass flow rate at condenser"; Buildings.Fluid.Sources.MassFlowSource_T sou1( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Examples/Carnot_TEva.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Examples/Carnot_TEva.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Examples/Carnot_TEva.mo" 2021-09-16 11:15:38.398780592 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Examples/Carnot_TEva.mo" 2021-09-16 11:18:33.198198447 +0200 @@ -5,14 +5,14 @@ package Medium1 = Buildings.Media.Water "Medium model"; package Medium2 = Buildings.Media.Water "Medium model"; - parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=-10 + parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=-10 "Temperature difference evaporator outlet-inlet"; - parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=10 + parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=10 "Temperature difference condenser outlet-inlet"; parameter Real COPc_nominal = 3 "Chiller COP"; - parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal = -100E3 + parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal = -100E3 "Evaporator heat flow rate"; - parameter Modelica.SIunits.MassFlowRate m2_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal= QEva_flow_nominal/dTEva_nominal/4200 "Nominal mass flow rate at chilled water side"; @@ -68,7 +68,7 @@ Modelica.Blocks.Math.Add QCon_flow(k2=-1) "Condenser heat flow rate" annotation (Placement(transformation(extent={{48,-50},{68,-30}}))); - final parameter Modelica.SIunits.SpecificHeatCapacity cp1_default= + final parameter Modelica.Units.SI.SpecificHeatCapacity cp1_default= Medium1.specificHeatCapacityCp(Medium1.setState_pTX( Medium1.p_default, Medium1.T_default, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Examples/Carnot_y.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Examples/Carnot_y.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Examples/Carnot_y.mo" 2021-09-16 11:15:38.398780592 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Examples/Carnot_y.mo" 2021-09-16 11:18:33.170198541 +0200 @@ -4,18 +4,18 @@ package Medium1 = Buildings.Media.Water "Medium model"; package Medium2 = Buildings.Media.Water "Medium model"; - parameter Modelica.SIunits.Power P_nominal=10E3 + parameter Modelica.Units.SI.Power P_nominal=10E3 "Nominal compressor power (at y=1)"; - parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=-10 + parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=-10 "Temperature difference evaporator outlet-inlet"; - parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=10 + parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=10 "Temperature difference condenser outlet-inlet"; parameter Real COPc_nominal = 3 "Chiller COP"; - parameter Modelica.SIunits.MassFlowRate m2_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal= -P_nominal*COPc_nominal/dTEva_nominal/4200 "Nominal mass flow rate at chilled water side"; - parameter Modelica.SIunits.MassFlowRate m1_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal= m2_flow_nominal*(COPc_nominal+1)/COPc_nominal "Nominal mass flow rate at condenser water wide"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Validation/CarnotVerifyCOP.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Validation/CarnotVerifyCOP.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Validation/CarnotVerifyCOP.mo" 2021-09-16 11:15:38.398780592 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Validation/CarnotVerifyCOP.mo" 2021-09-16 11:18:33.094198798 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Validation/CarnotVerifyEtaCarnot.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Validation/CarnotVerifyEtaCarnot.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Validation/CarnotVerifyEtaCarnot.mo" 2021-09-16 11:15:38.398780592 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Validation/CarnotVerifyEtaCarnot.mo" 2021-09-16 11:18:33.058198919 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Validation/Carnot_TEva_2ndLaw.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Validation/Carnot_TEva_2ndLaw.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Validation/Carnot_TEva_2ndLaw.mo" 2021-09-16 11:15:38.398780592 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Validation/Carnot_TEva_2ndLaw.mo" 2021-09-16 11:18:33.014199066 +0200 @@ -5,18 +5,18 @@ package Medium = Buildings.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"; Buildings.Fluid.Sources.MassFlowSource_T sou1( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Validation/Carnot_TEva_reverseFlow.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Validation/Carnot_TEva_reverseFlow.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Validation/Carnot_TEva_reverseFlow.mo" 2021-09-16 11:15:38.398780592 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Chillers/Validation/Carnot_TEva_reverseFlow.mo" 2021-09-16 11:18:32.926199362 +0200 @@ -5,17 +5,17 @@ package Medium1 = Buildings.Media.Water "Medium model"; package Medium2 = Buildings.Media.Water "Medium model"; - parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=-10 + parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=-10 "Temperature difference evaporator inlet-outlet"; - parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=10 + parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=10 "Temperature difference condenser outlet-inlet"; parameter Real COPc_nominal = 3 "Chiller COP"; - parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal = -100E3 + parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal = -100E3 "Evaporator heat flow rate"; - parameter Modelica.SIunits.MassFlowRate m2_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal= QEva_flow_nominal/dTEva_nominal/4200 "Nominal mass flow rate at chilled water side"; - parameter Modelica.SIunits.MassFlowRate m1_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal= m2_flow_nominal*(COPc_nominal+1)/COPc_nominal "Nominal mass flow rate at condenser water wide"; @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Data/Fuels.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Data/Fuels.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Data/Fuels.mo" 2021-09-16 11:15:38.398780592 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Data/Fuels.mo" 2021-09-16 11:18:32.882199510 +0200 @@ -49,9 +49,9 @@ record Generic "Generic record of fuel properties" extends Modelica.Icons.Record; - parameter Modelica.SIunits.SpecificEnthalpy h + parameter Modelica.Units.SI.SpecificEnthalpy h "Heating value (lower or upper, depending on fuel)"; - parameter Modelica.SIunits.Density d "Mass density"; + parameter Modelica.Units.SI.Density d "Mass density"; parameter Real mCO2(final min=0) "CO2 emission at combustion, in kg/kg fuel"; annotation ( defaultComponentPrefixes="parameter", diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Data/Pipes.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Data/Pipes.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Data/Pipes.mo" 2021-09-16 11:15:38.398780592 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Data/Pipes.mo" 2021-09-16 11:18:32.870199550 +0200 @@ -138,12 +138,12 @@ record Generic "Generic record for pipes" extends Modelica.Icons.Record; - parameter Modelica.SIunits.Length dOut(min=0) "Outer diameter"; - parameter Modelica.SIunits.Length dIn(min=0) "Inner diameter"; - final parameter Modelica.SIunits.Length s(min=0) = (dOut-dIn)/2 "Wall thickness"; - parameter Modelica.SIunits.Length roughness(min=0) "Roughness"; - parameter Modelica.SIunits.Density d "Mass density"; - parameter Modelica.SIunits.ThermalConductivity k "Thermal conductivity"; + parameter Modelica.Units.SI.Length dOut(min=0) "Outer diameter"; + parameter Modelica.Units.SI.Length dIn(min=0) "Inner diameter"; + final parameter Modelica.Units.SI.Length s(min=0) = (dOut-dIn)/2 "Wall thickness"; + parameter Modelica.Units.SI.Length roughness(min=0) "Roughness"; + parameter Modelica.Units.SI.Density d "Mass density"; + parameter Modelica.Units.SI.ThermalConductivity k "Thermal conductivity"; annotation ( defaultComponentPrefixes="parameter", defaultComponentName="datPip", @@ -159,6 +159,7 @@ ")); + end Generic; annotation ( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Delays/DelayFirstOrder.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Delays/DelayFirstOrder.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Delays/DelayFirstOrder.mo" 2021-09-16 11:15:38.398780592 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Delays/DelayFirstOrder.mo" 2021-09-16 11:18:32.838199657 +0200 @@ -4,11 +4,11 @@ extends Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/FlowSystem/Basic.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/FlowSystem/Basic.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/FlowSystem/Basic.mo" 2021-09-16 11:15:38.398780592 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/FlowSystem/Basic.mo" 2021-09-16 11:18:32.626200370 +0200 @@ -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}}))); Buildings.Fluid.Actuators.Valves.ThreeWayLinear valSouth( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/Example1v2.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/Example1v2.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/Example1v2.mo" 2021-09-16 11:15:38.398780592 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/Example1v2.mo" 2021-09-16 11:18:32.430201028 +0200 @@ -1,7 +1,7 @@ within Buildings.Fluid.Examples.Performance; model Example1v2 "Example 1 model with mixing volume" extends Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/Example2.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/Example2.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/Example2.mo" 2021-09-16 11:15:38.398780592 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/Example2.mo" 2021-09-16 11:18:32.410201096 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/Example3.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/Example3.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/Example3.mo" 2021-09-16 11:15:38.398780592 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/Example3.mo" 2021-09-16 11:18:32.386201176 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/Example4.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/Example4.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/Example4.mo" 2021-09-16 11:15:38.398780592 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/Example4.mo" 2021-09-16 11:18:32.358201270 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/PressureDrop/ParallelDp.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/PressureDrop/ParallelDp.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/PressureDrop/ParallelDp.mo" 2021-09-16 11:15:38.398780592 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/PressureDrop/ParallelDp.mo" 2021-09-16 11:18:32.246201646 +0200 @@ -4,9 +4,9 @@ extends Modelica.Icons.Example; package Medium = Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/PressureDrop/ParallelFlow.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/PressureDrop/ParallelFlow.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/PressureDrop/ParallelFlow.mo" 2021-09-16 11:15:38.398780592 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/PressureDrop/ParallelFlow.mo" 2021-09-16 11:18:32.218201740 +0200 @@ -4,9 +4,9 @@ extends Modelica.Icons.Example; package Medium = Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/PressureDrop/SeriesDp.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/PressureDrop/SeriesDp.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/PressureDrop/SeriesDp.mo" 2021-09-16 11:15:38.398780592 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/PressureDrop/SeriesDp.mo" 2021-09-16 11:18:32.190201835 +0200 @@ -4,9 +4,9 @@ extends Modelica.Icons.Example; package Medium = Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/PressureDrop/SeriesFlow.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/PressureDrop/SeriesFlow.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/PressureDrop/SeriesFlow.mo" 2021-09-16 11:15:38.398780592 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/PressureDrop/SeriesFlow.mo" 2021-09-16 11:18:32.166201916 +0200 @@ -4,9 +4,9 @@ extends Modelica.Icons.Example; package Medium = Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/PressureDrop/SeriesParallelDp.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/PressureDrop/SeriesParallelDp.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/PressureDrop/SeriesParallelDp.mo" 2021-09-16 11:15:38.398780592 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/PressureDrop/SeriesParallelDp.mo" 2021-09-16 11:18:32.130202037 +0200 @@ -4,9 +4,9 @@ extends Modelica.Icons.Example; package Medium = Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/PressureDrop/SeriesParallelFlow.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/PressureDrop/SeriesParallelFlow.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/PressureDrop/SeriesParallelFlow.mo" 2021-09-16 11:15:38.398780592 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/Performance/PressureDrop/SeriesParallelFlow.mo" 2021-09-16 11:18:31.946202655 +0200 @@ -4,9 +4,9 @@ extends Modelica.Icons.Example; package Medium = Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/SimpleHouse.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/SimpleHouse.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/SimpleHouse.mo" 2021-09-16 11:15:38.398780592 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Examples/SimpleHouse.mo" 2021-09-16 11:18:31.898202816 +0200 @@ -6,18 +6,18 @@ package MediumAir = Buildings.Media.Air; package MediumWater = Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mo" 2021-09-16 11:15:38.398780592 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mo" 2021-09-16 11:18:31.782203205 +0200 @@ -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"; Buildings.Fluid.FMI.Adaptors.ThermalZone con( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo" 2021-09-16 11:15:38.406780566 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo" 2021-09-16 11:18:31.238205034 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZone.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZone.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZone.mo" 2021-09-16 11:15:38.410780553 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZone.mo" 2021-09-16 11:18:31.214205115 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZones.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZones.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZones.mo" 2021-09-16 11:15:38.410780553 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZones.mo" 2021-09-16 11:18:31.170205262 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/HeaterCooler_u.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/HeaterCooler_u.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/HeaterCooler_u.mo" 2021-09-16 11:15:38.410780553 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/HeaterCooler_u.mo" 2021-09-16 11:18:31.110205464 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/Heater_T.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/Heater_T.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/Heater_T.mo" 2021-09-16 11:15:38.410780553 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/Heater_T.mo" 2021-09-16 11:18:31.090205531 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/Humidifier_u.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/Humidifier_u.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/Humidifier_u.mo" 2021-09-16 11:15:38.410780553 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/Humidifier_u.mo" 2021-09-16 11:18:31.070205598 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/MixingVolume.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/MixingVolume.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/MixingVolume.mo" 2021-09-16 11:15:38.410780553 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/MixingVolume.mo" 2021-09-16 11:18:31.038205706 +0200 @@ -3,10 +3,10 @@ extends Buildings.Fluid.FMI.ExportContainers.PartialTwoPort( redeclare package Medium = Buildings.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 Buildings.Fluid.FMI.Adaptors.Inlet bouIn( redeclare final package Medium=Medium, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/PressureDrop.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/PressureDrop.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/PressureDrop.mo" 2021-09-16 11:15:38.410780553 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/PressureDrop.mo" 2021-09-16 11:18:31.022205759 +0200 @@ -6,9 +6,9 @@ Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/ResistanceVolume.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/ResistanceVolume.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/ResistanceVolume.mo" 2021-09-16 11:15:38.410780553 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/ResistanceVolume.mo" 2021-09-16 11:18:31.010205800 +0200 @@ -4,10 +4,10 @@ extends Buildings.Fluid.FMI.ExportContainers.PartialTwoPort( redeclare package Medium = Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZone.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZone.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZone.mo" 2021-09-16 11:15:38.410780553 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZone.mo" 2021-09-16 11:18:30.990205867 +0200 @@ -7,25 +7,25 @@ replaceable package MediumA = Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZones.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZones.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZones.mo" 2021-09-16 11:15:38.410780553 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZones.mo" 2021-09-16 11:18:30.958205974 +0200 @@ -8,25 +8,25 @@ replaceable package MediumA = Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Validation/FMUs/ThermalZoneAir1.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Validation/FMUs/ThermalZoneAir1.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Validation/FMUs/ThermalZoneAir1.mo" 2021-09-16 11:15:38.410780553 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/ExportContainers/Validation/FMUs/ThermalZoneAir1.mo" 2021-09-16 11:18:30.470207614 +0200 @@ -4,25 +4,25 @@ redeclare package Medium = Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/FlowSplitter_u.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/FlowSplitter_u.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/FlowSplitter_u.mo" 2021-09-16 11:15:38.410780553 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/FlowSplitter_u.mo" 2021-09-16 11:18:30.374207937 +0200 @@ -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 Buildings.Fluid.FMI.Interfaces.FluidProperties bacPro_internal( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/Interfaces/MassFractionConnector.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/Interfaces/MassFractionConnector.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/Interfaces/MassFractionConnector.mo" 2021-09-16 11:15:38.410780553 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/Interfaces/MassFractionConnector.mo" 2021-09-16 11:18:30.310208152 +0200 @@ -1,6 +1,6 @@ within Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/Interfaces/PressureInput.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/Interfaces/PressureInput.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/Interfaces/PressureInput.mo" 2021-09-16 11:15:38.410780553 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/Interfaces/PressureInput.mo" 2021-09-16 11:18:30.286208232 +0200 @@ -1,6 +1,6 @@ within Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/Interfaces/PressureOutput.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/Interfaces/PressureOutput.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/Interfaces/PressureOutput.mo" 2021-09-16 11:15:38.410780553 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/Interfaces/PressureOutput.mo" 2021-09-16 11:18:30.274208273 +0200 @@ -1,6 +1,6 @@ within Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/Validation/FlowSplitter_u.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/Validation/FlowSplitter_u.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/Validation/FlowSplitter_u.mo" 2021-09-16 11:15:38.410780553 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/Validation/FlowSplitter_u.mo" 2021-09-16 11:18:30.214208474 +0200 @@ -3,7 +3,7 @@ extends Modelica.Icons.Example; package Medium = Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/Validation/HeaterFan.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/Validation/HeaterFan.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/Validation/HeaterFan.mo" 2021-09-16 11:15:38.410780553 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/Validation/HeaterFan.mo" 2021-09-16 11:18:30.190208555 +0200 @@ -4,11 +4,11 @@ extends Modelica.Icons.Example; package Medium = Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/Validation/HeaterFanPressureDriven.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/Validation/HeaterFanPressureDriven.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/Validation/HeaterFanPressureDriven.mo" 2021-09-16 11:15:38.410780553 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/Validation/HeaterFanPressureDriven.mo" 2021-09-16 11:18:30.154208676 +0200 @@ -4,11 +4,11 @@ extends Modelica.Icons.Example; package Medium = Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/Validation/HeaterFan_noReverseFlow.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/Validation/HeaterFan_noReverseFlow.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/Validation/HeaterFan_noReverseFlow.mo" 2021-09-16 11:15:38.410780553 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FMI/Validation/HeaterFan_noReverseFlow.mo" 2021-09-16 11:18:30.114208810 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/BaseClasses/Pipe.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/BaseClasses/Pipe.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/BaseClasses/Pipe.mo" 2021-09-16 11:15:38.410780553 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/BaseClasses/Pipe.mo" 2021-09-16 11:18:30.058208998 +0200 @@ -11,13 +11,13 @@ annotation(HideResult=true); parameter Integer nSeg(min=1) = 10 "Number of volume segments"; - parameter Modelica.SIunits.Length thicknessIns "Thickness of insulation"; - parameter Modelica.SIunits.ThermalConductivity lambdaIns + parameter Modelica.Units.SI.Length thicknessIns "Thickness of insulation"; + parameter Modelica.Units.SI.ThermalConductivity lambdaIns "Heat conductivity of insulation"; - parameter Modelica.SIunits.Length diameter + parameter Modelica.Units.SI.Length diameter "Pipe diameter (without insulation)"; - parameter Modelica.SIunits.Length length "Length of the pipe"; + parameter Modelica.Units.SI.Length length "Length of the pipe"; parameter Real ReC=4000 "Reynolds number where transition to turbulent starts" annotation (Dialog(tab="Flow resistance")); @@ -52,16 +52,16 @@ transformation(extent={{-1,-18},{19,-38}}))); protected - parameter Modelica.SIunits.Volume VPipe=Modelica.Constants.pi*(diameter/2.0)^ + 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) - "Dynamic viscosity at nominal condition"; + 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"; 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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/BaseClasses/PlugFlow.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/BaseClasses/PlugFlow.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/BaseClasses/PlugFlow.mo" 2021-09-16 11:15:38.410780553 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/BaseClasses/PlugFlow.mo" 2021-09-16 11:18:30.030209092 +0200 @@ -3,27 +3,27 @@ "Lossless pipe model with spatialDistribution plug flow implementation" extends Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo" 2021-09-16 11:15:38.410780553 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo" 2021-09-16 11:18:29.998209199 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/BaseClasses/PlugFlowHeatLoss.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/BaseClasses/PlugFlowHeatLoss.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/BaseClasses/PlugFlowHeatLoss.mo" 2021-09-16 11:15:38.410780553 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/BaseClasses/PlugFlowHeatLoss.mo" 2021-09-16 11:18:29.942209388 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo" 2021-09-16 11:15:38.410780553 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo" 2021-09-16 11:18:29.914209482 +0200 @@ -1,34 +1,34 @@ within Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mo" 2021-09-16 11:15:38.410780553 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mo" 2021-09-16 11:18:29.654210355 +0200 @@ -4,16 +4,16 @@ replaceable package Medium = Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/CheckValve.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/CheckValve.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/CheckValve.mo" 2021-09-16 11:15:38.410780553 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/CheckValve.mo" 2021-09-16 11:18:29.630210436 +0200 @@ -10,12 +10,12 @@ extends Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/HydraulicDiameter.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/HydraulicDiameter.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/HydraulicDiameter.mo" 2021-09-16 11:15:38.414780540 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/HydraulicDiameter.mo" 2021-09-16 11:18:29.510210839 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Junction.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Junction.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Junction.mo" 2021-09-16 11:15:38.414780540 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Junction.mo" 2021-09-16 11:18:29.486210920 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Pipe.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Pipe.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Pipe.mo" 2021-09-16 11:15:38.414780540 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Pipe.mo" 2021-09-16 11:18:29.446211054 +0200 @@ -8,11 +8,11 @@ // dp.nominal=100 instead of the default dp.nominal=dp_nominal, // because the latter is ignored by Dymola 2012 FD 01. - 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.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, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/PlugFlowPipe.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/PlugFlowPipe.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/PlugFlowPipe.mo" 2021-09-16 11:15:38.414780540 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/PlugFlowPipe.mo" 2021-09-16 11:18:29.426211121 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/BaseClasses/PipeDataULg.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/BaseClasses/PipeDataULg.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/BaseClasses/PipeDataULg.mo" 2021-09-16 11:15:38.414780540 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/BaseClasses/PipeDataULg.mo" 2021-09-16 11:18:29.282211605 +0200 @@ -1,11 +1,11 @@ within Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT.mo" 2021-09-16 11:15:38.414780540 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT.mo" 2021-09-16 11:18:28.946212734 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT2Nodes.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT2Nodes.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT2Nodes.mo" 2021-09-16 11:15:38.414780540 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT2Nodes.mo" 2021-09-16 11:18:28.854213043 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mo" 2021-09-16 11:15:38.414780540 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mo" 2021-09-16 11:18:28.766213338 +0200 @@ -3,7 +3,7 @@ "Validation pipe against data from Austrian Institute of Technology" extends Modelica.Icons.Example; package Medium = Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowULg.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowULg.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowULg.mo" 2021-09-16 11:15:38.414780540 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowULg.mo" 2021-09-16 11:18:28.662213688 +0200 @@ -3,13 +3,13 @@ extends Modelica.Icons.Example; package Medium = Buildings.Media.Water; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 "Nominal mass flow rate, 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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Validation/PlugFlowPipes/TransportWaterAir.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Validation/PlugFlowPipes/TransportWaterAir.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Validation/PlugFlowPipes/TransportWaterAir.mo" 2021-09-16 11:15:38.414780540 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Validation/PlugFlowPipes/TransportWaterAir.mo" 2021-09-16 11:18:28.622213822 +0200 @@ -6,7 +6,7 @@ package MediumA = Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Validation/PressureDropsSeries.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Validation/PressureDropsSeries.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Validation/PressureDropsSeries.mo" 2021-09-16 11:15:38.414780540 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/FixedResistances/Validation/PressureDropsSeries.mo" 2021-09-16 11:18:28.554214051 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXOneUTube.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXOneUTube.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXOneUTube.mo" 2021-09-16 11:15:38.414780540 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXOneUTube.mo" 2021-09-16 11:18:28.486214279 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXTwoUTube.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXTwoUTube.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXTwoUTube.mo" 2021-09-16 11:15:38.414780540 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXTwoUTube.mo" 2021-09-16 11:18:28.466214346 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesOneUTube.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesOneUTube.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesOneUTube.mo" 2021-09-16 11:15:38.414780540 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesOneUTube.mo" 2021-09-16 11:18:28.434214453 +0200 @@ -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"; Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.InternalResistancesOneUTube intRes1UTub( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesTwoUTube.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesTwoUTube.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesTwoUTube.mo" 2021-09-16 11:15:38.414780540 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesTwoUTube.mo" 2021-09-16 11:18:28.418214507 +0200 @@ -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"; Buildings.HeatTransfer.Sources.FixedTemperature TWal(T=T_start) "Borehole wall temperature" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/ConvectionResistanceCircularPipe.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/ConvectionResistanceCircularPipe.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/ConvectionResistanceCircularPipe.mo" 2021-09-16 11:15:38.414780540 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/ConvectionResistanceCircularPipe.mo" 2021-09-16 11:18:28.374214655 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mo" 2021-09-16 11:15:38.414780540 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mo" 2021-09-16 11:18:28.358214708 +0200 @@ -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) = Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.internalResistancesOneUTube( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTubeNegative.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTubeNegative.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTubeNegative.mo" 2021-09-16 11:15:38.414780540 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTubeNegative.mo" 2021-09-16 11:18:28.338214776 +0200 @@ -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) = Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.internalResistancesOneUTube( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTube.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTube.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTube.mo" 2021-09-16 11:15:38.414780540 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTube.mo" 2021-09-16 11:18:28.318214843 +0200 @@ -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) = Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.internalResistancesTwoUTube( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTubeNegative.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTubeNegative.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTubeNegative.mo" 2021-09-16 11:15:38.414780540 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTubeNegative.mo" 2021-09-16 11:18:28.134215461 +0200 @@ -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) = Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.internalResistancesTwoUTube( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_OneUTube.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_OneUTube.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_OneUTube.mo" 2021-09-16 11:15:38.414780540 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_OneUTube.mo" 2021-09-16 11:18:28.110215542 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_TwoUTube.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_TwoUTube.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_TwoUTube.mo" 2021-09-16 11:15:38.414780540 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_TwoUTube.mo" 2021-09-16 11:18:28.090215609 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/convectionResistanceCircularPipe.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/convectionResistanceCircularPipe.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/convectionResistanceCircularPipe.mo" 2021-09-16 11:15:38.414780540 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/convectionResistanceCircularPipe.mo" 2021-09-16 11:18:28.066215690 +0200 @@ -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 = Buildings.Utilities.Math.Functions.spliceFunction(m_flow,-m_flow,m_flow,m_flow_nominal/30); + Modelica.Units.SI.MassFlowRate m_flow_abs = Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesOneUTube.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesOneUTube.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesOneUTube.mo" 2021-09-16 11:15:38.414780540 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesOneUTube.mo" 2021-09-16 11:18:28.026215824 +0200 @@ -5,22 +5,22 @@ Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesTwoUTube.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesTwoUTube.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesTwoUTube.mo" 2021-09-16 11:15:38.414780540 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesTwoUTube.mo" 2021-09-16 11:18:28.006215891 +0200 @@ -5,32 +5,32 @@ Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFluidTemperature.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFluidTemperature.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFluidTemperature.mo" 2021-09-16 11:15:38.414780540 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFluidTemperature.mo" 2021-09-16 11:18:27.982215972 +0200 @@ -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) := - Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.multipoleFmk( - nPip, - J, - QPip_flow, - PRea, - PIma, - rBor, - rPip, - xPip, - yPip, - kFil, - kSoi); + (FRea, FIma) := Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFmk.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFmk.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFmk.mo" 2021-09-16 11:15:38.414780540 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFmk.mo" 2021-09-16 11:18:27.950216079 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleThermalResistances.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleThermalResistances.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleThermalResistances.mo" 2021-09-16 11:15:38.414780540 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleThermalResistances.mo" 2021-09-16 11:18:27.930216146 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/partialInternalResistances.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/partialInternalResistances.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/partialInternalResistances.mo" 2021-09-16 11:15:38.414780540 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/partialInternalResistances.mo" 2021-09-16 11:18:27.914216200 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesOneUTube.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesOneUTube.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesOneUTube.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesOneUTube.mo" 2021-09-16 11:18:27.842216442 +0200 @@ -4,8 +4,8 @@ extends Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesTwoUTube.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesTwoUTube.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesTwoUTube.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesTwoUTube.mo" 2021-09-16 11:18:27.814216536 +0200 @@ -4,11 +4,11 @@ extends Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialBorehole.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialBorehole.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialBorehole.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialBorehole.mo" 2021-09-16 11:18:27.754216738 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalHEX.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalHEX.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalHEX.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalHEX.mo" 2021-09-16 11:18:27.734216805 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalResistances.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalResistances.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalResistances.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalResistances.mo" 2021-09-16 11:18:27.718216859 +0200 @@ -1,15 +1,15 @@ within Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BaseClasses/PartialBorehole.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BaseClasses/PartialBorehole.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BaseClasses/PartialBorehole.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BaseClasses/PartialBorehole.mo" 2021-09-16 11:18:27.682216979 +0200 @@ -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 Buildings.Fluid.Geothermal.Borefields.Data.Borefield.Example diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeDynamics.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeDynamics.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeDynamics.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeDynamics.mo" 2021-09-16 11:18:27.662217047 +0200 @@ -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"; Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.OneUTube diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Cylindrical.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Cylindrical.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Cylindrical.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Cylindrical.mo" 2021-09-16 11:18:27.542217449 +0200 @@ -4,14 +4,14 @@ parameter Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/GroundTemperatureResponse.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/GroundTemperatureResponse.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/GroundTemperatureResponse.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/GroundTemperatureResponse.mo" 2021-09-16 11:18:27.314218215 +0200 @@ -1,6 +1,6 @@ within Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationCellTimes.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationCellTimes.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationCellTimes.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationCellTimes.mo" 2021-09-16 11:18:27.246218444 +0200 @@ -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) = Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.LoadAggregation.aggregationCellTimes( i=i, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationWeightingFactors.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationWeightingFactors.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationWeightingFactors.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationWeightingFactors.mo" 2021-09-16 11:18:27.230218497 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/ShiftAggregationCells.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/ShiftAggregationCells.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/ShiftAggregationCells.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/ShiftAggregationCells.mo" 2021-09-16 11:18:27.202218591 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemperatureResponseMatrix.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemperatureResponseMatrix.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemperatureResponseMatrix.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemperatureResponseMatrix.mo" 2021-09-16 11:18:27.186218645 +0200 @@ -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]= Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemporalSuperposition.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemporalSuperposition.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemporalSuperposition.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemporalSuperposition.mo" 2021-09-16 11:18:27.170218699 +0200 @@ -2,13 +2,13 @@ model TemporalSuperposition "This validation case applies temporal superposition with truncated vectors" extends Modelica.Icons.Example; - parameter Modelica.SIunits.TemperatureDifference supPos = Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.LoadAggregation.temporalSuperposition( + + parameter Modelica.Units.SI.TemperatureDifference supPos = Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationCellTimes.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationCellTimes.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationCellTimes.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationCellTimes.mo" 2021-09-16 11:18:27.158218739 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationWeightingFactors.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationWeightingFactors.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationWeightingFactors.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationWeightingFactors.mo" 2021-09-16 11:18:27.142218793 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/countAggregationCells.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/countAggregationCells.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/countAggregationCells.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/countAggregationCells.mo" 2021-09-16 11:18:27.126218846 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/shiftAggregationCells.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/shiftAggregationCells.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/shiftAggregationCells.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/shiftAggregationCells.mo" 2021-09-16 11:18:27.114218887 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temperatureResponseMatrix.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temperatureResponseMatrix.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temperatureResponseMatrix.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temperatureResponseMatrix.mo" 2021-09-16 11:18:27.094218955 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temporalSuperposition.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temporalSuperposition.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temporalSuperposition.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temporalSuperposition.mo" 2021-09-16 11:18:27.070219035 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/CylindricalHeatSource.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/CylindricalHeatSource.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/CylindricalHeatSource.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/CylindricalHeatSource.mo" 2021-09-16 11:18:27.030219170 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource.mo" 2021-09-16 11:18:27.010219237 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Integrand.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Integrand.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Integrand.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Integrand.mo" 2021-09-16 11:18:26.986219317 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Integrand_Length.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Integrand_Length.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Integrand_Length.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Integrand_Length.mo" 2021-09-16 11:18:26.974219358 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_100boreholes.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_100boreholes.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_100boreholes.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_100boreholes.mo" 2021-09-16 11:18:26.962219398 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_1borehole_5meters.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_1borehole_5meters.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_1borehole_5meters.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_1borehole_5meters.mo" 2021-09-16 11:18:26.942219465 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_SmallScaleValidation.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_SmallScaleValidation.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_SmallScaleValidation.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_SmallScaleValidation.mo" 2021-09-16 11:18:26.922219532 +0200 @@ -6,12 +6,12 @@ parameter Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/InfiniteLineSource.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/InfiniteLineSource.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/InfiniteLineSource.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/InfiniteLineSource.mo" 2021-09-16 11:18:26.906219586 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/TimeGeometric.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/TimeGeometric.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/TimeGeometric.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/TimeGeometric.mo" 2021-09-16 11:18:26.886219653 +0200 @@ -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 = Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.timeGeometric( dt=dt, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/cylindricalHeatSource.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/cylindricalHeatSource.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/cylindricalHeatSource.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/cylindricalHeatSource.mo" 2021-09-16 11:18:26.874219693 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource.mo" 2021-09-16 11:18:26.854219760 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource_Integrand.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource_Integrand.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource_Integrand.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource_Integrand.mo" 2021-09-16 11:18:26.826219854 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/gFunction.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/gFunction.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/gFunction.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/gFunction.mo" 2021-09-16 11:18:26.814219895 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/shaGFunction.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/shaGFunction.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/shaGFunction.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/shaGFunction.mo" 2021-09-16 11:18:26.610220580 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/timeGeometric.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/timeGeometric.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/timeGeometric.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/timeGeometric.mo" 2021-09-16 11:18:26.598220620 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/Cylindrical.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/Cylindrical.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/Cylindrical.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/Cylindrical.mo" 2021-09-16 11:18:26.502220943 +0200 @@ -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 Buildings.Fluid.Geothermal.Borefields.Data.Borefield.Template borFieDat= Buildings.Fluid.Geothermal.Borefields.Validation.BaseClasses.SandBox_Borefield() diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/FiniteDifference_1Week.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/FiniteDifference_1Week.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/FiniteDifference_1Week.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/FiniteDifference_1Week.mo" 2021-09-16 11:18:26.486220996 +0200 @@ -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"; Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/PartialBorefield.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/PartialBorefield.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/PartialBorefield.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/BaseClasses/PartialBorefield.mo" 2021-09-16 11:18:26.450221117 +0200 @@ -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"; Buildings.Fluid.BaseClasses.MassFlowRateMultiplier masFloDiv( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/Data/Configuration/Template.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/Data/Configuration/Template.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/Data/Configuration/Template.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/Data/Configuration/Template.mo" 2021-09-16 11:18:26.330221520 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/Data/Filling/Template.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/Data/Filling/Template.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/Data/Filling/Template.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/Data/Filling/Template.mo" 2021-09-16 11:18:26.286221668 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/Data/Soil/Template.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/Data/Soil/Template.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/Data/Soil/Template.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/Data/Soil/Template.mo" 2021-09-16 11:18:26.242221816 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/Examples/Borefields.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/Examples/Borefields.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/Examples/Borefields.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/Examples/Borefields.mo" 2021-09-16 11:18:26.226221870 +0200 @@ -5,10 +5,10 @@ package Medium = Buildings.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"; Buildings.Fluid.Geothermal.Borefields.TwoUTubes borFie2UTubPar( redeclare package Medium = Medium, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/Examples/RectangularBorefield.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/Examples/RectangularBorefield.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/Examples/RectangularBorefield.mo" 2021-09-16 11:15:38.418780528 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/Examples/RectangularBorefield.mo" 2021-09-16 11:18:26.194221977 +0200 @@ -4,25 +4,25 @@ package Medium = Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/Validation/ConstantHeatInjection_100Boreholes.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/Validation/ConstantHeatInjection_100Boreholes.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/Validation/ConstantHeatInjection_100Boreholes.mo" 2021-09-16 11:15:38.422780513 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/Validation/ConstantHeatInjection_100Boreholes.mo" 2021-09-16 11:18:25.870223065 +0200 @@ -4,7 +4,7 @@ extends Modelica.Icons.Example; package Medium = Buildings.Media.Water; - parameter Modelica.SIunits.Temperature T_start = 273.15 + parameter Modelica.Units.SI.Temperature T_start = 273.15 "Initial temperature of the soil"; Buildings.Fluid.Geothermal.Borefields.OneUTube borHol( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/Validation/Sandbox.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/Validation/Sandbox.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/Validation/Sandbox.mo" 2021-09-16 11:15:38.422780513 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Borefields/Validation/Sandbox.mo" 2021-09-16 11:18:25.834223186 +0200 @@ -3,7 +3,7 @@ extends Modelica.Icons.Example; package Medium = Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/BoreholeSegment.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/BoreholeSegment.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/BoreholeSegment.mo" 2021-09-16 11:15:38.422780513 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/BoreholeSegment.mo" 2021-09-16 11:18:25.774223387 +0200 @@ -26,35 +26,35 @@ annotation (choicesAllMatching=true, Dialog(group="Filling material"), Placement(transformation(extent={{-68,70},{-48,90}}))); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate" annotation(Dialog(group = "Nominal condition")); - parameter Modelica.SIunits.MassFlowRate m_flow_small(min=0) = 1E-4*abs(m_flow_nominal) + parameter Modelica.Units.SI.MassFlowRate m_flow_small(min=0) = 1E-4*abs(m_flow_nominal) "Small mass flow rate for regularization of zero flow" annotation(Dialog(tab = "Advanced")); - parameter Modelica.SIunits.Radius rTub=0.02 "Radius of the tubes" + parameter Modelica.Units.SI.Radius rTub=0.02 "Radius of the tubes" annotation (Dialog(group="Tubes")); - parameter Modelica.SIunits.ThermalConductivity kTub=0.5 + parameter Modelica.Units.SI.ThermalConductivity kTub=0.5 "Thermal conductivity of the tubes" annotation (Dialog(group="Tubes")); - parameter Modelica.SIunits.Length eTub=0.002 "Thickness of the tubes" + parameter Modelica.Units.SI.Length eTub=0.002 "Thickness of the tubes" annotation (Dialog(group="Tubes")); - parameter Modelica.SIunits.Temperature TFil_start=283.15 + parameter Modelica.Units.SI.Temperature TFil_start=283.15 "Initial temperature of the filling material" annotation (Dialog(group="Filling material")); - parameter Modelica.SIunits.Radius rExt=3 + parameter Modelica.Units.SI.Radius rExt=3 "Radius of the soil used for the external boundary condition" annotation (Dialog(group="Soil")); - parameter Modelica.SIunits.Temperature TExt_start=283.15 + parameter Modelica.Units.SI.Temperature TExt_start=283.15 "Initial far field temperature" annotation (Dialog(group="Soil")); parameter Integer nSta(min=1) = 10 "Number of state variables in the soil" annotation (Dialog(group="Soil")); - parameter Modelica.SIunits.Time samplePeriod=604800 + parameter Modelica.Units.SI.Time samplePeriod=604800 "Sample period for the external boundary condition" annotation (Dialog(group="Soil")); - parameter Modelica.SIunits.Radius rBor=0.1 "Radius of the borehole"; - parameter Modelica.SIunits.Height hSeg "Height of the element"; - parameter Modelica.SIunits.Length xC=0.05 + parameter Modelica.Units.SI.Radius rBor=0.1 "Radius of the borehole"; + parameter Modelica.Units.SI.Height hSeg "Height of the element"; + parameter Modelica.Units.SI.Length xC=0.05 "Shank spacing, defined as the distance between the center of a pipe and the center of the borehole"; parameter Boolean allowFlowReversal = true diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/Examples/ConvectionResistance.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/Examples/ConvectionResistance.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/Examples/ConvectionResistance.mo" 2021-09-16 11:15:38.422780513 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/Examples/ConvectionResistance.mo" 2021-09-16 11:18:25.698223643 +0200 @@ -4,26 +4,26 @@ extends Modelica.Icons.Example; package Medium = Buildings.Media.Water "Medium in the pipes"; - 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 mueMed=Medium.dynamicViscosity( + parameter Modelica.Units.SI.DynamicViscosity mueMed=Medium.dynamicViscosity( Medium.setState_pTX( Medium.p_default, Medium.T_default, Medium.X_default)) "Dynamic viscosity of the fluid"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 3000/10/4200 "Nominal mass flow rate"; - Modelica.SIunits.MassFlowRate m_flow "Mass flow rate"; - Modelica.SIunits.ThermalResistance R + Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate"; + Modelica.Units.SI.ThermalResistance R "Thermal resistance between the fluid and the tube"; protected constant Real conv(unit="1/s")=1 "Conversion factor"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/Examples/SingleUTubeBoundaryCondition.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/Examples/SingleUTubeBoundaryCondition.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/Examples/SingleUTubeBoundaryCondition.mo" 2021-09-16 11:15:38.422780513 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/Examples/SingleUTubeBoundaryCondition.mo" 2021-09-16 11:18:25.646223817 +0200 @@ -2,7 +2,7 @@ model SingleUTubeBoundaryCondition "Test model the temperature boundary condition of a single U tube heat exchanger" extends Modelica.Icons.Example; - parameter Modelica.SIunits.HeatFlowRate Q_flow=-50 + parameter Modelica.Units.SI.HeatFlowRate Q_flow=-50 "Heat flow rate extracted at center of cylinder"; Buildings.Fluid.Geothermal.Boreholes.BaseClasses.SingleUTubeBoundaryCondition TBouSte( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/Examples/SingleUTubeResistances.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/Examples/SingleUTubeResistances.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/Examples/SingleUTubeResistances.mo" 2021-09-16 11:15:38.422780513 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/Examples/SingleUTubeResistances.mo" 2021-09-16 11:18:25.626223884 +0200 @@ -13,23 +13,23 @@ annotation (choicesAllMatching=true, Dialog(group="Filling material"), Placement(transformation(extent={{-68,70},{-48,90}}))); - parameter Modelica.SIunits.Height hSeg=1 "Height of the element"; - parameter Modelica.SIunits.Radius rBor=0.2 "Radius of the borehole"; - parameter Modelica.SIunits.Radius rTub=0.02 "Radius of the tubes" + parameter Modelica.Units.SI.Height hSeg=1 "Height of the element"; + parameter Modelica.Units.SI.Radius rBor=0.2 "Radius of the borehole"; + parameter Modelica.Units.SI.Radius rTub=0.02 "Radius of the tubes" annotation(Dialog(group="Tubes")); - parameter Modelica.SIunits.ThermalConductivity kTub=0.5 + parameter Modelica.Units.SI.ThermalConductivity kTub=0.5 "Thermal conductivity of the tube" annotation (Dialog(group="Tubes")); - parameter Modelica.SIunits.Length eTub=0.002 "Thickness of a tube" + parameter Modelica.Units.SI.Length eTub=0.002 "Thickness of a tube" annotation (Dialog(group="Tubes")); - parameter Modelica.SIunits.Length xC=0.05 + parameter Modelica.Units.SI.Length xC=0.05 "Shank spacing, defined as the distance between the center of a pipe and the center of the borehole" annotation(Dialog(group="Borehole")); - 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 of the pipe wall"; parameter Real x(fixed=false) "Capacity location"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/HexInternalElement.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/HexInternalElement.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/HexInternalElement.mo" 2021-09-16 11:15:38.422780513 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/HexInternalElement.mo" 2021-09-16 11:18:25.590224005 +0200 @@ -30,23 +30,23 @@ annotation (choicesAllMatching=true, Dialog(group="Soil"), Placement(transformation(extent={{66,74},{86,94}}))); - parameter Modelica.SIunits.Radius rTub=0.02 "Radius of the tubes" + parameter Modelica.Units.SI.Radius rTub=0.02 "Radius of the tubes" annotation (Dialog(group="Pipes")); - parameter Modelica.SIunits.ThermalConductivity kTub=0.5 + parameter Modelica.Units.SI.ThermalConductivity kTub=0.5 "Thermal conductivity of the tubes" annotation (Dialog(group="Pipes")); - parameter Modelica.SIunits.Length eTub=0.002 "Thickness of the tubes" + parameter Modelica.Units.SI.Length eTub=0.002 "Thickness of the tubes" annotation (Dialog(group="Pipes")); - parameter Modelica.SIunits.ThermalConductivity kSoi + parameter Modelica.Units.SI.ThermalConductivity kSoi "Thermal conductivity of the soil used for the calculation of the internal interference resistance"; - parameter Modelica.SIunits.Temperature TFil_start=283.15 + parameter Modelica.Units.SI.Temperature TFil_start=283.15 "Initial temperature of the filling material" annotation (Dialog(group="Filling material")); - parameter Modelica.SIunits.Height hSeg "Height of the element"; - parameter Modelica.SIunits.Radius rBor "Radius of the borehole"; + parameter Modelica.Units.SI.Height hSeg "Height of the element"; + parameter Modelica.Units.SI.Radius rBor "Radius of the borehole"; - parameter Modelica.SIunits.Length xC=0.05 + parameter Modelica.Units.SI.Length xC=0.05 "Shank spacing, defined as half the center-to-center distance between the two pipes"; Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port @@ -73,35 +73,35 @@ origin={72,8}))); protected - final parameter Modelica.SIunits.SpecificHeatCapacity cpFil=matFil.c + final parameter Modelica.Units.SI.SpecificHeatCapacity cpFil=matFil.c "Specific heat capacity of the filling material"; - final parameter Modelica.SIunits.ThermalConductivity kFil=matFil.k + final parameter Modelica.Units.SI.ThermalConductivity kFil=matFil.k "Thermal conductivity of the filling material"; - final parameter Modelica.SIunits.Density dFil=matFil.d + final parameter Modelica.Units.SI.Density dFil=matFil.d "Density of the filling material"; - parameter Modelica.SIunits.HeatCapacity + parameter Modelica.Units.SI.HeatCapacity Co_fil=dFil*cpFil*hSeg*Modelica.Constants.pi*(rBor^2 - 2*(rTub + eTub)^2) "Heat capacity of the filling material"; - 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 mueMed=Medium.dynamicViscosity( + parameter Modelica.Units.SI.DynamicViscosity mueMed=Medium.dynamicViscosity( Medium.setState_pTX( Medium.p_default, Medium.T_default, Medium.X_default)) "Dynamic viscosity of the fluid"; - parameter Modelica.SIunits.ThermalResistance Rgb_val(fixed=false) + parameter Modelica.Units.SI.ThermalResistance Rgb_val(fixed=false) "Thermal resistance between grout zone and borehole wall"; - parameter Modelica.SIunits.ThermalResistance Rgg_val(fixed=false) + parameter Modelica.Units.SI.ThermalResistance Rgg_val(fixed=false) "Thermal resistance between the two grout zones"; - parameter Modelica.SIunits.ThermalResistance RCondGro_val(fixed=false) + parameter Modelica.Units.SI.ThermalResistance RCondGro_val(fixed=false) "Thermal resistance of the pipe wall"; parameter Real x(fixed=false) "Capacity location"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/SingleUTubeBoundaryCondition.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/SingleUTubeBoundaryCondition.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/SingleUTubeBoundaryCondition.mo" 2021-09-16 11:15:38.422780513 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/SingleUTubeBoundaryCondition.mo" 2021-09-16 11:18:25.518224247 +0200 @@ -4,16 +4,16 @@ replaceable parameter Buildings.HeatTransfer.Data.Soil.Generic matSoi "Thermal properties of the soil" annotation (choicesAllMatching=true); - parameter Modelica.SIunits.Radius rExt=3 + parameter Modelica.Units.SI.Radius rExt=3 "Distance from the brine where the calculation is performed"; - parameter Modelica.SIunits.Height hSeg=10 "Height of the segment"; - parameter Modelica.SIunits.Temperature TExt_start=283.15 + parameter Modelica.Units.SI.Height hSeg=10 "Height of the segment"; + parameter Modelica.Units.SI.Temperature TExt_start=283.15 "Initial external temperature"; - parameter Modelica.SIunits.Time samplePeriod=604800 + parameter Modelica.Units.SI.Time samplePeriod=604800 "Period between two samples"; ExtendableArray table=ExtendableArray() "Extentable array, used to store history of rate of heat flows"; - Modelica.SIunits.HeatFlowRate QAve_flow + Modelica.Units.SI.HeatFlowRate QAve_flow "Average heat flux over a time period"; Modelica.Blocks.Interfaces.RealInput Q_flow(unit="W") "Heat flow rate at the center of the borehole, positive if heat is added to soil" @@ -23,15 +23,15 @@ {106,10}}), iconTransformation(extent={{86,-10}, {106,10}}))); protected - final parameter Modelica.SIunits.SpecificHeatCapacity c= matSoi.c + final parameter Modelica.Units.SI.SpecificHeatCapacity c= matSoi.c "Specific heat capacity of the soil"; - final parameter Modelica.SIunits.ThermalConductivity k= matSoi.k + final parameter Modelica.Units.SI.ThermalConductivity k= matSoi.k "Thermal conductivity of the soil"; - final parameter Modelica.SIunits.Density d = matSoi.d "Density of the soil"; - Modelica.SIunits.Energy UOld "Internal energy at the previous period"; - Modelica.SIunits.Energy U + final parameter Modelica.Units.SI.Density d = matSoi.d "Density of the soil"; + Modelica.Units.SI.Energy UOld "Internal energy at the previous period"; + Modelica.Units.SI.Energy U "Current internal energy, defined as U=0 for t=tStart"; - final parameter Modelica.SIunits.Time startTime(fixed=false) + final parameter Modelica.Units.SI.Time startTime(fixed=false) "Start time of the simulation"; Integer iSam(min=1) "Counter for how many time the model was sampled. Defined as iSam=1 when called at t=0"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/convectionResistance.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/convectionResistance.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/convectionResistance.mo" 2021-09-16 11:15:38.422780513 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/convectionResistance.mo" 2021-09-16 11:18:25.494224328 +0200 @@ -3,26 +3,26 @@ "Thermal resistance between the fluid and the tube" // Geometry of the borehole - input Modelica.SIunits.Height hSeg "Height of the element"; - input Modelica.SIunits.Radius rTub "Tube radius"; + input Modelica.Units.SI.Height hSeg "Height of the element"; + input Modelica.Units.SI.Radius rTub "Tube radius"; // Thermal properties - input Modelica.SIunits.ThermalConductivity kMed + input Modelica.Units.SI.ThermalConductivity kMed "Thermal conductivity of the fluid"; - input Modelica.SIunits.DynamicViscosity mueMed + input Modelica.Units.SI.DynamicViscosity mueMed "Dynamic viscosity of the fluid"; - input Modelica.SIunits.SpecificHeatCapacity cpMed + input Modelica.Units.SI.SpecificHeatCapacity cpMed "Specific heat capacity of the fluid"; // Mass flow rates - 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 R + output Modelica.Units.SI.ThermalResistance R "Thermal resistance between the fluid and the tube"; protected - Modelica.SIunits.CoefficientOfHeatTransfer h + Modelica.Units.SI.CoefficientOfHeatTransfer h "Convective heat transfer coefficient of the fluid"; Real k(unit="s/kg") diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/singleUTubeResistances.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/singleUTubeResistances.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/singleUTubeResistances.mo" 2021-09-16 11:15:38.422780513 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/singleUTubeResistances.mo" 2021-09-16 11:18:25.454224462 +0200 @@ -2,39 +2,39 @@ function singleUTubeResistances "Thermal resistances for single U-tube" // Geometry of the borehole - 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 xC + 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 xC "Shank spacing, defined as the distance between the center of a pipe and the center of the borehole"; // Thermal properties - input Modelica.SIunits.ThermalConductivity kSoi + input Modelica.Units.SI.ThermalConductivity kSoi "Thermal conductivity of the soi"; - input Modelica.SIunits.ThermalConductivity kFil + input Modelica.Units.SI.ThermalConductivity kFil "Thermal conductivity of the grout"; - input Modelica.SIunits.ThermalConductivity kTub + input Modelica.Units.SI.ThermalConductivity kTub "Thermal conductivity of the tube"; // Outputs - output Modelica.SIunits.ThermalResistance Rgb + output Modelica.Units.SI.ThermalResistance Rgb "Thermal resistance between the grout zone and the 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 the pipe wall ant the capacity in the grout"; output Real x "Capacity location"; protected Boolean test=false "Thermodynamic test for R and x value"; - 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"; - Modelica.SIunits.ThermalResistance RCondPipe + Modelica.Units.SI.ThermalResistance RCondPipe "Thermal resistance of the pipe wall"; Real Rb diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/temperatureDrop.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/temperatureDrop.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/temperatureDrop.mo" 2021-09-16 11:15:38.422780513 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/BaseClasses/temperatureDrop.mo" 2021-09-16 11:18:25.422224570 +0200 @@ -6,24 +6,24 @@ input Integer iSam(min=1) "Counter for how many time the model was sampled. Defined as iSam=1 when called at t=0"; -input Modelica.SIunits.HeatFlowRate Q_flow +input Modelica.Units.SI.HeatFlowRate Q_flow "Heat flow rate to be stored in the external object"; -input Modelica.SIunits.Time samplePeriod "Period between two samples"; -input Modelica.SIunits.Radius rExt "External radius of the cylinder"; -input Modelica.SIunits.Height hSeg "Height of the cylinder"; -input Modelica.SIunits.ThermalConductivity k "Thermal conductivity of the soil"; -input Modelica.SIunits.Density d "Density of the soil"; -input Modelica.SIunits.SpecificHeatCapacity c +input Modelica.Units.SI.Time samplePeriod "Period between two samples"; +input Modelica.Units.SI.Radius rExt "External radius of the cylinder"; +input Modelica.Units.SI.Height hSeg "Height of the cylinder"; +input Modelica.Units.SI.ThermalConductivity k "Thermal conductivity of the soil"; +input Modelica.Units.SI.Density d "Density of the soil"; +input Modelica.Units.SI.SpecificHeatCapacity c "Specific heat capacity of the soil"; -output Modelica.SIunits.TemperatureDifference dT "Temperature drop of the soil"; +output Modelica.Units.SI.TemperatureDifference dT "Temperature drop of the soil"; protected - Modelica.SIunits.Time minSamplePeriod= rExt^2/(4*(k/c/d)*3.8) + + Modelica.Units.SI.Time minSamplePeriod= rExt^2/(4*(k/c/d)*3.8) "Minimal length of the sampling period"; - Modelica.SIunits.HeatFlowRate QL_flow + Modelica.Units.SI.HeatFlowRate QL_flow "Intermediate variable for heat flow rate at the lower bound of the time interval"; - Modelica.SIunits.HeatFlowRate QU_flow + Modelica.Units.SI.HeatFlowRate QU_flow "Intermediate variable for heat flow rate at the upper bound of the time interval"; - algorithm assert(rExt*rExt/(4*(k/c/d)*samplePeriod)<=3.8, "The samplePeriod has to be bigger than " + String(minSamplePeriod) + " for convergence purpose. diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/UTube.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/UTube.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/UTube.mo" 2021-09-16 11:15:38.422780513 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Geothermal/Boreholes/UTube.mo" 2021-09-16 11:18:25.378224717 +0200 @@ -18,53 +18,53 @@ annotation (choicesAllMatching=true, Dialog(group="Borehole"), Placement(transformation(extent={{-68,70},{-48,90}}))); - parameter Modelica.SIunits.Radius rTub=0.02 "Radius of the tubes" + parameter Modelica.Units.SI.Radius rTub=0.02 "Radius of the tubes" annotation(Dialog(group="Tubes")); - parameter Modelica.SIunits.ThermalConductivity kTub=0.5 + parameter Modelica.Units.SI.ThermalConductivity kTub=0.5 "Thermal conductivity of the tube" annotation (Dialog(group="Tubes")); - parameter Modelica.SIunits.Length eTub=0.002 "Thickness of a tube" + parameter Modelica.Units.SI.Length eTub=0.002 "Thickness of a tube" annotation (Dialog(group="Tubes")); - 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 Integer nVer=10 "Number of segments used for discretization in the vertical direction" annotation(Dialog(group="Borehole")); - parameter Modelica.SIunits.Radius rBor=0.1 "Radius of the borehole"; + parameter Modelica.Units.SI.Radius rBor=0.1 "Radius of the borehole"; - parameter Modelica.SIunits.Radius rExt=3 + parameter Modelica.Units.SI.Radius rExt=3 "Radius of the soil used for the external boundary condition" annotation (Dialog(group="Soil")); parameter Integer nHor(min=1) = 10 "Number of state variables in each horizontal layer of the soil" annotation (Dialog(group="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="Initial temperature", group="Soil")); - parameter Modelica.SIunits.Temperature TExt_start[nVer]={if z[i] >= z0 then + parameter Modelica.Units.SI.Temperature TExt_start[nVer]={if z[i] >= z0 then TExt0_start + (z[i] - z0)*dT_dz else TExt0_start for i in 1:nVer} "Temperature of the undisturbed ground" annotation (Dialog(tab="Initial temperature", group="Soil")); - parameter Modelica.SIunits.Temperature TFil0_start=TExt0_start + parameter Modelica.Units.SI.Temperature TFil0_start=TExt0_start "Initial temperature of the filling material for h = 0...z0" annotation (Dialog(tab="Initial temperature", group="Filling material")); - parameter Modelica.SIunits.Temperature TFil_start[nVer]=TExt_start + parameter Modelica.Units.SI.Temperature TFil_start[nVer]=TExt_start "Temperature of the undisturbed ground" annotation (Dialog(tab="Initial temperature", group="Filling material")); - parameter Modelica.SIunits.Height z0=10 + parameter Modelica.Units.SI.Height z0=10 "Depth below which the temperature gradient starts" annotation (Dialog(tab="Initial temperature", group="Temperature profile")); parameter Real dT_dz(unit="K/m") = 0.01 "Vertical temperature gradient of the undisturbed soil for h below z0" annotation (Dialog(tab="Initial temperature", group="Temperature profile")); - parameter Modelica.SIunits.Time samplePeriod + parameter Modelica.Units.SI.Time samplePeriod "Sample period for the external boundary condition" annotation (Dialog(group="Soil")); - parameter Modelica.SIunits.Length xC=0.05 + parameter Modelica.Units.SI.Length xC=0.05 "Shank spacing, defined as the distance between the center of a pipe and the center of the borehole" annotation(Dialog(group="Borehole")); parameter Real B0=17.44 "Shape coefficient for grout resistance" @@ -106,12 +106,12 @@ each allowFlowReversal=allowFlowReversal) "Discretized borehole segments" annotation (Placement(transformation(extent={{-20,-10},{0,10}}))); - Modelica.SIunits.Temperature Tdown[nVer] "Medium temperature in pipe 1"; - Modelica.SIunits.Temperature Tup[nVer] "Medium temperature in pipe 2"; + Modelica.Units.SI.Temperature Tdown[nVer] "Medium temperature in pipe 1"; + Modelica.Units.SI.Temperature Tup[nVer] "Medium temperature in pipe 2"; protected - parameter Modelica.SIunits.Height z[nVer]={hBor/nVer*(i - 0.5) for i in 1: - nVer} "Distance from the surface to the considered segment"; + parameter Modelica.Units.SI.Height z[nVer]={hBor/nVer*(i - 0.5) for i in 1: + nVer} "Distance from the surface to the considered segment"; 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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Convector.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Convector.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Convector.mo" 2021-09-16 11:15:38.422780513 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Convector.mo" 2021-09-16 11:18:25.142225510 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/DerivateCubicSpline.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/DerivateCubicSpline.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/DerivateCubicSpline.mo" 2021-09-16 11:15:38.422780513 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/DerivateCubicSpline.mo" 2021-09-16 11:18:25.070225752 +0200 @@ -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}}))); Buildings.Fluid.HeatExchangers.ActiveBeams.BaseClasses.DerivativesCubicSpline cubSpl "Derivatives of cubic spline" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/HeatExchangers/ActiveBeams/Cooling.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/HeatExchangers/ActiveBeams/Cooling.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/HeatExchangers/ActiveBeams/Cooling.mo" 2021-09-16 11:15:38.422780513 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/HeatExchangers/ActiveBeams/Cooling.mo" 2021-09-16 11:18:25.010225953 +0200 @@ -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")); @@ -133,10 +133,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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/HeatExchangers/ActiveBeams/CoolingAndHeating.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/HeatExchangers/ActiveBeams/CoolingAndHeating.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/HeatExchangers/ActiveBeams/CoolingAndHeating.mo" 2021-09-16 11:15:38.422780513 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/HeatExchangers/ActiveBeams/CoolingAndHeating.mo" 2021-09-16 11:18:24.962226114 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/HeatExchangers/ActiveBeams/Data/Generic.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/HeatExchangers/ActiveBeams/Data/Generic.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/HeatExchangers/ActiveBeams/Data/Generic.mo" 2021-09-16 11:15:38.422780513 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/HeatExchangers/ActiveBeams/Data/Generic.mo" 2021-09-16 11:18:24.878226396 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/BaseClasses/Characteristics/flowParameters.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/BaseClasses/Characteristics/flowParameters.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/BaseClasses/Characteristics/flowParameters.mo" 2021-09-16 11:15:38.442780447 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/BaseClasses/Characteristics/flowParameters.mo" 2021-09-16 11:18:11.422271551 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/BaseClasses/Characteristics/flowParametersInternal.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/BaseClasses/Characteristics/flowParametersInternal.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/BaseClasses/Characteristics/flowParametersInternal.mo" 2021-09-16 11:15:38.442780447 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/BaseClasses/Characteristics/flowParametersInternal.mo" 2021-09-16 11:18:11.410271592 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/BaseClasses/Characteristics/power.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/BaseClasses/Characteristics/power.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/BaseClasses/Characteristics/power.mo" 2021-09-16 11:15:38.442780447 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/BaseClasses/Characteristics/power.mo" 2021-09-16 11:18:11.398271633 +0200 @@ -3,16 +3,16 @@ extends Modelica.Icons.Function; input Buildings.Fluid.Movers.BaseClasses.Characteristics.powerParameters per "Pressure performance data"; - input Modelica.SIunits.VolumeFlowRate V_flow "Volumetric flow rate"; + input Modelica.Units.SI.VolumeFlowRate V_flow "Volumetric flow rate"; input Real r_N(unit="1") "Relative revolution, r_N=N/N_nominal"; input Real d[:] "Derivatives at support points for spline interpolation"; input Real delta "Small value for switching implementation around zero rpm"; - output Modelica.SIunits.Power P "Power consumption"; + output Modelica.Units.SI.Power P "Power consumption"; protected Integer n=size(per.V_flow, 1) "Dimension of data vector"; - Modelica.SIunits.VolumeFlowRate rat "Ratio of V_flow/r_N"; + Modelica.Units.SI.VolumeFlowRate rat "Ratio of V_flow/r_N"; Integer i "Integer to select data interval"; algorithm diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/BaseClasses/Characteristics/powerParameters.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/BaseClasses/Characteristics/powerParameters.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/BaseClasses/Characteristics/powerParameters.mo" 2021-09-16 11:15:38.442780447 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/BaseClasses/Characteristics/powerParameters.mo" 2021-09-16 11:18:11.382271686 +0200 @@ -1,9 +1,9 @@ within Buildings.Fluid.Movers.BaseClasses.Characteristics; record powerParameters "Record for electrical power parameters" extends Modelica.Icons.Record; - parameter Modelica.SIunits.VolumeFlowRate V_flow[:](each min=0) + parameter Modelica.Units.SI.VolumeFlowRate V_flow[:](each min=0) "Volume flow rate at user-selected operating points"; - parameter Modelica.SIunits.Power P[size(V_flow,1)](each min=0) + parameter Modelica.Units.SI.Power P[size(V_flow,1)](each min=0) "Fan or pump electrical power at these flow rates"; annotation (Documentation(info="
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/BaseClasses/Characteristics/pressure.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/BaseClasses/Characteristics/pressure.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/BaseClasses/Characteristics/pressure.mo" 2021-09-16 11:15:38.442780447 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/BaseClasses/Characteristics/pressure.mo" 2021-09-16 11:18:11.370271727 +0200 @@ -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 Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/BaseClasses/FlowMachineInterface.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/BaseClasses/FlowMachineInterface.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/BaseClasses/FlowMachineInterface.mo" 2021-09-16 11:15:38.442780447 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/BaseClasses/FlowMachineInterface.mo" 2021-09-16 11:18:11.350271794 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/BaseClasses/PartialFlowMachine.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/BaseClasses/PartialFlowMachine.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/BaseClasses/PartialFlowMachine.mo" 2021-09-16 11:15:38.446780434 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/BaseClasses/PartialFlowMachine.mo" 2021-09-16 11:18:11.238272169 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/BaseClasses/PowerInterface.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/BaseClasses/PowerInterface.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/BaseClasses/PowerInterface.mo" 2021-09-16 11:15:38.446780434 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/BaseClasses/PowerInterface.mo" 2021-09-16 11:18:11.114272585 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Data/Generic.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Data/Generic.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Data/Generic.mo" 2021-09-16 11:15:38.446780434 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Data/Generic.mo" 2021-09-16 11:18:10.842273497 +0200 @@ -56,15 +56,15 @@ "Vector of normalized speed set points, used if inputType = Buildings.Fluid.Types.InputType.Stages" annotation (Dialog(group="Normalized speeds (used in model, default values assigned from speeds in rpm)")); - parameter Modelica.SIunits.Conversions.NonSIunits.AngularVelocity_rpm speed_rpm_nominal=1500 + parameter Modelica.Units.NonSI.AngularVelocity_rpm speed_rpm_nominal=1500 "Nominal rotational speed for flow characteristic" annotation (Dialog(group="Speeds in RPM")); - parameter Modelica.SIunits.Conversions.NonSIunits.AngularVelocity_rpm constantSpeed_rpm=speed_rpm_nominal + parameter Modelica.Units.NonSI.AngularVelocity_rpm constantSpeed_rpm=speed_rpm_nominal "Speed set point, used if inputType = Buildings.Fluid.Types.InputType.Constant" annotation (Dialog(group="Speeds in RPM")); - parameter Modelica.SIunits.Conversions.NonSIunits.AngularVelocity_rpm[:] speeds_rpm = {speed_rpm_nominal} + parameter Modelica.Units.NonSI.AngularVelocity_rpm[:] speeds_rpm = {speed_rpm_nominal} "Vector of speed set points, used if inputType = Buildings.Fluid.Types.InputType.Stages" annotation (Dialog(group="Speeds in RPM")); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Examples/ClosedLoop_y.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Examples/ClosedLoop_y.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Examples/ClosedLoop_y.mo" 2021-09-16 11:15:38.446780434 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Examples/ClosedLoop_y.mo" 2021-09-16 11:18:10.574274396 +0200 @@ -4,9 +4,9 @@ package Medium = Buildings.Media.Air; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= 0.1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 0.1 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal = 500 + parameter Modelica.Units.SI.PressureDifference dp_nominal = 500 "Nominal pressure difference"; Modelica.Blocks.Sources.Pulse y( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Examples/MoverParameter.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Examples/MoverParameter.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Examples/MoverParameter.mo" 2021-09-16 11:15:38.446780434 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Examples/MoverParameter.mo" 2021-09-16 11:18:10.530274543 +0200 @@ -4,7 +4,7 @@ extends Modelica.Icons.Example; package Medium = Buildings.Media.Water; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=2 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=2 "Nominal mass flow rate"; FlowControlled_m_flow pump_m_flow( @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Examples/MoverStages.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Examples/MoverStages.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Examples/MoverStages.mo" 2021-09-16 11:15:38.446780434 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Examples/MoverStages.mo" 2021-09-16 11:18:10.506274624 +0200 @@ -8,13 +8,13 @@ pump_dp(inputType=Buildings.Fluid.Types.InputType.Stages)); package Medium = Buildings.Media.Water; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=2 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=2 "Nominal mass flow rate"; Modelica.Blocks.Sources.IntegerTable integerTable(table=[0,1; 0.3,2; 0.6,3]) "Integer step input, 1 is off, 2 is on" annotation (Placement(transformation(extent={{-60,70},{-40,90}}))); - parameter Modelica.SIunits.PressureDifference dp_nominal=10000 "Nominal pressure raise"; + parameter Modelica.Units.SI.PressureDifference dp_nominal=10000 "Nominal pressure raise"; equation connect(integerTable.y, pump_Nrpm.stage) annotation (Line(points={{-39,80},{0,80},{0,52}}, color={255,127,0})); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Examples/PumpsParallel.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Examples/PumpsParallel.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Examples/PumpsParallel.mo" 2021-09-16 11:15:38.446780434 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Examples/PumpsParallel.mo" 2021-09-16 11:18:10.490274677 +0200 @@ -4,10 +4,10 @@ package Medium = Buildings.Media.Water "Medium model"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= 1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 1 "Nominal mass flow rate"; - parameter Modelica.SIunits.Density rho_nominal=1000 + parameter Modelica.Units.SI.Density rho_nominal=1000 "Density, used to compute fluid mass"; Buildings.Fluid.FixedResistances.PressureDrop dpIn1( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Examples/PumpsSeries.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Examples/PumpsSeries.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Examples/PumpsSeries.mo" 2021-09-16 11:15:38.446780434 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Examples/PumpsSeries.mo" 2021-09-16 11:18:10.466274758 +0200 @@ -3,7 +3,7 @@ extends Modelica.Icons.Example; package Medium = Buildings.Media.Water; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 "Nominal mass flow rate"; Buildings.Fluid.Movers.SpeedControlled_y floMac1( @@ -24,7 +24,7 @@ T=Medium.T_default, p=Medium.p_default, X=Medium.X_default) "Start state"; - parameter Modelica.SIunits.Density rho_nominal=Medium.density( + parameter Modelica.Units.SI.Density rho_nominal=Medium.density( state_start) "Density, used to compute fluid mass"; Buildings.Fluid.Movers.SpeedControlled_y floMac2( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mo" 2021-09-16 11:15:38.446780434 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mo" 2021-09-16 11:18:10.438274852 +0200 @@ -6,11 +6,11 @@ // For OpenModelica, changed m_flow_nominal to a constant. Otherwise // the translation fails with "Error: Cyclically dependent parameters found" - constant Modelica.SIunits.MassFlowRate m_flow_nominal = 0.5 + constant Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.5 "Nominal mass flow rate"; // For OpenModelica, changed dp_nominal to a constant. Otherwise // the compilation fails. - constant Modelica.SIunits.PressureDifference dp_nominal = 10000 + constant Modelica.Units.SI.PressureDifference dp_nominal = 10000 "Nominal pressure"; model pumpModel = Buildings.Fluid.Movers.SpeedControlled_y ( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/FlowControlled_dp.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/FlowControlled_dp.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/FlowControlled_dp.mo" 2021-09-16 11:15:38.446780434 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/FlowControlled_dp.mo" 2021-09-16 11:18:10.386275026 +0200 @@ -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 == Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/FlowControlled_m_flow.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/FlowControlled_m_flow.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/FlowControlled_m_flow.mo" 2021-09-16 11:15:38.446780434 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/FlowControlled_m_flow.mo" 2021-09-16 11:18:10.350275146 +0200 @@ -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 == Buildings.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 == Buildings.Fluid.Types.InputType.Stages)); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Validation/BaseClasses/FlowMachine_ZeroFlow.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Validation/BaseClasses/FlowMachine_ZeroFlow.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Validation/BaseClasses/FlowMachine_ZeroFlow.mo" 2021-09-16 11:15:38.446780434 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Validation/BaseClasses/FlowMachine_ZeroFlow.mo" 2021-09-16 11:18:09.978276394 +0200 @@ -5,9 +5,9 @@ replaceable package Medium = Buildings.Media.Air constrainedby Modelica.Media.Interfaces.PartialMedium "Medium model"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= 1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 1 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal = 500 + parameter Modelica.Units.SI.PressureDifference dp_nominal = 500 "Nominal pressure difference"; Modelica.Blocks.Sources.Ramp y( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Validation/FlowControlled_dpSystem.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Validation/FlowControlled_dpSystem.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Validation/FlowControlled_dpSystem.mo" 2021-09-16 11:15:38.446780434 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Validation/FlowControlled_dpSystem.mo" 2021-09-16 11:18:09.926276569 +0200 @@ -3,9 +3,9 @@ "Demonstration of the use of prescribedPressure" extends Modelica.Icons.Example; package Medium = Buildings.Media.Air; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= 0.1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 0.1 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal = 100 + parameter Modelica.Units.SI.PressureDifference dp_nominal = 100 "Nominal pressure difference"; Modelica.Blocks.Sources.Ramp y( duration=0.5, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Validation/PowerSimplified.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Validation/PowerSimplified.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Validation/PowerSimplified.mo" 2021-09-16 11:15:38.446780434 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Validation/PowerSimplified.mo" 2021-09-16 11:18:09.846276836 +0200 @@ -5,7 +5,7 @@ package Medium = Buildings.Media.Water "Medium model"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=3 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=3 "Nominal mass flow rate"; parameter Data.Pumps.Wilo.Stratos30slash1to8 per "Pump performance data" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Validation/PumpCurveConstruction.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Validation/PumpCurveConstruction.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Validation/PumpCurveConstruction.mo" 2021-09-16 11:15:38.446780434 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Validation/PumpCurveConstruction.mo" 2021-09-16 11:18:09.818276930 +0200 @@ -5,12 +5,12 @@ package Medium = Buildings.Media.Water "Medium model"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 1 "Nominal mass flow rate at zero pump head"; - parameter Modelica.SIunits.VolumeFlowRate V_flow_nominal = m_flow_nominal/1000 + parameter Modelica.Units.SI.VolumeFlowRate V_flow_nominal = m_flow_nominal/1000 "Nominal mass flow rate at zero pump head"; - parameter Modelica.SIunits.PressureDifference dp_nominal = 10000 + parameter Modelica.Units.SI.PressureDifference dp_nominal = 10000 "Nominal pump head at zero mass flow rate"; Actuators.Valves.TwoWayLinear val1( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Validation/SpeedControlled_y_linear.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Validation/SpeedControlled_y_linear.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Validation/SpeedControlled_y_linear.mo" 2021-09-16 11:15:38.446780434 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Movers/Validation/SpeedControlled_y_linear.mo" 2021-09-16 11:18:09.686277373 +0200 @@ -4,9 +4,9 @@ extends Modelica.Icons.Example; package Medium = Buildings.Media.Water "Medium model"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.5 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.5 "Nominal mass flow rate"; - parameter Modelica.SIunits.PressureDifference dp_nominal = 10000 + parameter Modelica.Units.SI.PressureDifference dp_nominal = 10000 "Nominal pressure"; Modelica.Blocks.Sources.Ramp y( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/BaseClasses/PartialDynamicFlowSensor.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/BaseClasses/PartialDynamicFlowSensor.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/BaseClasses/PartialDynamicFlowSensor.mo" 2021-09-16 11:15:38.446780434 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/BaseClasses/PartialDynamicFlowSensor.mo" 2021-09-16 11:18:09.622277588 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/BaseClasses/PartialFlowSensor.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/BaseClasses/PartialFlowSensor.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/BaseClasses/PartialFlowSensor.mo" 2021-09-16 11:15:38.446780434 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/BaseClasses/PartialFlowSensor.mo" 2021-09-16 11:18:09.610277628 +0200 @@ -2,10 +2,10 @@ partial model PartialFlowSensor "Partial component to model sensors that measure flow properties" extends Buildings.Fluid.Interfaces.PartialTwoPort; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal(min=0) + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal(min=0) "Nominal mass flow rate, used for regularization near zero flow" annotation(Dialog(group = "Nominal condition")); - parameter Modelica.SIunits.MassFlowRate m_flow_small(min=0) = 1E-4*m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_small(min=0) = 1E-4*m_flow_nominal "For bi-directional flow, temperature is regularized in the region |m_flow| < m_flow_small (m_flow_small > 0 required)" annotation(Dialog(tab="Advanced")); equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/Conversions/To_VolumeFraction.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/Conversions/To_VolumeFraction.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/Conversions/To_VolumeFraction.mo" 2021-09-16 11:15:38.446780434 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/Conversions/To_VolumeFraction.mo" 2021-09-16 11:18:09.550277829 +0200 @@ -1,8 +1,8 @@ within Buildings.Fluid.Sensors.Conversions; model To_VolumeFraction "Conversion from mass fraction to volume fraction" - parameter Modelica.SIunits.MolarMass MMMea "Molar mass of measured substance"; - parameter Modelica.SIunits.MolarMass MMBul=Modelica.Media.IdealGases.Common.SingleGasesData.Air.MM + parameter Modelica.Units.SI.MolarMass MMMea "Molar mass of measured substance"; + parameter Modelica.Units.SI.MolarMass MMBul=Modelica.Media.IdealGases.Common.SingleGasesData.Air.MM "Molar mass of bulk medium"; Modelica.Blocks.Interfaces.RealInput m "Mass fraction" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/Density.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/Density.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/Density.mo" 2021-09-16 11:15:38.446780434 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/Density.mo" 2021-09-16 11:18:09.518277937 +0200 @@ -1,7 +1,7 @@ within Buildings.Fluid.Sensors; model Density "Ideal one port density sensor" extends Buildings.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput d(final quantity="Density", final unit="kg/m3", min=0) "Density in port medium" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/DensityTwoPort.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/DensityTwoPort.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/DensityTwoPort.mo" 2021-09-16 11:15:38.446780434 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/DensityTwoPort.mo" 2021-09-16 11:18:09.478278071 +0200 @@ -1,7 +1,7 @@ within Buildings.Fluid.Sensors; model DensityTwoPort "Ideal two port density sensor" extends Buildings.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput d(final quantity="Density", final unit="kg/m3", min=0) "Density of the passing fluid" @@ -14,13 +14,13 @@ p=p_start, T=T_start, X=X_start)) "Initial or guess value of output (=state)" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.Temperature T_start=Medium.T_default + parameter Modelica.Units.SI.Temperature T_start=Medium.T_default "Temperature used to compute d_start" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.Pressure p_start=Medium.p_default + parameter Modelica.Units.SI.Pressure p_start=Medium.p_default "Pressure used to compute d_start" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.MassFraction X_start[Medium.nX]=Medium.X_default + parameter Modelica.Units.SI.MassFraction X_start[Medium.nX]=Medium.X_default "Mass fraction used to compute d_start" annotation (Dialog(group="Initialization")); protected diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/EnthalpyFlowRate.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/EnthalpyFlowRate.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/EnthalpyFlowRate.mo" 2021-09-16 11:15:38.446780434 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/EnthalpyFlowRate.mo" 2021-09-16 11:18:09.270278769 +0200 @@ -1,14 +1,14 @@ within Buildings.Fluid.Sensors; model EnthalpyFlowRate "Ideal enthalphy flow rate sensor" extends Buildings.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput H_flow(final unit="W") "Enthalpy flow rate, positive if from port_a to port_b" annotation (Placement(transformation( origin={0,110}, extent={{-10,-10},{10,10}}, rotation=90))); - parameter Modelica.SIunits.SpecificEnthalpy h_out_start= + parameter Modelica.Units.SI.SpecificEnthalpy h_out_start= Medium.specificEnthalpy_pTX( p=Medium.p_default, T=Medium.T_default, @@ -16,9 +16,9 @@ "Initial or guess value of measured specific enthalpy" annotation (Dialog(group="Initialization")); protected - Modelica.SIunits.SpecificEnthalpy hMed_out(start=h_out_start) + Modelica.Units.SI.SpecificEnthalpy hMed_out(start=h_out_start) "Medium enthalpy to which the sensor is exposed"; - Modelica.SIunits.SpecificEnthalpy h_out(start=h_out_start) + Modelica.Units.SI.SpecificEnthalpy h_out(start=h_out_start) "Medium enthalpy that is used to compute the enthalpy flow rate"; initial equation if dynamic then diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/EntropyFlowRate.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/EntropyFlowRate.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/EntropyFlowRate.mo" 2021-09-16 11:15:38.446780434 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/EntropyFlowRate.mo" 2021-09-16 11:18:09.250278836 +0200 @@ -1,25 +1,25 @@ within Buildings.Fluid.Sensors; model EntropyFlowRate "Ideal entropy flow rate sensor" extends Buildings.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput S_flow(final unit="W/K") "Entropy flow rate, positive if from port_a to port_b" annotation (Placement(transformation( origin={0,110}, extent={{-10,-10},{10,10}}, rotation=90))); - parameter Modelica.SIunits.SpecificEntropy s_out_start= + parameter Modelica.Units.SI.SpecificEntropy s_out_start= Medium.specificEntropy_pTX( p=Medium.p_default, T=Medium.T_default, X=Medium.X_default) "Initial or guess value of measured specific entropy" annotation (Dialog(group="Initialization")); protected - Modelica.SIunits.SpecificEntropy sMed_out(start=s_out_start) + Modelica.Units.SI.SpecificEntropy sMed_out(start=s_out_start) "Medium entropy to which the sensor is exposed"; - Modelica.SIunits.SpecificEntropy s_out(start=s_out_start) + Modelica.Units.SI.SpecificEntropy s_out(start=s_out_start) "Medium entropy that is used to compute the entropy flow rate"; - Modelica.SIunits.SpecificEntropy port_b_s_outflow(start=s_out_start) + Modelica.Units.SI.SpecificEntropy port_b_s_outflow(start=s_out_start) "Medium entropy outflowing at port_b if mass flow were from port_a to port_b"; initial equation if dynamic then diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/Examples/PPM.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/Examples/PPM.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/Examples/PPM.mo" 2021-09-16 11:15:38.446780434 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/Examples/PPM.mo" 2021-09-16 11:18:09.130279237 +0200 @@ -4,7 +4,7 @@ package Medium = Buildings.Media.Air(extraPropertiesNames={"CO2"}) "Medium model"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = volDyn.V*senPPMTwoPort.tau*3*rho_default + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = volDyn.V*senPPMTwoPort.tau*3*rho_default "Mass flow rate into and out of the volume"; Buildings.Fluid.MixingVolumes.MixingVolume volDyn( @@ -90,10 +90,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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/Examples/TraceSubstances.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/Examples/TraceSubstances.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/Examples/TraceSubstances.mo" 2021-09-16 11:15:38.446780434 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/Examples/TraceSubstances.mo" 2021-09-16 11:18:09.014279627 +0200 @@ -4,7 +4,7 @@ package Medium = Buildings.Media.Air(extraPropertiesNames={"CO2"}) "Medium model"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 15*1.2/3600 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 15*1.2/3600 "Mass flow rate into and out of the volume"; MixingVolumes.MixingVolume vol( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/Examples/Velocity.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/Examples/Velocity.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/Examples/Velocity.mo" 2021-09-16 11:15:38.446780434 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/Examples/Velocity.mo" 2021-09-16 11:18:08.982279734 +0200 @@ -4,7 +4,7 @@ package Medium = Buildings.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"; Buildings.Fluid.Sources.Boundary_pT sin( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/LatentEnthalpyFlowRate.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/LatentEnthalpyFlowRate.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/LatentEnthalpyFlowRate.mo" 2021-09-16 11:15:38.446780434 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/LatentEnthalpyFlowRate.mo" 2021-09-16 11:18:08.946279855 +0200 @@ -5,14 +5,14 @@ redeclare replaceable package Medium = Modelica.Media.Interfaces.PartialCondensingGases); extends Buildings.Fluid.BaseClasses.IndexMassFraction(final substanceName="water"); - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput H_flow(final unit="W") "Latent enthalpy flow rate, positive if from port_a to port_b" annotation (Placement(transformation( origin={0,110}, extent={{-10,-10},{10,10}}, rotation=90))); - parameter Modelica.SIunits.SpecificEnthalpy h_out_start= + parameter Modelica.Units.SI.SpecificEnthalpy h_out_start= Medium.specificEnthalpy_pTX( p=Medium.p_default, T=Medium.T_default, X=Medium.X_default) -Medium.enthalpyOfNonCondensingGas(T=Medium.T_default) @@ -20,9 +20,9 @@ annotation (Dialog(group="Initialization")); protected - Modelica.SIunits.SpecificEnthalpy hMed_out(start=h_out_start) + Modelica.Units.SI.SpecificEnthalpy hMed_out(start=h_out_start) "Medium latent enthalpy to which the sensor is exposed"; - Modelica.SIunits.SpecificEnthalpy h_out(start=h_out_start) + Modelica.Units.SI.SpecificEnthalpy h_out(start=h_out_start) "Medium latent enthalpy that is used to compute the enthalpy flow rate"; Medium.MassFraction XiActual[Medium.nXi] diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/MassFlowRate.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/MassFlowRate.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/MassFlowRate.mo" 2021-09-16 11:15:38.446780434 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/MassFlowRate.mo" 2021-09-16 11:18:08.926279922 +0200 @@ -3,7 +3,7 @@ extends Buildings.Fluid.Sensors.BaseClasses.PartialFlowSensor( final m_flow_nominal = 0, final m_flow_small = 0); -extends Modelica.Icons.RotationalSensor; +extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput m_flow(quantity="MassFlowRate", final unit="kg/s") "Mass flow rate from port_a to port_b" annotation (Placement( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/MassFraction.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/MassFraction.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/MassFraction.mo" 2021-09-16 11:15:38.446780434 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/MassFraction.mo" 2021-09-16 11:18:08.914279962 +0200 @@ -4,7 +4,7 @@ redeclare replaceable package Medium = Modelica.Media.Interfaces.PartialCondensingGases); extends Buildings.Fluid.BaseClasses.IndexMassFraction(substanceName = "water"); - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput X(min=-1e-3, max=1.001, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/MassFractionTwoPort.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/MassFractionTwoPort.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/MassFractionTwoPort.mo" 2021-09-16 11:15:38.446780434 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/MassFractionTwoPort.mo" 2021-09-16 11:18:08.902280002 +0200 @@ -4,7 +4,7 @@ redeclare replaceable package Medium = Modelica.Media.Interfaces.PartialCondensingGases); extends Buildings.Fluid.BaseClasses.IndexMassFraction(substanceName = "water"); - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; parameter Medium.MassFraction X_start=Medium.X_default[i_x] "Initial or guess value of output (= state)" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/PPM.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/PPM.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/PPM.mo" 2021-09-16 11:15:38.446780434 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/PPM.mo" 2021-09-16 11:18:08.882280069 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/PPMTwoPort.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/PPMTwoPort.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/PPMTwoPort.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/PPMTwoPort.mo" 2021-09-16 11:18:08.862280136 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/Pressure.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/Pressure.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/Pressure.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/Pressure.mo" 2021-09-16 11:18:08.834280230 +0200 @@ -1,7 +1,7 @@ within Buildings.Fluid.Sensors; model Pressure "Ideal pressure sensor" extends Buildings.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput p(final quantity="AbsolutePressure", final unit="Pa", min=0) "Pressure at port" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/RelativeHumidity.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/RelativeHumidity.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/RelativeHumidity.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/RelativeHumidity.mo" 2021-09-16 11:18:08.818280283 +0200 @@ -1,14 +1,14 @@ within Buildings.Fluid.Sensors; model RelativeHumidity "Ideal one port relative humidity sensor" extends Buildings.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput phi(final unit="1", min=0) "Relative humidity in port medium" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); protected - Modelica.SIunits.Temperature T "Temperature of the medium"; + Modelica.Units.SI.Temperature T "Temperature of the medium"; Medium.MassFraction Xi[Medium.nXi]( quantity=Medium.substanceNames[1:Medium.nXi]) "Mass fraction of the medium"; equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/RelativeHumidityTwoPort.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/RelativeHumidityTwoPort.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/RelativeHumidityTwoPort.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/RelativeHumidityTwoPort.mo" 2021-09-16 11:18:08.798280350 +0200 @@ -1,7 +1,7 @@ within Buildings.Fluid.Sensors; model RelativeHumidityTwoPort "Ideal two port relative humidity sensor" extends Buildings.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput phi(final unit="1", min=0, start=phi_start) @@ -18,14 +18,14 @@ "Relative humidity to which the sensor is exposed to"; protected - Modelica.SIunits.Temperature T_a + Modelica.Units.SI.Temperature T_a "Temperature of the medium flowing from port_a to port_b"; Medium.MassFraction Xi_a[Medium.nXi]( quantity=Medium.substanceNames[1:Medium.nXi]) "Mass fraction of the medium flowing from port_a to port_b"; Real phi_a(final unit="1") "Relative humidity of the medium flowing from port_a to port_b"; - Modelica.SIunits.Temperature T_b + Modelica.Units.SI.Temperature T_b "Temperature of the medium flowing from port_b to port_a"; Medium.MassFraction Xi_b[Medium.nXi]( quantity=Medium.substanceNames[1:Medium.nXi]) diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/RelativePressure.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/RelativePressure.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/RelativePressure.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/RelativePressure.mo" 2021-09-16 11:18:08.774280432 +0200 @@ -1,6 +1,6 @@ within Buildings.Fluid.Sensors; model RelativePressure "Ideal relative pressure sensor" - extends Modelica.Icons.TranslationalSensor; + extends Modelica.Icons.RectangularSensor; replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium in the sensor" annotation (choices( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/RelativeTemperature.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/RelativeTemperature.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/RelativeTemperature.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/RelativeTemperature.mo" 2021-09-16 11:18:08.750280512 +0200 @@ -1,6 +1,6 @@ within Buildings.Fluid.Sensors; model RelativeTemperature "Ideal relative temperature sensor" - extends Modelica.Icons.TranslationalSensor; + extends Modelica.Icons.RectangularSensor; replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium in the sensor" annotation (choices( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/SensibleEnthalpyFlowRate.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/SensibleEnthalpyFlowRate.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/SensibleEnthalpyFlowRate.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/SensibleEnthalpyFlowRate.mo" 2021-09-16 11:18:08.726280592 +0200 @@ -5,21 +5,21 @@ redeclare replaceable package Medium = Modelica.Media.Interfaces.PartialCondensingGases); extends Buildings.Fluid.BaseClasses.IndexMassFraction(final substanceName="water"); - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput H_flow(final unit="W") "Sensible enthalpy flow rate, positive if from port_a to port_b" annotation (Placement(transformation( origin={0,110}, extent={{-10,-10},{10,10}}, rotation=90))); - parameter Modelica.SIunits.SpecificEnthalpy h_out_start= + parameter Modelica.Units.SI.SpecificEnthalpy h_out_start= Medium.enthalpyOfNonCondensingGas(T=Medium.T_default) "Initial or guess value of measured specific sensible enthalpy" annotation (Dialog(group="Initialization")); protected - Modelica.SIunits.SpecificEnthalpy hMed_out(start=h_out_start) + Modelica.Units.SI.SpecificEnthalpy hMed_out(start=h_out_start) "Medium sensible enthalpy to which the sensor is exposed"; - Modelica.SIunits.SpecificEnthalpy h_out(start=h_out_start) + Modelica.Units.SI.SpecificEnthalpy h_out(start=h_out_start) "Medium sensible enthalpy that is used to compute the enthalpy flow rate"; Medium.MassFraction XiActual[Medium.nXi] "Medium mass fraction to which sensor is exposed to"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/SpecificEnthalpy.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/SpecificEnthalpy.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/SpecificEnthalpy.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/SpecificEnthalpy.mo" 2021-09-16 11:18:08.494281370 +0200 @@ -1,7 +1,7 @@ within Buildings.Fluid.Sensors; model SpecificEnthalpy "Ideal one port specific enthalpy sensor" extends Buildings.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput h_out(final quantity="SpecificEnergy", final unit="J/kg") "Specific enthalpy in port medium" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/SpecificEnthalpyTwoPort.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/SpecificEnthalpyTwoPort.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/SpecificEnthalpyTwoPort.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/SpecificEnthalpyTwoPort.mo" 2021-09-16 11:18:08.482281411 +0200 @@ -1,8 +1,8 @@ within Buildings.Fluid.Sensors; model SpecificEnthalpyTwoPort "Ideal two port sensor for the specific enthalpy" extends Buildings.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor; - extends Modelica.Icons.RotationalSensor; - parameter Modelica.SIunits.SpecificEnthalpy h_out_start= + extends Modelica.Icons.RoundSensor; + parameter Modelica.Units.SI.SpecificEnthalpy h_out_start= Medium.specificEnthalpy_pTX(p=Medium.p_default, T=Medium.T_default, X=Medium.X_default) "Initial or guess value of output (= state)" annotation (Dialog(group="Initialization")); @@ -15,7 +15,7 @@ extent={{10,-10},{-10,10}}, rotation=270))); protected - Modelica.SIunits.SpecificEnthalpy hMed_out(start=h_out_start) + Modelica.Units.SI.SpecificEnthalpy hMed_out(start=h_out_start) "Medium enthalpy to which the sensor is exposed"; initial equation if dynamic then diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/SpecificEntropy.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/SpecificEntropy.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/SpecificEntropy.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/SpecificEntropy.mo" 2021-09-16 11:18:08.466281464 +0200 @@ -1,7 +1,7 @@ within Buildings.Fluid.Sensors; model SpecificEntropy "Ideal one port specific entropy sensor" extends Buildings.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput s(final quantity="SpecificEntropy", final unit="J/(kg.K)") "Specific entropy in port medium" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/SpecificEntropyTwoPort.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/SpecificEntropyTwoPort.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/SpecificEntropyTwoPort.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/SpecificEntropyTwoPort.mo" 2021-09-16 11:18:08.454281504 +0200 @@ -1,8 +1,8 @@ within Buildings.Fluid.Sensors; model SpecificEntropyTwoPort "Ideal two port sensor for the specific entropy" extends Buildings.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor; - extends Modelica.Icons.RotationalSensor; - parameter Modelica.SIunits.SpecificEntropy s_start= + extends Modelica.Icons.RoundSensor; + parameter Modelica.Units.SI.SpecificEntropy s_start= Medium.specificEntropy_pTX(p=Medium.p_default, T=Medium.T_default, X=Medium.X_default) "Initial or guess value of output (= state)" annotation (Dialog(group="Initialization")); @@ -15,7 +15,7 @@ extent={{10,-10},{-10,10}}, rotation=270))); protected - Modelica.SIunits.SpecificEntropy sMed(start=s_start) + Modelica.Units.SI.SpecificEntropy sMed(start=s_start) "Medium entropy to which the sensor is exposed"; Medium.SpecificEntropy s_a_inflow "Specific entropy of inflowing fluid at port_a"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/TemperatureTwoPort.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/TemperatureTwoPort.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/TemperatureTwoPort.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/TemperatureTwoPort.mo" 2021-09-16 11:18:08.422281611 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/TemperatureWetBulbTwoPort.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/TemperatureWetBulbTwoPort.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/TemperatureWetBulbTwoPort.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/TemperatureWetBulbTwoPort.mo" 2021-09-16 11:18:08.394281705 +0200 @@ -13,7 +13,7 @@ extent={{-10,-10},{10,10}}, rotation=90, origin={0,110}))); - parameter Modelica.SIunits.Temperature TWetBul_start = Medium.T_default + parameter Modelica.Units.SI.Temperature TWetBul_start = Medium.T_default "Initial or guess value of wet bulb temperature (used to compute initial output signal))" annotation (Dialog(group="Initialization")); @@ -23,7 +23,7 @@ Buildings.Utilities.Psychrometrics.TWetBul_TDryBulXi wetBulMod( redeclare package Medium = Medium, TWetBul(start=TWetBul_start)) "Block for wet bulb temperature"; - Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy"; + Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy"; Medium.MassFraction Xi[Medium.nXi] "Species vector, needed because indexed argument for the operator inStream is not supported"; initial equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/TraceSubstances.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/TraceSubstances.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/TraceSubstances.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/TraceSubstances.mo" 2021-09-16 11:18:08.370281786 +0200 @@ -1,7 +1,7 @@ within Buildings.Fluid.Sensors; model TraceSubstances "Ideal one port trace substances sensor" extends Buildings.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; parameter String substanceName = "CO2" "Name of trace substance"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/TraceSubstancesTwoPort.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/TraceSubstancesTwoPort.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/TraceSubstancesTwoPort.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/TraceSubstancesTwoPort.mo" 2021-09-16 11:18:08.346281866 +0200 @@ -1,7 +1,7 @@ within Buildings.Fluid.Sensors; model TraceSubstancesTwoPort "Ideal two port sensor for trace substance" extends Buildings.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput C(min=0, start=C_start) "Trace substance of the passing fluid" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/Velocity.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/Velocity.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/Velocity.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/Velocity.mo" 2021-09-16 11:18:08.306282000 +0200 @@ -1,23 +1,23 @@ within Buildings.Fluid.Sensors; model Velocity "Ideal sensor for flow velocity" extends Buildings.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; parameter Medium.Density d_start=Medium.density(Medium.setState_pTX(p_start, T_start, X_start)) "Initial or guess value of density" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.Temperature T_start=Medium.T_default + parameter Modelica.Units.SI.Temperature T_start=Medium.T_default "Temperature used to compute d_start" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.Pressure p_start=Medium.p_default + parameter Modelica.Units.SI.Pressure p_start=Medium.p_default "Pressure used to compute d_start" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.MassFraction X_start[Medium.nX]=Medium.X_default + parameter Modelica.Units.SI.MassFraction X_start[Medium.nX]=Medium.X_default "Mass fraction used to compute d_start" annotation (Dialog(group="Initialization")); - 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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/VolumeFlowRate.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/VolumeFlowRate.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/VolumeFlowRate.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sensors/VolumeFlowRate.mo" 2021-09-16 11:18:08.286282067 +0200 @@ -1,18 +1,18 @@ within Buildings.Fluid.Sensors; model VolumeFlowRate "Ideal sensor for volume flow rate" extends Buildings.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; parameter Medium.Density d_start=Medium.density(Medium.setState_pTX(p_start, T_start, X_start)) "Initial or guess value of density" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.Temperature T_start=Medium.T_default + parameter Modelica.Units.SI.Temperature T_start=Medium.T_default "Temperature used to compute d_start" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.Pressure p_start=Medium.p_default + parameter Modelica.Units.SI.Pressure p_start=Medium.p_default "Pressure used to compute d_start" annotation (Dialog(group="Initialization")); - parameter Modelica.SIunits.MassFraction X_start[Medium.nX]=Medium.X_default + parameter Modelica.Units.SI.MassFraction X_start[Medium.nX]=Medium.X_default "Mass fraction used to compute d_start" annotation (Dialog(group="Initialization")); Modelica.Blocks.Interfaces.RealOutput V_flow(final quantity="VolumeFlowRate", diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/ASHRAESolarGain.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/ASHRAESolarGain.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/ASHRAESolarGain.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/ASHRAESolarGain.mo" 2021-09-16 11:18:08.226282269 +0200 @@ -17,7 +17,7 @@ max=1.0) = 0 "Shading coefficient 0.0: no shading, 1.0: full shading" annotation(Dialog(enable = not use_shaCoe_in, group = "Shading")); - parameter Modelica.SIunits.Angle til "Surface tilt"; + parameter Modelica.Units.SI.Angle til "Surface tilt"; Modelica.Blocks.Interfaces.RealInput shaCoe_in if use_shaCoe_in "Shading coefficient" @@ -49,25 +49,25 @@ annotation (Placement(transformation(extent={{100,-10},{120,10}}))); protected - constant Modelica.SIunits.TemperatureDifference dTMax = 1 + constant Modelica.Units.SI.TemperatureDifference dTMax = 1 "Safety temperature difference to prevent TFlu > Medium.T_max"; - final parameter Modelica.SIunits.Temperature TMedMax = Medium.T_max-dTMax + final parameter Modelica.Units.SI.Temperature TMedMax = Medium.T_max-dTMax "Fluid temperature above which there will be no heat gain computed to prevent TFlu > Medium.T_max"; - final parameter Modelica.SIunits.Temperature TMedMax2 = TMedMax-dTMax + final parameter Modelica.Units.SI.Temperature TMedMax2 = TMedMax-dTMax "Fluid temperature below which there will be no heat loss computed to prevent TFlu < Medium.T_min"; final parameter Real iamSky(fixed = false) "Incident angle modifier for diffuse solar radiation from the sky"; final parameter Real iamGro(fixed = false) "Incident angle modifier for diffuse solar radiation from the ground"; - final parameter Modelica.SIunits.Angle incAngSky(fixed = false) + final parameter Modelica.Units.SI.Angle incAngSky(fixed = false) "Incident angle of diffuse radiation from the sky"; - final parameter Modelica.SIunits.Angle incAngGro(fixed = false) + final parameter Modelica.Units.SI.Angle incAngGro(fixed = false) "Incident angle of diffuse radiation from the ground"; final parameter Real tilDeg( - unit = "deg") = Modelica.SIunits.Conversions.to_deg(til) + unit = "deg") = Modelica.Units.Conversions.to_deg(til) "Surface tilt angle in degrees"; - final parameter Modelica.SIunits.HeatFlux HTotMin = 1 + final parameter Modelica.Units.SI.HeatFlux HTotMin = 1 "Minimum HTot to avoid div/0"; final parameter Real HMinDel = 0.001 "Delta of the smoothing function for HTot"; @@ -79,15 +79,13 @@ "Internally used shading coefficient"; initial equation - // E+ Equ (557) - incAngSky = Modelica.SIunits.Conversions.from_deg(59.68 - 0.1388*(tilDeg) + - 0.001497*(tilDeg)^2); +// E+ Equ (557) + incAngSky = Modelica.Units.Conversions.from_deg(59.68 - 0.1388 * tilDeg + 0.001497 * tilDeg ^ 2); // Diffuse radiation from the sky // E+ Equ (555) iamSky = SolarCollectors.BaseClasses.IAM(incAngSky, B0, B1); - // E+ Equ (558) - incAngGro = Modelica.SIunits.Conversions.from_deg(90 - 0.5788*(tilDeg)+ - 0.002693*(tilDeg)^2); +// E+ Equ (558) + incAngGro = Modelica.Units.Conversions.from_deg(90 - 0.5788 * tilDeg + 0.002693 * tilDeg ^ 2); // Diffuse radiation from the ground // E+ Equ (555) iamGro = SolarCollectors.BaseClasses.IAM( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/EN12975HeatLoss.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/EN12975HeatLoss.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/EN12975HeatLoss.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/EN12975HeatLoss.mo" 2021-09-16 11:18:08.202282349 +0200 @@ -5,7 +5,7 @@ "Heat loss at nominal condition, for reporting only", QLos_internal = A_c/nSeg * {dT[i] * (C1 - C2 * dT[i]) for i in 1:nSeg}); - parameter Modelica.SIunits.CoefficientOfHeatTransfer C1(final min=0) + parameter Modelica.Units.SI.CoefficientOfHeatTransfer C1(final min=0) "C1 from ratings data"; parameter Real C2(final unit = "W/(m2.K2)", final min=0) diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/EN12975SolarGain.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/EN12975SolarGain.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/EN12975SolarGain.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/EN12975SolarGain.mo" 2021-09-16 11:18:08.190282389 +0200 @@ -47,11 +47,11 @@ annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}))); protected - constant Modelica.SIunits.TemperatureDifference dTMax = 1 + constant Modelica.Units.SI.TemperatureDifference dTMax = 1 "Safety temperature difference to prevent TFlu > Medium.T_max"; - final parameter Modelica.SIunits.Temperature TMedMax = Medium.T_max-dTMax + final parameter Modelica.Units.SI.Temperature TMedMax = Medium.T_max-dTMax "Fluid temperature above which there will be no heat gain computed to prevent TFlu > Medium.T_max"; - final parameter Modelica.SIunits.Temperature TMedMax2 = TMedMax-dTMax + final parameter Modelica.Units.SI.Temperature TMedMax2 = TMedMax-dTMax "Fluid temperature below which there will be no heat loss computed to prevent TFlu < Medium.T_min"; Real iamBea "Incidence angle modifier for director solar radiation"; Modelica.Blocks.Interfaces.RealInput shaCoe_internal "Internally used shaCoe"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/Examples/ASHRAEHeatLoss.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/Examples/ASHRAEHeatLoss.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/Examples/ASHRAEHeatLoss.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/Examples/ASHRAEHeatLoss.mo" 2021-09-16 11:18:08.162282483 +0200 @@ -6,22 +6,22 @@ "Performance data" annotation (choicesAllMatching=true); Modelica.Blocks.Sources.Sine TEnv( - freqHz=0.01, + f =0.01, offset=273.15 + 10, amplitude=7.5) "Temperature of the surrounding environment" annotation (Placement(transformation(extent={{-80,60},{-60,80}}))); Modelica.Blocks.Sources.Sine T1( - freqHz=0.1, + f =0.1, amplitude=15, offset=273.15 + 10) "Temperature in the first segment" annotation (Placement(transformation(extent={{-80,-60},{-60,-40}}))); Modelica.Blocks.Sources.Sine T2( - freqHz=0.1, + f =0.1, amplitude=15, offset=273.15 + 15) "Temperature in the second segment" annotation (Placement(transformation(extent={{-80,-20},{-60,0}}))); Modelica.Blocks.Sources.Sine T3( - freqHz=0.1, + f =0.1, amplitude=15, offset=273.15 + 20) "Temperature in the third segment" annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/Examples/ASHRAESolarGain.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/Examples/ASHRAESolarGain.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/Examples/ASHRAESolarGain.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/Examples/ASHRAESolarGain.mo" 2021-09-16 11:18:08.146282537 +0200 @@ -18,7 +18,7 @@ annotation (Placement(transformation(extent={{72,0},{92,20}}))); Modelica.Blocks.Sources.Sine HGroDifTil( amplitude=50, - freqHz=4/86400, +f =4/86400, offset=100) "Diffuse radiation from the ground, tilted surface" annotation (Placement(transformation(extent={{-64,44},{-44,64}}))); Modelica.Blocks.Sources.Ramp incAng(duration=86400, height=60*(2*Modelica.Constants.pi @@ -27,10 +27,10 @@ Modelica.Blocks.Sources.Sine HDirTil( offset=400, amplitude=300, - freqHz=2/86400) "Direct beam radiation, tilted surface" +f =2/86400) "Direct beam radiation, tilted surface" annotation (Placement(transformation(extent={{-90,18},{-70,38}}))); Modelica.Blocks.Sources.Sine HSkyDifTil( - freqHz=1/86400, + f =1/86400, amplitude=100, offset=100) "Diffuse radiation, tilted surface" annotation (Placement(transformation(extent={{-38,74},{-18,94}}))); @@ -40,17 +40,17 @@ offset=1) "Shading coefficient" annotation (Placement(transformation(extent={{-64,-42},{-44,-22}}))); Modelica.Blocks.Sources.Sine T3( - freqHz=2/86400, + f =2/86400, amplitude=50, offset=273.15 + 110) annotation (Placement(transformation(extent={{-38,-58},{-18,-38}}))); Modelica.Blocks.Sources.Sine T2( - freqHz=2/86400, + f =2/86400, amplitude=50, offset=273.15 + 100) annotation (Placement(transformation(extent={{-14,-74},{6,-54}}))); Modelica.Blocks.Sources.Sine T1( - freqHz=2/86400, + f =2/86400, amplitude=50, offset=273.15 + 90) annotation (Placement(transformation(extent={{10,-94},{30,-74}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/Examples/EN12975HeatLoss.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/Examples/EN12975HeatLoss.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/Examples/EN12975HeatLoss.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/Examples/EN12975HeatLoss.mo" 2021-09-16 11:18:08.114282644 +0200 @@ -6,22 +6,22 @@ "Performance data" annotation (choicesAllMatching=true); Modelica.Blocks.Sources.Sine TEnv( - freqHz=0.01, + f =0.01, offset=273.15 + 10, amplitude=15) "Temperature of the surrounding environment" annotation (Placement(transformation(extent={{-80,60},{-60,80}}))); Modelica.Blocks.Sources.Sine T1( amplitude=15, - freqHz=0.1, +f =0.1, offset=273.15 + 10) "Temperature of the first segment" annotation (Placement(transformation(extent={{-80,-60},{-60,-40}}))); Modelica.Blocks.Sources.Sine T2( - freqHz=0.1, + f =0.1, amplitude=15, offset=273.15 + 15) "Temperature of the second segment" annotation (Placement(transformation(extent={{-80,-20},{-60,0}}))); Modelica.Blocks.Sources.Sine T3( - freqHz=0.1, + f =0.1, amplitude=15, offset=273.15 + 20) "Temperature of the third segment" annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/Examples/EN12975SolarGain.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/Examples/EN12975SolarGain.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/Examples/EN12975SolarGain.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/Examples/EN12975SolarGain.mo" 2021-09-16 11:18:08.090282724 +0200 @@ -23,11 +23,11 @@ Modelica.Blocks.Sources.Sine HDirTil( offset=400, amplitude=300, - freqHz=2/86400) "Direct beam radiation, tilted surface" +f =2/86400) "Direct beam radiation, tilted surface" annotation (Placement(transformation(extent={{-40,44},{-20,64}}))); Modelica.Blocks.Sources.Sine HDifTil( amplitude=200, - freqHz=1/86400, +f =1/86400, offset=300) "Diffuse radiation, tilted surface" annotation (Placement(transformation(extent={{-40,74},{-20,94}}))); Modelica.Blocks.Sources.Ramp shaCoe( @@ -36,17 +36,17 @@ height=-1) "Shading coefficient" annotation (Placement(transformation(extent={{-80,-20},{-60,0}}))); Modelica.Blocks.Sources.Sine T3( - freqHz=2/86400, + f =2/86400, amplitude=50, offset=273.15 + 110) annotation (Placement(transformation(extent={{-50,-38},{-30,-18}}))); Modelica.Blocks.Sources.Sine T2( - freqHz=2/86400, + f =2/86400, amplitude=50, offset=273.15 + 100) annotation (Placement(transformation(extent={{-26,-54},{-6,-34}}))); Modelica.Blocks.Sources.Sine T1( - freqHz=2/86400, + f =2/86400, amplitude=50, offset=273.15 + 90) annotation (Placement(transformation(extent={{-2,-70},{18,-50}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/IAM.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/IAM.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/IAM.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/IAM.mo" 2021-09-16 11:18:08.066282805 +0200 @@ -1,12 +1,12 @@ within Buildings.Fluid.SolarCollectors.BaseClasses; function IAM "Function for incident angle modifer" - input Modelica.SIunits.Angle incAng "Incident angle"; + input Modelica.Units.SI.Angle incAng "Incident angle"; input Real B0 "1st incident angle modifer coefficient"; input Real B1 "2nd incident angle modifer coefficient"; output Real incAngMod "Incident angle modifier coefficient"; protected - constant Modelica.SIunits.Angle incAngMin = Modelica.Constants.pi / 2 -0.1 + constant Modelica.Units.SI.Angle incAngMin = Modelica.Constants.pi / 2 -0.1 "Minimum incidence angle to avoid division by zero"; constant Real delta = 0.0001 "Width of the smoothing function"; constant Real cosIncAngMin = Modelica.Math.cos(incAngMin) "Cosine of minimum incidence angle"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/PartialHeatLoss.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/PartialHeatLoss.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/PartialHeatLoss.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/PartialHeatLoss.mo" 2021-09-16 11:18:08.054282845 +0200 @@ -7,20 +7,20 @@ replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium in the component"; - parameter Modelica.SIunits.Irradiance G_nominal + parameter Modelica.Units.SI.Irradiance G_nominal "Irradiance at nominal conditions" annotation(Dialog(group="Nominal condition")); - parameter Modelica.SIunits.TemperatureDifference dT_nominal + parameter Modelica.Units.SI.TemperatureDifference dT_nominal "Ambient temperature minus fluid temperature at nominal conditions" annotation(Dialog(group="Nominal condition")); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Fluid flow rate at nominal conditions" annotation(Dialog(group="Nominal condition")); - parameter Modelica.SIunits.SpecificHeatCapacity cp_default + parameter Modelica.Units.SI.SpecificHeatCapacity cp_default "Specific heat capacity of the fluid at the default temperature"; - parameter Modelica.SIunits.HeatFlowRate QLos_nominal + parameter Modelica.Units.SI.HeatFlowRate QLos_nominal "Heat loss at nominal conditions, negative if heat flows from collector to environment"; Modelica.Blocks.Interfaces.RealInput TEnv( @@ -46,21 +46,21 @@ annotation (Placement(transformation(extent={{100,-10},{120,10}}))); protected - constant Modelica.SIunits.Temperature dTMin = 1 + + constant Modelica.Units.SI.Temperature dTMin = 1 "Safety temperature difference to prevent TFlu < Medium.T_min"; - final parameter Modelica.SIunits.Temperature TMedMin = Medium.T_min + dTMin + final parameter Modelica.Units.SI.Temperature TMedMin = Medium.T_min + dTMin "Fluid temperature below which there will be no heat loss computed to prevent TFlu < Medium.T_min"; - final parameter Modelica.SIunits.Temperature TMedMin2 = TMedMin + dTMin + final parameter Modelica.Units.SI.Temperature TMedMin2 = TMedMin + dTMin "Fluid temperature below which there will be no heat loss computed to prevent TFlu < Medium.T_min"; // final parameter Modelica.SIunits.HeatFlowRate QUse_nominal(min=0) = G_nominal * A_c * y_intercept + QLos_nominal // "Useful heat gain at nominal conditions"; - input Modelica.SIunits.HeatFlowRate QLos_internal[nSeg] + input Modelica.Units.SI.HeatFlowRate QLos_internal[nSeg] "Heat loss rate at current conditions for each segment"; - Modelica.SIunits.TemperatureDifference dT[nSeg] = {TEnv-TFlu[i] for i in 1:nSeg} + Modelica.Units.SI.TemperatureDifference dT[nSeg] = {TEnv-TFlu[i] for i in 1:nSeg} "Environment minus collector fluid temperature"; - annotation ( defaultComponentName="heaLos", Documentation(info=" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/PartialParameters.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/PartialParameters.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/PartialParameters.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/PartialParameters.mo" 2021-09-16 11:18:08.038282899 +0200 @@ -1,7 +1,7 @@ within Buildings.Fluid.SolarCollectors.BaseClasses; block PartialParameters "Partial model for parameters" - parameter Modelica.SIunits.Area A_c "Area of the collector"; + parameter Modelica.Units.SI.Area A_c "Area of the collector"; parameter Integer nSeg(min=3)=3 "Number of segments"; parameter Real y_intercept "Y intercept (Maximum efficiency)"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/PartialSolarCollector.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/PartialSolarCollector.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/PartialSolarCollector.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/BaseClasses/PartialSolarCollector.mo" 2021-09-16 11:18:08.030282926 +0200 @@ -11,13 +11,13 @@ parameter Integer nSeg(min=3) = 3 "Number of segments used to discretize the collector model"; - parameter Modelica.SIunits.Angle lat(displayUnit="deg") "Latitude"; - parameter Modelica.SIunits.Angle azi(displayUnit="deg") + parameter Modelica.Units.SI.Angle lat(displayUnit="deg") "Latitude"; + parameter Modelica.Units.SI.Angle azi(displayUnit="deg") "Surface azimuth (0 for south-facing; -90 degree for east-facing; +90 degree for west facing"; - parameter Modelica.SIunits.Angle til(displayUnit="deg") + parameter Modelica.Units.SI.Angle til(displayUnit="deg") "Surface tilt (0 for horizontally mounted collector)"; parameter Real rho "Ground reflectance"; - parameter Modelica.SIunits.HeatCapacity C=385*perPar.mDry + parameter Modelica.Units.SI.HeatCapacity C=385*perPar.mDry "Heat capacity of solar collector without fluid (default: cp_copper*mDry*nPanels)"; parameter Boolean use_shaCoe_in = false @@ -35,7 +35,7 @@ parameter Integer nPanels= 0 "Desired number of panels in the simulation" annotation(Dialog(group="Area declarations", enable= (nColType == Buildings.Fluid.SolarCollectors.Types.NumberSelection.Number))); - parameter Modelica.SIunits.Area totalArea=0 + parameter Modelica.Units.SI.Area totalArea=0 "Total area of panels in the simulation" annotation(Dialog(group="Area declarations", enable=(nColType == Buildings.Fluid.SolarCollectors.Types.NumberSelection.Area))); @@ -128,13 +128,13 @@ Modelica.Blocks.Interfaces.RealInput shaCoe_internal "Internally used shading coefficient"; - final parameter Modelica.SIunits.PressureDifference dp_nominal_final(displayUnit="Pa")= + final parameter Modelica.Units.SI.PressureDifference dp_nominal_final(displayUnit="Pa")= if sysConfig == Buildings.Fluid.SolarCollectors.Types.SystemConfiguration.Series then nPanels_internal*perPar.dp_nominal else perPar.dp_nominal "Nominal pressure loss across the system of collectors"; - parameter Modelica.SIunits.Area TotalArea_internal= + parameter Modelica.Units.SI.Area TotalArea_internal= nPanels_internal * perPar.A "Area used in the simulation"; parameter Real nPanels_internal= @@ -147,12 +147,12 @@ T=Medium.T_default, p=Medium.p_default, X=Medium.X_default[1:Medium.nXi]) "Medium state at default properties"; - parameter Modelica.SIunits.SpecificHeatCapacity cp_default= + + parameter Modelica.Units.SI.SpecificHeatCapacity cp_default= Medium.specificHeatCapacityCp(sta_default) "Specific heat capacity of the fluid"; - parameter Modelica.SIunits.Density rho_default= + parameter Modelica.Units.SI.Density rho_default= Medium.density(sta_default) "Density, used to compute fluid mass"; - 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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/Controls/BaseClasses/Examples/GCritCalc.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/Controls/BaseClasses/Examples/GCritCalc.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/Controls/BaseClasses/Examples/GCritCalc.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/Controls/BaseClasses/Examples/GCritCalc.mo" 2021-09-16 11:18:07.746283878 +0200 @@ -7,12 +7,12 @@ annotation (Placement(transformation(extent={{-12,0},{8,20}}))); Modelica.Blocks.Sources.Sine TEnv( amplitude=10, - freqHz=0.1, +f =0.1, offset=10) annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); Modelica.Blocks.Sources.Sine TIn( amplitude=10, - freqHz=0.01, +f =0.01, offset=30) annotation (Placement(transformation(extent={{-80,-20},{-60,0}}))); equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/Controls/Examples/SolarPumpController.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/Controls/Examples/SolarPumpController.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/Controls/Examples/SolarPumpController.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/Controls/Examples/SolarPumpController.mo" 2021-09-16 11:18:07.714283985 +0200 @@ -12,7 +12,7 @@ annotation (Placement(transformation(extent={{-60,20},{-40,40}}))); Modelica.Blocks.Sources.Sine sine( amplitude=20, - freqHz=0.0001, +f =0.0001, offset=273.15 + 40) "Water inlet temperature" annotation (Placement(transformation(extent={{-60,-20},{-40,0}}))); equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/Data/GenericSolarCollector.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/Data/GenericSolarCollector.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/Data/GenericSolarCollector.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/Data/GenericSolarCollector.mo" 2021-09-16 11:18:07.650284199 +0200 @@ -4,10 +4,10 @@ extends Modelica.Icons.Record; parameter SolarCollectors.Types.Area ATyp "Gross or aperture area"; - parameter Modelica.SIunits.Area A "Area"; - parameter Modelica.SIunits.Mass mDry "Dry weight"; - parameter Modelica.SIunits.Volume V "Fluid volume"; - parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa") + parameter Modelica.Units.SI.Area A "Area"; + parameter Modelica.Units.SI.Mass mDry "Dry weight"; + parameter Modelica.Units.SI.Volume V "Fluid volume"; + parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa") "Pressure drop during test conditions"; parameter Real mperA_flow_nominal(unit="kg/(s.m2)") "Mass flow rate per unit area of collector"; @@ -19,9 +19,9 @@ parameter Real C1 "Heat loss coefficient from EN12975 ratings data"; parameter Real C2 "Temperature dependence of heat loss from EN12975 ratings data"; - parameter Modelica.SIunits.Irradiance G_nominal + parameter Modelica.Units.SI.Irradiance G_nominal "Nominal solar irradiance specified in ratings data"; - parameter Modelica.SIunits.TemperatureDifference dT_nominal + parameter Modelica.Units.SI.TemperatureDifference dT_nominal "Nominal temperature difference specified in ratings data"; annotation ( defaultComponentPrefixes="parameter", diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/Examples/Concentrating.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/Examples/Concentrating.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/Examples/Concentrating.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/Examples/Concentrating.mo" 2021-09-16 11:18:07.542284561 +0200 @@ -47,7 +47,7 @@ rotation=180, origin={-54,-10}))); Modelica.Blocks.Sources.Sine sine( - freqHz=3/86400, + f =3/86400, offset=101325, amplitude=-2*solCol.dp_nominal) annotation (Placement(transformation(extent={{-100,-20},{-80,0}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/Examples/FlatPlate.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/Examples/FlatPlate.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/Examples/FlatPlate.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/Examples/FlatPlate.mo" 2021-09-16 11:18:07.522284629 +0200 @@ -49,7 +49,7 @@ rotation=180, origin={-50,-10}))); Modelica.Blocks.Sources.Sine sine( - freqHz=3/86400, + f =3/86400, amplitude=-solCol.dp_nominal, offset=1E5) "Pressure source" annotation (Placement(transformation(extent={{-100,-20},{-80,0}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/Examples/Tubular.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/Examples/Tubular.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/Examples/Tubular.mo" 2021-09-16 11:15:38.450780421 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/Examples/Tubular.mo" 2021-09-16 11:18:07.450284870 +0200 @@ -37,7 +37,7 @@ Medium, m_flow_nominal=solCol.m_flow_nominal) "Temperature sensor" annotation (Placement(transformation(extent={{-30,-20},{-10,0}}))); Modelica.Blocks.Sources.Sine sine( - freqHz=3/86400, + f =3/86400, offset=101325, amplitude=-1.5*solCol.dp_nominal) annotation (Placement(transformation(extent={{-100,-20},{-80,0}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/Validation/EN12975_Series.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/Validation/EN12975_Series.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/Validation/EN12975_Series.mo" 2021-09-16 11:15:38.458780394 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/SolarCollectors/Validation/EN12975_Series.mo" 2021-09-16 11:18:07.338285245 +0200 @@ -4,7 +4,7 @@ extends Modelica.Icons.Example; replaceable package Medium = Buildings.Media.Water "Medium in the system"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= solCol.datSolCol.A*solCol.datSolCol.mperA_flow_nominal "Nominal mass flow rate"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sources/MassFlowSource_T.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sources/MassFlowSource_T.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sources/MassFlowSource_T.mo" 2021-09-16 11:15:38.458780394 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sources/MassFlowSource_T.mo" 2021-09-16 11:18:06.786287096 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sources/MassFlowSource_WeatherData.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sources/MassFlowSource_WeatherData.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sources/MassFlowSource_WeatherData.mo" 2021-09-16 11:15:38.458780394 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sources/MassFlowSource_WeatherData.mo" 2021-09-16 11:18:06.762287177 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sources/MassFlowSource_h.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sources/MassFlowSource_h.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sources/MassFlowSource_h.mo" 2021-09-16 11:15:38.458780394 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sources/MassFlowSource_h.mo" 2021-09-16 11:18:06.726287297 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sources/Outside_Cp.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sources/Outside_Cp.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sources/Outside_Cp.mo" 2021-09-16 11:15:38.458780394 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sources/Outside_Cp.mo" 2021-09-16 11:18:06.670287485 +0200 @@ -12,7 +12,7 @@ Modelica.Blocks.Interfaces.RealInput Cp_in(unit="1") if use_Cp_in "Prescribed wind pressure coefficient" annotation (Placement(transformation(extent={{-140,20},{-100,60}}))); - Modelica.SIunits.Pressure pWin(displayUnit="Pa") + Modelica.Units.SI.Pressure pWin(displayUnit="Pa") "Change in pressure due to wind force"; protected diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sources/Outside_CpLowRise.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sources/Outside_CpLowRise.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sources/Outside_CpLowRise.mo" 2021-09-16 11:15:38.458780394 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sources/Outside_CpLowRise.mo" 2021-09-16 11:18:06.650287552 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sources/TraceSubstancesFlowSource.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sources/TraceSubstancesFlowSource.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sources/TraceSubstancesFlowSource.mo" 2021-09-16 11:15:38.458780394 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sources/TraceSubstancesFlowSource.mo" 2021-09-16 11:18:06.598287726 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sources/Validation/BaseClasses/BoundarySystem.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sources/Validation/BaseClasses/BoundarySystem.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sources/Validation/BaseClasses/BoundarySystem.mo" 2021-09-16 11:15:38.458780394 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Sources/Validation/BaseClasses/BoundarySystem.mo" 2021-09-16 11:18:06.350288557 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/BaseClasses/Buoyancy.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/BaseClasses/Buoyancy.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/BaseClasses/Buoyancy.mo" 2021-09-16 11:15:38.458780394 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/BaseClasses/Buoyancy.mo" 2021-09-16 11:18:06.262288853 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo" 2021-09-16 11:15:38.458780394 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo" 2021-09-16 11:18:06.222288987 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/BaseClasses/PartialStratified.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/BaseClasses/PartialStratified.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/BaseClasses/PartialStratified.mo" 2021-09-16 11:15:38.458780394 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/BaseClasses/PartialStratified.mo" 2021-09-16 11:18:06.146289241 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/BaseClasses/ThirdOrderStratifier.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/BaseClasses/ThirdOrderStratifier.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/BaseClasses/ThirdOrderStratifier.mo" 2021-09-16 11:15:38.458780394 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/BaseClasses/ThirdOrderStratifier.mo" 2021-09-16 11:18:06.070289496 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/Examples/Stratified.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/Examples/Stratified.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/Examples/Stratified.mo" 2021-09-16 11:15:38.458780394 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/Examples/Stratified.mo" 2021-09-16 11:18:06.018289671 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/Examples/StratifiedEnhancedInternalHex.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/Examples/StratifiedEnhancedInternalHex.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/Examples/StratifiedEnhancedInternalHex.mo" 2021-09-16 11:15:38.458780394 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/Examples/StratifiedEnhancedInternalHex.mo" 2021-09-16 11:18:05.966289845 +0200 @@ -6,10 +6,10 @@ package MediumTan = Buildings.Media.Water "Medium in the tank"; package MediumHex = Buildings.Media.Water "Medium in the heat exchanger"; - parameter Modelica.SIunits.PressureDifference dpHex_nominal=2500 + parameter Modelica.Units.SI.PressureDifference dpHex_nominal=2500 "Pressure drop across the heat exchanger at nominal conditions"; - parameter Modelica.SIunits.MassFlowRate mHex_flow_nominal = 0.278 + parameter Modelica.Units.SI.MassFlowRate mHex_flow_nominal = 0.278 "Mass flow rate of heat exchanger"; Buildings.Fluid.Sources.Boundary_pT bouWat(redeclare package Medium = diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/Examples/StratifiedUnloadAtMinimumTemperature.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/Examples/StratifiedUnloadAtMinimumTemperature.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/Examples/StratifiedUnloadAtMinimumTemperature.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/Examples/StratifiedUnloadAtMinimumTemperature.mo" 2021-09-16 11:18:05.922289992 +0200 @@ -4,9 +4,9 @@ extends Modelica.Icons.Example; package Medium = Buildings.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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/ExpansionVessel.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/ExpansionVessel.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/ExpansionVessel.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/ExpansionVessel.mo" 2021-09-16 11:18:05.858290206 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/StratifiedEnhancedInternalHex.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/StratifiedEnhancedInternalHex.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/StratifiedEnhancedInternalHex.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/StratifiedEnhancedInternalHex.mo" 2021-09-16 11:18:05.770290502 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/Validation/HeatExchangerDynamics.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/Validation/HeatExchangerDynamics.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/Validation/HeatExchangerDynamics.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/Validation/HeatExchangerDynamics.mo" 2021-09-16 11:18:05.698290743 +0200 @@ -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; Buildings.Fluid.Sources.Boundary_pT watInTan( redeclare package Medium = Medium, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/Validation/HeatExchangerLocation.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/Validation/HeatExchangerLocation.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/Validation/HeatExchangerLocation.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/Validation/HeatExchangerLocation.mo" 2021-09-16 11:18:05.666290850 +0200 @@ -5,9 +5,9 @@ package Medium = Buildings.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; Buildings.Fluid.Sources.Boundary_pT watInTan( redeclare package Medium = Medium, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/Validation/StratifiedLoadingUnloading.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/Validation/StratifiedLoadingUnloading.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/Validation/StratifiedLoadingUnloading.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/Validation/StratifiedLoadingUnloading.mo" 2021-09-16 11:18:05.462291534 +0200 @@ -5,7 +5,7 @@ package Medium = Buildings.Media.Water "Medium model"; constant Integer nSeg = 7 "Number of segments in tank"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= 1*1000/3600/4; + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 1*1000/3600/4; Buildings.Fluid.Sources.Boundary_pT sou_1( p=300000 + 5000, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/Validation/StratifiedNonUniformInitial.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/Validation/StratifiedNonUniformInitial.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/Validation/StratifiedNonUniformInitial.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Fluid/Storage/Validation/StratifiedNonUniformInitial.mo" 2021-09-16 11:18:05.434291628 +0200 @@ -6,7 +6,7 @@ package Medium = Buildings.Media.Water "Medium model"; constant Integer nSeg = 7 "Number of segments in tank"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= 1*1000/3600/4; + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 1*1000/3600/4; Buildings.Fluid.Sources.Boundary_pT sou_1( p=300000 + 5000, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Conduction/BaseClasses/Examples/Temperature_u.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Conduction/BaseClasses/Examples/Temperature_u.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Conduction/BaseClasses/Examples/Temperature_u.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Conduction/BaseClasses/Examples/Temperature_u.mo" 2021-09-16 11:18:05.266292191 +0200 @@ -22,36 +22,36 @@ d=1000, k=1, x=0.2) "Phase change material with non-monotone u-T relation"; - parameter Modelica.SIunits.SpecificInternalEnergy ud[Buildings.HeatTransfer.Conduction.nSupPCM](each fixed=false) + parameter Modelica.Units.SI.SpecificInternalEnergy ud[Buildings.HeatTransfer.Conduction.nSupPCM](each fixed=false) "Support points"; - parameter Modelica.SIunits.SpecificInternalEnergy udMonotone[Buildings.HeatTransfer.Conduction.nSupPCM](each fixed=false) + parameter Modelica.Units.SI.SpecificInternalEnergy udMonotone[Buildings.HeatTransfer.Conduction.nSupPCM](each fixed=false) "Support points"; - parameter Modelica.SIunits.Temperature Td[Buildings.HeatTransfer.Conduction.nSupPCM](each fixed=false) + parameter Modelica.Units.SI.Temperature Td[Buildings.HeatTransfer.Conduction.nSupPCM](each fixed=false) "Support points"; - parameter Modelica.SIunits.Temperature TdMonotone[Buildings.HeatTransfer.Conduction.nSupPCM](each fixed=false) + parameter Modelica.Units.SI.Temperature TdMonotone[Buildings.HeatTransfer.Conduction.nSupPCM](each fixed=false) "Support points"; parameter Real dT_du[Buildings.HeatTransfer.Conduction.nSupPCM](each fixed=false, each unit="kg.K2/J") "Derivatives at the support points - non-monotone, default in Modelica PCM"; parameter Real dT_duMonotone[Buildings.HeatTransfer.Conduction.nSupPCM](each fixed=false, each unit="kg.K2/J") "Derivatives at the support points for monotone increasing cubic splines"; - Modelica.SIunits.SpecificInternalEnergy u "Specific internal energy"; - Modelica.SIunits.Temperature T + Modelica.Units.SI.SpecificInternalEnergy u "Specific internal energy"; + Modelica.Units.SI.Temperature T "Temperature for given u without monotone interpolation"; - Modelica.SIunits.Temperature TMonotone + Modelica.Units.SI.Temperature TMonotone "Temperature for given u with monotone interpolation"; - Modelica.SIunits.Temperature TExa "Exact value of temperature"; + Modelica.Units.SI.Temperature TExa "Exact value of temperature"; Real errMonotone "Relative temperature error between calculated value with monotone interpolation and exact temperature"; Real errNonMonotone "Relative temperature error between calculated value with non-monotone interpolation and exact temperature"; - parameter Modelica.SIunits.TemperatureDifference dTCha = materialMonotone.TSol+materialMonotone.TLiq + parameter Modelica.Units.SI.TemperatureDifference dTCha = materialMonotone.TSol+materialMonotone.TLiq "Characteristic temperature difference of the problem"; protected function relativeError "Relative error" - input Modelica.SIunits.Temperature T "Approximated temperature"; - input Modelica.SIunits.Temperature TExa "Exact temperature"; - input Modelica.SIunits.TemperatureDifference dTCha + input Modelica.Units.SI.Temperature T "Approximated temperature"; + input Modelica.Units.SI.Temperature TExa "Exact temperature"; + input Modelica.Units.SI.TemperatureDifference dTCha "Characteristic temperature difference"; output Real relErr "Relative error"; algorithm diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Conduction/BaseClasses/PartialConductor.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Conduction/BaseClasses/PartialConductor.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Conduction/BaseClasses/PartialConductor.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Conduction/BaseClasses/PartialConductor.mo" 2021-09-16 11:18:05.238292285 +0200 @@ -1,15 +1,15 @@ within Buildings.HeatTransfer.Conduction.BaseClasses; partial model PartialConductor "Partial model for heat conductor" extends Buildings.BaseClasses.BaseIcon; - parameter Modelica.SIunits.Area A "Heat transfer area"; - final parameter Modelica.SIunits.CoefficientOfHeatTransfer U = UA/A + parameter Modelica.Units.SI.Area A "Heat transfer area"; + final parameter Modelica.Units.SI.CoefficientOfHeatTransfer U = UA/A "U-value (without surface heat transfer coefficients)"; - final parameter Modelica.SIunits.ThermalConductance UA = 1/R + final parameter Modelica.Units.SI.ThermalConductance UA = 1/R "Thermal conductance of construction (without surface heat transfer coefficients)"; - parameter Modelica.SIunits.ThermalResistance R + parameter Modelica.Units.SI.ThermalResistance R "Thermal resistance of construction"; - Modelica.SIunits.TemperatureDifference dT "port_a.T - port_b.T"; + Modelica.Units.SI.TemperatureDifference dT "port_a.T - port_b.T"; Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port_a "Heat port at surface a" annotation (Placement(transformation(extent={{-110,-10}, {-90,10}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Conduction/BaseClasses/PartialConstruction.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Conduction/BaseClasses/PartialConstruction.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Conduction/BaseClasses/PartialConstruction.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Conduction/BaseClasses/PartialConstruction.mo" 2021-09-16 11:18:05.226292325 +0200 @@ -14,10 +14,10 @@ parameter Boolean steadyStateInitial=false "=true initializes dT(0)/dt=0, false initializes T(0) at fixed temperature using T_a_start and T_b_start" annotation (Dialog(group="Initialization"), Evaluate=true); - parameter Modelica.SIunits.Temperature T_a_start=293.15 + parameter Modelica.Units.SI.Temperature T_a_start=293.15 "Initial temperature at port_a, used if steadyStateInitial = false" annotation (Dialog(group="Initialization", enable=not steadyStateInitial)); - parameter Modelica.SIunits.Temperature T_b_start=293.15 + parameter Modelica.Units.SI.Temperature T_b_start=293.15 "Initial temperature at port_b, used if steadyStateInitial = false" annotation (Dialog(group="Initialization", enable=not steadyStateInitial)); annotation ( Documentation(info=" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Conduction/BaseClasses/der_temperature_u.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Conduction/BaseClasses/der_temperature_u.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Conduction/BaseClasses/der_temperature_u.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Conduction/BaseClasses/der_temperature_u.mo" 2021-09-16 11:18:05.210292379 +0200 @@ -1,19 +1,19 @@ within Buildings.HeatTransfer.Conduction.BaseClasses; function der_temperature_u "Computes the derivative of the temperature of a phase change material with respect to specific internal energy" - input Modelica.SIunits.SpecificHeatCapacity c "Specific heat capacity"; - input Modelica.SIunits.Temperature TSol + input Modelica.Units.SI.SpecificHeatCapacity c "Specific heat capacity"; + input Modelica.Units.SI.Temperature TSol "Solidus temperature, used only for PCM."; - input Modelica.SIunits.Temperature TLiq + input Modelica.Units.SI.Temperature TLiq "Liquidus temperature, used only for PCM"; - input Modelica.SIunits.SpecificInternalEnergy LHea + input Modelica.Units.SI.SpecificInternalEnergy LHea "Latent heat of phase change"; input Boolean ensureMonotonicity = false "Set to true to force derivatives dT/du to be monotone"; - output Modelica.SIunits.SpecificInternalEnergy ud[Buildings.HeatTransfer.Conduction.nSupPCM] + output Modelica.Units.SI.SpecificInternalEnergy ud[Buildings.HeatTransfer.Conduction.nSupPCM] "Support points for derivatives"; - output Modelica.SIunits.Temperature Td[Buildings.HeatTransfer.Conduction.nSupPCM] + output Modelica.Units.SI.Temperature Td[Buildings.HeatTransfer.Conduction.nSupPCM] "Support points for derivatives"; output Real dT_du[Buildings.HeatTransfer.Conduction.nSupPCM]( each fixed=false, @@ -21,9 +21,9 @@ "Derivatives dT/du at the support points"; protected parameter Real scale=0.999 "Used to place points on the phase transition"; - parameter Modelica.SIunits.Temperature Tm1=TSol+(1-scale)*(TLiq-TSol) + parameter Modelica.Units.SI.Temperature Tm1=TSol+(1-scale)*(TLiq-TSol) "Support point"; - parameter Modelica.SIunits.Temperature Tm2=TSol+scale*(TLiq-TSol) + parameter Modelica.Units.SI.Temperature Tm2=TSol+scale*(TLiq-TSol) "Support point"; algorithm assert(Buildings.HeatTransfer.Conduction.nSupPCM == 6, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Conduction/BaseClasses/temperature_u.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Conduction/BaseClasses/temperature_u.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Conduction/BaseClasses/temperature_u.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Conduction/BaseClasses/temperature_u.mo" 2021-09-16 11:18:05.190292445 +0200 @@ -2,16 +2,16 @@ function temperature_u "Computes the temperature of a phase change material for a given specific internal energy" - input Modelica.SIunits.SpecificInternalEnergy ud[Buildings.HeatTransfer.Conduction.nSupPCM] + input Modelica.Units.SI.SpecificInternalEnergy ud[Buildings.HeatTransfer.Conduction.nSupPCM] "Support points for derivatives"; - input Modelica.SIunits.Temperature Td[Buildings.HeatTransfer.Conduction.nSupPCM] + input Modelica.Units.SI.Temperature Td[Buildings.HeatTransfer.Conduction.nSupPCM] "Support points for derivatives"; input Real dT_du[:](each fixed=false, each unit="kg.K2/J") "Derivatives dT/du at the support points"; - input Modelica.SIunits.SpecificInternalEnergy u "Specific internal energy"; + input Modelica.Units.SI.SpecificInternalEnergy u "Specific internal energy"; - output Modelica.SIunits.Temperature T "Resulting temperature"; + output Modelica.Units.SI.Temperature T "Resulting temperature"; protected Integer i "Integer to select data interval"; algorithm diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Conduction/MultiLayer.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Conduction/MultiLayer.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Conduction/MultiLayer.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Conduction/MultiLayer.mo" 2021-09-16 11:18:05.174292499 +0200 @@ -3,9 +3,9 @@ "Model for heat conductance through a solid with multiple material layers" extends Buildings.HeatTransfer.Conduction.BaseClasses.PartialConductor( final R=sum(lay[i].R for i in 1:nLay)); - Modelica.SIunits.Temperature T[sum(layers.nSta)]( + Modelica.Units.SI.Temperature T[sum(layers.nSta)]( each nominal = 300) "Temperature at the states"; - Modelica.SIunits.HeatFlowRate Q_flow[sum(layers.nSta)+nLay] + Modelica.Units.SI.HeatFlowRate Q_flow[sum(layers.nSta)+nLay] "Heat flow rate from state i to i+1"; extends Buildings.HeatTransfer.Conduction.BaseClasses.PartialConstruction; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Conduction/SingleLayer.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Conduction/SingleLayer.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Conduction/SingleLayer.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Conduction/SingleLayer.mo" 2021-09-16 11:18:05.138292620 +0200 @@ -8,7 +8,7 @@ // The value T[:].start is used by the solver when finding initial states // that satisfy dT/dt=0, which requires solving a system of nonlinear equations // if the convection coefficient is a function of temperature. - Modelica.SIunits.Temperature T[nSta](start= + Modelica.Units.SI.Temperature T[nSta](start= if stateAtSurface_a then cat(1, {T_a_start}, @@ -18,9 +18,9 @@ each nominal=300) "Temperature at the states"; - Modelica.SIunits.HeatFlowRate Q_flow[nSta+1](each start=0) + Modelica.Units.SI.HeatFlowRate Q_flow[nSta+1](each start=0) "Heat flow rates to each state"; - Modelica.SIunits.SpecificInternalEnergy u[nSta]( + Modelica.Units.SI.SpecificInternalEnergy u[nSta]( each start=2.7E5, each nominal=2.7E5) "Definition of specific internal energy"; @@ -42,10 +42,10 @@ parameter Boolean steadyStateInitial=false "=true initializes dT(0)/dt=0, false initializes T(0) at fixed temperature using T_a_start and T_b_start" annotation (Dialog(group="Initialization"), Evaluate=true); - parameter Modelica.SIunits.Temperature T_a_start=293.15 + parameter Modelica.Units.SI.Temperature T_a_start=293.15 "Initial temperature at port_a, used if steadyStateInitial = false" annotation (Dialog(group="Initialization", enable=not steadyStateInitial)); - parameter Modelica.SIunits.Temperature T_b_start=293.15 + parameter Modelica.Units.SI.Temperature T_b_start=293.15 "Initial temperature at port_b, used if steadyStateInitial = false" annotation (Dialog(group="Initialization", enable=not steadyStateInitial)); parameter Integer nSta2=material.nSta @@ -57,7 +57,7 @@ if stateAtSurface_a or stateAtSurface_b then 2 else 1) "Number of state variables"; final parameter Integer nR=nSta+1 "Number of thermal resistances"; - parameter Modelica.SIunits.ThermalResistance RNod[nR]= + parameter Modelica.Units.SI.ThermalResistance RNod[nR]= if (stateAtSurface_a and stateAtSurface_b) then if (nSta==2) then {(if i==1 or i==nR then 0 else R/(nSta-1)) for i in 1:nR} @@ -71,7 +71,7 @@ {R/(if i==1 or i==nR then (2*nSta) else nSta) for i in 1:nR} "Thermal resistance"; - parameter Modelica.SIunits.Mass m[nSta]= + parameter Modelica.Units.SI.Mass m[nSta]= (A*material.x*material.d) * (if (stateAtSurface_a and stateAtSurface_b) then if (nSta==2) then @@ -92,16 +92,16 @@ if material.steadyState then zeros(nSta) else {1/m[i] for i in 1:nSta} "Inverse of the mass associated with the temperature state"; - final parameter Modelica.SIunits.HeatCapacity C[nSta] = m*material.c + final parameter Modelica.Units.SI.HeatCapacity C[nSta] = m*material.c "Heat capacity associated with the temperature state"; final parameter Real CInv[nSta]= if material.steadyState then zeros(nSta) else {1/C[i] for i in 1:nSta} "Inverse of heat capacity associated with the temperature state"; - parameter Modelica.SIunits.SpecificInternalEnergy ud[Buildings.HeatTransfer.Conduction.nSupPCM]( + parameter Modelica.Units.SI.SpecificInternalEnergy ud[Buildings.HeatTransfer.Conduction.nSupPCM]( each fixed=false) "Support points for derivatives (used for PCM)"; - parameter Modelica.SIunits.Temperature Td[Buildings.HeatTransfer.Conduction.nSupPCM]( + parameter Modelica.Units.SI.Temperature Td[Buildings.HeatTransfer.Conduction.nSupPCM]( each fixed=false) "Support points for derivatives (used for PCM)"; parameter Real dT_du[Buildings.HeatTransfer.Conduction.nSupPCM]( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Conduction/SingleLayerCylinder.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Conduction/SingleLayerCylinder.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Conduction/SingleLayerCylinder.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Conduction/SingleLayerCylinder.mo" 2021-09-16 11:18:05.070292848 +0200 @@ -4,14 +4,14 @@ "Material thermal properties" annotation (choicesAllMatching=true); - parameter Modelica.SIunits.Height h "Height of the cylinder"; - parameter Modelica.SIunits.Radius r_a "Internal radius"; - parameter Modelica.SIunits.Radius r_b "External radius"; + parameter Modelica.Units.SI.Height h "Height of the cylinder"; + parameter Modelica.Units.SI.Radius r_a "Internal radius"; + parameter Modelica.Units.SI.Radius r_b "External radius"; parameter Integer nSta(min=1) "Number of state variables"; - parameter Modelica.SIunits.Temperature TInt_start=293.15 + parameter Modelica.Units.SI.Temperature TInt_start=293.15 "Initial temperature at port_a, used if steadyStateInitial = false" annotation (Dialog(group="Initialization", enable=not steadyStateInitial)); - parameter Modelica.SIunits.Temperature TExt_start=293.15 + parameter Modelica.Units.SI.Temperature TExt_start=293.15 "Initial temperature at port_b, used if steadyStateInitial = false" annotation (Dialog(group="Initialization", enable=not steadyStateInitial)); parameter Boolean steadyStateInitial=false @@ -20,7 +20,7 @@ parameter Real griFac(min=1) = 2 "Grid factor for spacing"; - Modelica.SIunits.TemperatureDifference dT "port_a.T - port_b.T"; + Modelica.Units.SI.TemperatureDifference dT "port_a.T - port_b.T"; Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port_a "Heat port at surface a" annotation (Placement(transformation(extent={{-110,-10}, @@ -29,33 +29,33 @@ "Heat port at surface b" annotation (Placement(transformation(extent={{90,-10},{ 110,10}}))); - Modelica.SIunits.Temperature T[nSta](start= + Modelica.Units.SI.Temperature T[nSta](start= {TInt_start+ (TExt_start-TInt_start)/Modelica.Math.log(r_b/r_a) *Modelica.Math.log((r_a+(r_b-r_a)/(nSta)*(i-0.5))/r_a) for i in 1:nSta}) "Temperature of the states"; - Modelica.SIunits.HeatFlowRate Q_flow[nSta+1] + Modelica.Units.SI.HeatFlowRate Q_flow[nSta+1] "Heat flow rate from state i to i+1"; // Modelica.SIunits.TemperatureSlope der_T[nSta] // "Time derivative of temperature (= der(T))"; protected - parameter Modelica.SIunits.Radius r[nSta+1](each fixed=false) + + parameter Modelica.Units.SI.Radius r[nSta+1](each fixed=false) "Radius to the boundary of the i-th domain"; - parameter Modelica.SIunits.Radius rC[nSta](each fixed=false) + parameter Modelica.Units.SI.Radius rC[nSta](each fixed=false) "Radius to the center of the i-th domain"; - final parameter Modelica.SIunits.SpecificHeatCapacity c= material.c + final parameter Modelica.Units.SI.SpecificHeatCapacity c= material.c "Specific heat capacity"; - final parameter Modelica.SIunits.ThermalConductivity k= material.k + final parameter Modelica.Units.SI.ThermalConductivity k= material.k "Thermal conductivity of the material"; - final parameter Modelica.SIunits.Density d = material.d + final parameter Modelica.Units.SI.Density d = material.d "Density of the material"; - parameter Modelica.SIunits.ThermalConductance G[nSta+1](each fixed=false) + parameter Modelica.Units.SI.ThermalConductance G[nSta+1](each fixed=false) "Heat conductance between the temperature nodes"; - parameter Modelica.SIunits.HeatCapacity C[nSta](each fixed=false) + parameter Modelica.Units.SI.HeatCapacity C[nSta](each fixed=false) "Heat capacity of each state"; - initial equation assert(r_a < r_b, "Error: Model requires r_a < r_b."); assert(0 < r_a, "Error: Model requires 0 < r_a."); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Convection/BaseClasses/PartialConvection.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Convection/BaseClasses/PartialConvection.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Convection/BaseClasses/PartialConvection.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Convection/BaseClasses/PartialConvection.mo" 2021-09-16 11:18:05.022293009 +0200 @@ -1,11 +1,11 @@ within Buildings.HeatTransfer.Convection.BaseClasses; partial model PartialConvection "Partial model for heat convection" extends Buildings.BaseClasses.BaseIcon; - parameter Modelica.SIunits.Area A "Heat transfer area"; + parameter Modelica.Units.SI.Area A "Heat transfer area"; - Modelica.SIunits.HeatFlowRate Q_flow "Heat flow rate from solid -> fluid"; - Modelica.SIunits.HeatFlux q_flow "Convective heat flux from solid -> fluid"; - Modelica.SIunits.TemperatureDifference dT(start=0) "= solid.T - fluid.T"; + Modelica.Units.SI.HeatFlowRate Q_flow "Heat flow rate from solid -> fluid"; + Modelica.Units.SI.HeatFlux q_flow "Convective heat flux from solid -> fluid"; + Modelica.Units.SI.TemperatureDifference dT(start=0) "= solid.T - fluid.T"; Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a solid annotation (Placement(transformation(extent={{-110, -10},{-90,10}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Convection/Exterior.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Convection/Exterior.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Convection/Exterior.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Convection/Exterior.mo" 2021-09-16 11:18:04.934293303 +0200 @@ -7,16 +7,16 @@ "Convective heat transfer model" annotation(Evaluate=true); - parameter Modelica.SIunits.CoefficientOfHeatTransfer hFixed=3 + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hFixed=3 "Constant convection coefficient" annotation (Dialog(enable=(conMod == Buildings.HeatTransfer.Types.ExteriorConvection.Fixed))); parameter Buildings.HeatTransfer.Types.SurfaceRoughness roughness= Buildings.HeatTransfer.Types.SurfaceRoughness.Medium "Surface roughness" annotation (Dialog(enable=(conMod <> Buildings.HeatTransfer.Types.ExteriorConvection.Fixed))); - parameter Modelica.SIunits.Angle azi "Surface azimuth"; + parameter Modelica.Units.SI.Angle azi "Surface azimuth"; - parameter Modelica.SIunits.Angle til(displayUnit="deg") "Surface tilt" + parameter Modelica.Units.SI.Angle til(displayUnit="deg") "Surface tilt" annotation (Dialog(enable=(conMod <> Buildings.HeatTransfer.Types.ExteriorConvection.Fixed))); Modelica.Blocks.Interfaces.RealInput v(unit="m/s") "Wind speed" @@ -24,14 +24,14 @@ Modelica.Blocks.Interfaces.RealInput dir(unit="rad", displayUnit="deg", min=0, max=2*Modelica.Constants.pi) "Wind direction (0=wind from North)" annotation (Placement(transformation(extent={{-140,30},{-100,70}}))); - Modelica.SIunits.CoefficientOfHeatTransfer hF + Modelica.Units.SI.CoefficientOfHeatTransfer hF "Convective heat transfer coefficient due to forced convection"; - Modelica.SIunits.HeatFlux qN_flow + Modelica.Units.SI.HeatFlux qN_flow "Convective heat flux from solid -> fluid due to natural convection"; - Modelica.SIunits.HeatFlux qF_flow + Modelica.Units.SI.HeatFlux qF_flow "Convective heat flux from solid -> fluid due to forced convection"; protected - constant Modelica.SIunits.Velocity v_small = 0.5 + constant Modelica.Units.SI.Velocity v_small = 0.5 "Small value for wind velocity below which equations are regularized"; final parameter Real cosTil=Modelica.Math.cos(til) "Cosine of window tilt"; final parameter Real sinTil=Modelica.Math.sin(til) "Sine of window tilt"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Convection/Functions/HeatFlux/BaseClasses/PartialHeatFlux.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Convection/Functions/HeatFlux/BaseClasses/PartialHeatFlux.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Convection/Functions/HeatFlux/BaseClasses/PartialHeatFlux.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Convection/Functions/HeatFlux/BaseClasses/PartialHeatFlux.mo" 2021-09-16 11:18:04.686294135 +0200 @@ -2,9 +2,9 @@ partial function PartialHeatFlux "Partial function for convective heat flux" extends Modelica.Icons.Function; - input Modelica.SIunits.TemperatureDifference dT + input Modelica.Units.SI.TemperatureDifference dT "Temperature difference solid minus fluid"; - output Modelica.SIunits.HeatFlux q_flow + output Modelica.Units.SI.HeatFlux q_flow "Convective heat flux from solid to fluid"; annotation (Documentation(info= " diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Convection/Functions/HeatFlux/constantCoefficient.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Convection/Functions/HeatFlux/constantCoefficient.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Convection/Functions/HeatFlux/constantCoefficient.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Convection/Functions/HeatFlux/constantCoefficient.mo" 2021-09-16 11:18:04.646294268 +0200 @@ -2,7 +2,7 @@ function constantCoefficient "Constant convective heat transfer coefficient" extends Buildings.HeatTransfer.Convection.Functions.HeatFlux.BaseClasses.PartialHeatFlux; - input Modelica.SIunits.CoefficientOfHeatTransfer hCon = 3 + input Modelica.Units.SI.CoefficientOfHeatTransfer hCon = 3 "Constant for convective heat transfer coefficient"; algorithm q_flow :=hCon*dT; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Convection/Functions/HeatFlux/rayleigh.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Convection/Functions/HeatFlux/rayleigh.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Convection/Functions/HeatFlux/rayleigh.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Convection/Functions/HeatFlux/rayleigh.mo" 2021-09-16 11:18:04.630294322 +0200 @@ -1,17 +1,17 @@ within Buildings.HeatTransfer.Convection.Functions.HeatFlux; function rayleigh "Rayleigh number with smooth transition to lower limit" extends Modelica.Icons.Function; - input Modelica.SIunits.Length x "Layer thickness"; - input Modelica.SIunits.Density rho "Mass density"; - input Modelica.SIunits.SpecificHeatCapacity c_p "Specific heat capacity"; - input Modelica.SIunits.DynamicViscosity mu "Dynamic viscosity"; - input Modelica.SIunits.ThermalConductivity k "Thermal conductivity"; - input Modelica.SIunits.Temperature T_a "Temperature of surface a"; - input Modelica.SIunits.Temperature T_b "Temperature of surface b"; + input Modelica.Units.SI.Length x "Layer thickness"; + input Modelica.Units.SI.Density rho "Mass density"; + input Modelica.Units.SI.SpecificHeatCapacity c_p "Specific heat capacity"; + input Modelica.Units.SI.DynamicViscosity mu "Dynamic viscosity"; + input Modelica.Units.SI.ThermalConductivity k "Thermal conductivity"; + input Modelica.Units.SI.Temperature T_a "Temperature of surface a"; + input Modelica.Units.SI.Temperature T_b "Temperature of surface b"; input Real Ra_min "Minimum value for Rayleigh number"; output Real Ra "Rayleigh number"; protected - Modelica.SIunits.TemperatureDifference dT "Temperature difference"; + Modelica.Units.SI.TemperatureDifference dT "Temperature difference"; algorithm Ra := Buildings.Utilities.Math.Functions.smoothMax( x1=rho^2*x^3*Modelica.Constants.g_n*c_p*abs(T_a - T_b)/((T_a+T_b)/2*mu*k), diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Convection/Functions/windDirectionModifier.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Convection/Functions/windDirectionModifier.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Convection/Functions/windDirectionModifier.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Convection/Functions/windDirectionModifier.mo" 2021-09-16 11:18:04.610294390 +0200 @@ -3,12 +3,12 @@ "Wind direction modifier that is used to compute the wind-driven convective heat transfer coefficient" extends Modelica.Icons.Function; - input Modelica.SIunits.Angle azi "Surface azimuth"; - input Modelica.SIunits.Angle dir(min=0, max=2*Modelica.Constants.pi) + input Modelica.Units.SI.Angle azi "Surface azimuth"; + input Modelica.Units.SI.Angle dir(min=0, max=2*Modelica.Constants.pi) "Wind direction (0=wind from North)"; output Real W "Wind direction modifier"; protected - constant Modelica.SIunits.Angle lee = Modelica.SIunits.Conversions.from_deg(100) + constant Modelica.Units.SI.Angle lee = Modelica.Units.Conversions.from_deg(100) "Angle at which the transition occurs"; constant Real cosLee = Modelica.Math.cos(lee) "Cosine of the angle at which the transition occurs"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Convection/Interior.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Convection/Interior.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Convection/Interior.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Convection/Interior.mo" 2021-09-16 11:18:04.594294443 +0200 @@ -10,15 +10,15 @@ "Convective heat transfer model" annotation(Evaluate=true); - parameter Modelica.SIunits.CoefficientOfHeatTransfer hFixed=3 + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hFixed=3 "Constant convection coefficient" annotation (Dialog(enable=(conMod == Buildings.HeatTransfer.Types.InteriorConvection.Fixed))); - parameter Modelica.SIunits.Angle til(displayUnit="deg") "Surface tilt" + parameter Modelica.Units.SI.Angle til(displayUnit="deg") "Surface tilt" annotation (Dialog(enable=(conMod <> Buildings.HeatTransfer.Types.InteriorConvection.Fixed))); protected - constant Modelica.SIunits.Temperature dT0 = 2 + constant Modelica.Units.SI.Temperature dT0 = 2 "Initial temperature used in homotopy method"; final parameter Real cosTil=Modelica.Math.cos(til) "Cosine of window tilt"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Data/BaseClasses.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Data/BaseClasses.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Data/BaseClasses.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Data/BaseClasses.mo" 2021-09-16 11:18:04.542294618 +0200 @@ -3,10 +3,10 @@ extends Modelica.Icons.BasesPackage; record Material "Thermal properties of materials w/o storage" extends Modelica.Icons.Record; - parameter Modelica.SIunits.Length x "Material thickness"; - parameter Modelica.SIunits.ThermalConductivity k "Thermal conductivity"; - parameter Modelica.SIunits.SpecificHeatCapacity c "Specific heat capacity"; - parameter Modelica.SIunits.Density d "Mass density"; + parameter Modelica.Units.SI.Length x "Material thickness"; + parameter Modelica.Units.SI.ThermalConductivity k "Thermal conductivity"; + parameter Modelica.Units.SI.SpecificHeatCapacity c "Specific heat capacity"; + parameter Modelica.Units.SI.Density d "Mass density"; parameter Real R(unit="m2.K/W") "Thermal resistance of a unit area of material"; parameter Integer nStaRef(min=0) = 3 @@ -27,13 +27,13 @@ "Number of states as a real number" annotation (Dialog(tab="Advanced")); - parameter Modelica.SIunits.Temperature TSol + parameter Modelica.Units.SI.Temperature TSol "Solidus temperature, used only for PCM." annotation (Dialog(group="Properties for phase change material")); - parameter Modelica.SIunits.Temperature TLiq + parameter Modelica.Units.SI.Temperature TLiq "Liquidus temperature, used only for PCM" annotation (Dialog(group="Properties for phase change material")); - parameter Modelica.SIunits.SpecificInternalEnergy LHea + parameter Modelica.Units.SI.SpecificInternalEnergy LHea "Latent heat of phase change" annotation (Dialog(group="Properties for phase change material")); @@ -129,9 +129,9 @@ record ThermalProperties "Thermal properties of materials with storage" extends Modelica.Icons.Record; - parameter Modelica.SIunits.ThermalConductivity k "Thermal conductivity"; - parameter Modelica.SIunits.SpecificHeatCapacity c "Specific heat capacity"; - parameter Modelica.SIunits.Density d "Mass density"; + parameter Modelica.Units.SI.ThermalConductivity k "Thermal conductivity"; + parameter Modelica.Units.SI.SpecificHeatCapacity c "Specific heat capacity"; + parameter Modelica.Units.SI.Density d "Mass density"; parameter Boolean steadyState= (c < Modelica.Constants.eps or d < Modelica.Constants.eps) "Flag, if true, then material is computed using steady-state heat conduction" annotation(Evaluate=true); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Data/Gases.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Data/Gases.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Data/Gases.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Data/Gases.mo" 2021-09-16 11:18:04.502294751 +0200 @@ -4,25 +4,25 @@ record Generic "Thermal properties of fill gas for windows" extends Modelica.Icons.Record; - parameter Modelica.SIunits.Length x "Gas layer thickness"; - parameter Modelica.SIunits.ThermalConductivity a_k + parameter Modelica.Units.SI.Length x "Gas layer thickness"; + parameter Modelica.Units.SI.ThermalConductivity a_k "Constant coefficient for thermal conductivity"; parameter Real b_k(unit="W/(m.K2)") "Temperature dependent coefficient for thermal conductivity"; - parameter Modelica.SIunits.DynamicViscosity a_mu + parameter Modelica.Units.SI.DynamicViscosity a_mu "Constant coefficient for dynamic viscosity"; parameter Real b_mu(unit="N.s/(m2.K)") "Temperature dependent coefficient for dynamic viscosity"; - parameter Modelica.SIunits.SpecificHeatCapacity a_c + parameter Modelica.Units.SI.SpecificHeatCapacity a_c "Constant coefficient for specific heat capacity"; parameter Real b_c(unit="J/(kg.K2)") "Temperature dependent coefficient for specific heat capacity"; - parameter Modelica.SIunits.MolarMass MM - "Molar mass (of mixture or single fluid)"; - parameter Modelica.SIunits.Pressure P0 = 101325 "Normal pressure"; + parameter Modelica.Units.SI.MolarMass MM + "Molar mass (of mixture or single fluid)"; + parameter Modelica.Units.SI.Pressure P0 = 101325 "Normal pressure"; annotation ( defaultComponentPrefixes="parameter", defaultComponentName="datGas", @@ -85,24 +85,24 @@ function thermalConductivity "Function to compute the thermal conductivity of gases" input Buildings.HeatTransfer.Data.Gases.Generic gas "Record of gas data"; - input Modelica.SIunits.Temperature T "Gas temperature"; - output Modelica.SIunits.ThermalConductivity k "Thermal conductivity"; + input Modelica.Units.SI.Temperature T "Gas temperature"; + output Modelica.Units.SI.ThermalConductivity k "Thermal conductivity"; algorithm k := gas.a_k + gas.b_k*T; end thermalConductivity; function density "Function to compute the mass density" input Buildings.HeatTransfer.Data.Gases.Generic gas "Record of gas data"; - input Modelica.SIunits.Temperature T "Gas temperature"; - output Modelica.SIunits.Density rho "Mass density"; + input Modelica.Units.SI.Temperature T "Gas temperature"; + output Modelica.Units.SI.Density rho "Mass density"; algorithm rho := gas.P0*gas.MM/Modelica.Constants.R/T; end density; function dynamicViscosity "Function to compute the dynamic viscosity for gases" input Buildings.HeatTransfer.Data.Gases.Generic gas "Record of gas data"; - input Modelica.SIunits.Temperature T "Gas temperature"; - output Modelica.SIunits.DynamicViscosity mu "Dynamic viscosity"; + input Modelica.Units.SI.Temperature T "Gas temperature"; + output Modelica.Units.SI.DynamicViscosity mu "Dynamic viscosity"; algorithm mu := gas.a_mu + gas.b_mu*T; end dynamicViscosity; @@ -110,8 +110,8 @@ function specificHeatCapacity "Function to compute the specific heat capacity for gases" input Buildings.HeatTransfer.Data.Gases.Generic gas "Record of gas data"; - input Modelica.SIunits.Temperature T "Gas temperature"; - output Modelica.SIunits.SpecificHeatCapacity c_p "Specific heat capacity"; + input Modelica.Units.SI.Temperature T "Gas temperature"; + output Modelica.Units.SI.SpecificHeatCapacity c_p "Specific heat capacity"; algorithm c_p := gas.a_c + gas.b_c*T; end specificHeatCapacity; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Data/Glasses.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Data/Glasses.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Data/Glasses.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Data/Glasses.mo" 2021-09-16 11:18:04.478294832 +0200 @@ -3,19 +3,19 @@ extends Modelica.Icons.MaterialPropertiesPackage; record Generic "Thermal properties of window glass" extends Modelica.Icons.Record; - parameter Modelica.SIunits.Length x=0.003 "Thickness"; - parameter Modelica.SIunits.ThermalConductivity k=1 "Thermal conductivity"; - parameter Modelica.SIunits.TransmissionCoefficient tauSol[:] = {0.6} + parameter Modelica.Units.SI.Length x=0.003 "Thickness"; + parameter Modelica.Units.SI.ThermalConductivity k=1 "Thermal conductivity"; + parameter Modelica.Units.SI.TransmissionCoefficient tauSol[:] = {0.6} "Solar transmittance"; - parameter Modelica.SIunits.ReflectionCoefficient rhoSol_a[:] = {0.075} + parameter Modelica.Units.SI.ReflectionCoefficient rhoSol_a[:] = {0.075} "Solar reflectance of surface a (usually outside-facing surface)"; - parameter Modelica.SIunits.ReflectionCoefficient rhoSol_b[:] = {0.075} + parameter Modelica.Units.SI.ReflectionCoefficient rhoSol_b[:] = {0.075} "Solar reflectance of surface b (usually room-facing surface)"; - parameter Modelica.SIunits.TransmissionCoefficient tauIR = 0 + parameter Modelica.Units.SI.TransmissionCoefficient tauIR = 0 "Infrared transmissivity of glass"; - parameter Modelica.SIunits.Emissivity absIR_a = 0.84 + parameter Modelica.Units.SI.Emissivity absIR_a = 0.84 "Infrared absorptivity of surface a (usually outside-facing surface)"; - parameter Modelica.SIunits.Emissivity absIR_b = 0.84 + parameter Modelica.Units.SI.Emissivity absIR_b = 0.84 "Infrared absorptivity of surface b (usually room-facing surface)"; annotation ( defaultComponentPrefixes="parameter", diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Data/GlazingSystems.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Data/GlazingSystems.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Data/GlazingSystems.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Data/GlazingSystems.mo" 2021-09-16 11:18:04.454294912 +0200 @@ -27,11 +27,11 @@ parameter Shades.Generic shade "Shade" annotation (choicesAllMatching=true, Dialog(enable=haveInteriorShade or haveExteriorShade)); - parameter Modelica.SIunits.CoefficientOfHeatTransfer UFra + parameter Modelica.Units.SI.CoefficientOfHeatTransfer UFra "U-value of frame"; - parameter Modelica.SIunits.Emissivity absIRFra=0.8 + parameter Modelica.Units.SI.Emissivity absIRFra=0.8 "Infrared absorptivity of window frame"; - parameter Modelica.SIunits.Emissivity absSolFra=0.5 + parameter Modelica.Units.SI.Emissivity absSolFra=0.5 "Solar absorptivity of window frame"; final parameter Boolean haveShade = haveInteriorShade or haveExteriorShade "Parameter that is true if the construction has a shade"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Data/OpaqueConstructions.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Data/OpaqueConstructions.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Data/OpaqueConstructions.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Data/OpaqueConstructions.mo" 2021-09-16 11:18:04.434294979 +0200 @@ -14,13 +14,13 @@ final parameter Integer nSta[nLay](each min=1) = {material[i].nSta for i in 1:nLay} "Number of states in each layer" annotation (HideResult=true, Dialog(tab="Advanced")); - parameter Modelica.SIunits.Emissivity absIR_a=0.9 + parameter Modelica.Units.SI.Emissivity absIR_a=0.9 "Infrared absorptivity of surface a (usually outside-facing surface)"; - parameter Modelica.SIunits.Emissivity absIR_b=0.9 + parameter Modelica.Units.SI.Emissivity absIR_b=0.9 "Infrared absorptivity of surface b (usually room-facing surface)"; - parameter Modelica.SIunits.Emissivity absSol_a=0.5 + parameter Modelica.Units.SI.Emissivity absSol_a=0.5 "Solar absorptivity of surface a (usually outside-facing surface)"; - parameter Modelica.SIunits.Emissivity absSol_b=0.5 + parameter Modelica.Units.SI.Emissivity absSol_b=0.5 "Solar absorptivity of surface b (usually room-facing surface)"; parameter Buildings.HeatTransfer.Types.SurfaceRoughness roughness_a= Buildings.HeatTransfer.Types.SurfaceRoughness.Medium diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Data/OpaqueSurfaces.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Data/OpaqueSurfaces.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Data/OpaqueSurfaces.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Data/OpaqueSurfaces.mo" 2021-09-16 11:18:04.410295059 +0200 @@ -5,11 +5,11 @@ record Generic "Thermal properties of opaque surfaces" extends Modelica.Icons.Record; - parameter Modelica.SIunits.Area A "Area"; - parameter Modelica.SIunits.Angle til + parameter Modelica.Units.SI.Area A "Area"; + parameter Modelica.Units.SI.Angle til "Surface tilt (0: ceiling, pi/2: wall, pi: floor"; - parameter Modelica.SIunits.Emissivity absIR=0.84 "Infrared absorptivity"; - parameter Modelica.SIunits.Emissivity absSol=0.84 "Solar absorptivity"; + parameter Modelica.Units.SI.Emissivity absIR=0.84 "Infrared absorptivity"; + parameter Modelica.Units.SI.Emissivity absSol=0.84 "Solar absorptivity"; final parameter Boolean isFloor=til > 2.74889125 and til < 3.53428875 "Flag, true if construction is a floor" annotation (Evaluate=true); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Data/Shades.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Data/Shades.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Data/Shades.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Data/Shades.mo" 2021-09-16 11:18:04.378295167 +0200 @@ -3,23 +3,23 @@ extends Modelica.Icons.MaterialPropertiesPackage; record Generic "Thermal properties of window shades" extends Modelica.Icons.Record; - parameter Modelica.SIunits.TransmissionCoefficient tauSol_a=0.1 + + parameter Modelica.Units.SI.TransmissionCoefficient tauSol_a=0.1 "Solar transmissivity of shade surface a (surface that faces the outside or the room)"; - parameter Modelica.SIunits.TransmissionCoefficient tauSol_b=0.1 + parameter Modelica.Units.SI.TransmissionCoefficient tauSol_b=0.1 "Solar transmissivity of shade surface b (surface that faces the glass)"; - parameter Modelica.SIunits.ReflectionCoefficient rhoSol_a=0.8 + parameter Modelica.Units.SI.ReflectionCoefficient rhoSol_a=0.8 "Solar reflection coefficient of shade surface a (surface that faces the outside or the room)"; - parameter Modelica.SIunits.ReflectionCoefficient rhoSol_b=0.8 + parameter Modelica.Units.SI.ReflectionCoefficient rhoSol_b=0.8 "Solar reflection coefficient of shade surface b (surface that faces the glass)"; - parameter Modelica.SIunits.Emissivity absIR_a=0.84 + parameter Modelica.Units.SI.Emissivity absIR_a=0.84 "Infrared absorptivity of surface a (surface that faces the outside or the room)"; - parameter Modelica.SIunits.Emissivity absIR_b=0.84 + parameter Modelica.Units.SI.Emissivity absIR_b=0.84 "Infrared absorptivity of surface b (surface that faces the glass)"; - parameter Modelica.SIunits.TransmissionCoefficient tauIR_a=0 + parameter Modelica.Units.SI.TransmissionCoefficient tauIR_a=0 "Infrared transmissivity of surface a (surface that faces the outside or the room)"; - parameter Modelica.SIunits.TransmissionCoefficient tauIR_b=0 + parameter Modelica.Units.SI.TransmissionCoefficient tauIR_b=0 "Infrared transmissivity of surface b (surface that faces the glass)"; - annotation ( defaultComponentPrefixes="parameter", defaultComponentName="datSha", diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Examples/ConductorSingleLayerCylinder.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Examples/ConductorSingleLayerCylinder.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Examples/ConductorSingleLayerCylinder.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Examples/ConductorSingleLayerCylinder.mo" 2021-09-16 11:18:04.174295850 +0200 @@ -2,7 +2,7 @@ model ConductorSingleLayerCylinder "Test model for heat conduction in a cylinder" extends Modelica.Icons.Example; - parameter Modelica.SIunits.HeatFlowRate Q_flow=50; + parameter Modelica.Units.SI.HeatFlowRate Q_flow=50; Buildings.HeatTransfer.Conduction.SingleLayerCylinder con( material=concrete, steadyStateInitial=false, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Radiosity/BaseClasses/ParametersOneSurface.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Radiosity/BaseClasses/ParametersOneSurface.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Radiosity/BaseClasses/ParametersOneSurface.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Radiosity/BaseClasses/ParametersOneSurface.mo" 2021-09-16 11:18:03.850296937 +0200 @@ -1,13 +1,13 @@ within Buildings.HeatTransfer.Radiosity.BaseClasses; model ParametersOneSurface "Parameters that are used to model one surface" - parameter Modelica.SIunits.Emissivity absIR "Infrared absorptivity"; - parameter Modelica.SIunits.ReflectionCoefficient rhoIR + parameter Modelica.Units.SI.Emissivity absIR "Infrared absorptivity"; + parameter Modelica.Units.SI.ReflectionCoefficient rhoIR "Infrared reflectivity"; - parameter Modelica.SIunits.TransmissionCoefficient tauIR + parameter Modelica.Units.SI.TransmissionCoefficient tauIR "Infrared transmissivity"; parameter Boolean linearize=false "Set to true to linearize emissive power" annotation (Evaluate=true); - parameter Modelica.SIunits.Temperature T0=293.15 + parameter Modelica.Units.SI.Temperature T0=293.15 "Temperature used to linearize radiative heat transfer" annotation (Dialog(enable=linearize)); protected diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Radiosity/BaseClasses/ParametersTwoSurfaces.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Radiosity/BaseClasses/ParametersTwoSurfaces.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Radiosity/BaseClasses/ParametersTwoSurfaces.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Radiosity/BaseClasses/ParametersTwoSurfaces.mo" 2021-09-16 11:18:03.838296977 +0200 @@ -1,19 +1,19 @@ within Buildings.HeatTransfer.Radiosity.BaseClasses; model ParametersTwoSurfaces "Parameters that are used to model two surfaces with the same area" - parameter Modelica.SIunits.Emissivity absIR_a + parameter Modelica.Units.SI.Emissivity absIR_a "Infrared absorptivity of surface a"; - parameter Modelica.SIunits.Emissivity absIR_b + parameter Modelica.Units.SI.Emissivity absIR_b "Infrared absorptivity of surface b"; - parameter Modelica.SIunits.ReflectionCoefficient rhoIR_a + parameter Modelica.Units.SI.ReflectionCoefficient rhoIR_a "Infrared reflectivity of surface a"; - parameter Modelica.SIunits.ReflectionCoefficient rhoIR_b + parameter Modelica.Units.SI.ReflectionCoefficient rhoIR_b "Infrared reflectivity of surface b"; - parameter Modelica.SIunits.TransmissionCoefficient tauIR + parameter Modelica.Units.SI.TransmissionCoefficient tauIR "Infrared transmissivity of glass pane"; parameter Boolean linearize = false "Set to true to linearize emissive power" annotation (Evaluate=true); - parameter Modelica.SIunits.Temperature T0=293.15 + parameter Modelica.Units.SI.Temperature T0=293.15 "Temperature used to linearize radiative heat transfer" annotation (Dialog(enable=linearize)); protected diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Radiosity/BaseClasses/RadiosityOneSurface.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Radiosity/BaseClasses/RadiosityOneSurface.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Radiosity/BaseClasses/RadiosityOneSurface.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Radiosity/BaseClasses/RadiosityOneSurface.mo" 2021-09-16 11:18:03.826297017 +0200 @@ -2,7 +2,7 @@ partial model RadiosityOneSurface "Model for the radiosity balance of a device with one surface" extends Buildings.BaseClasses.BaseIcon; - parameter Modelica.SIunits.Area A "Surface area"; + parameter Modelica.Units.SI.Area A "Surface area"; Buildings.HeatTransfer.Interfaces.RadiosityInflow JIn(start=A*0.8*Modelica.Constants.sigma*293.15^4) "Incoming radiosity" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Radiosity/BaseClasses/RadiosityTwoSurfaces.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Radiosity/BaseClasses/RadiosityTwoSurfaces.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Radiosity/BaseClasses/RadiosityTwoSurfaces.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Radiosity/BaseClasses/RadiosityTwoSurfaces.mo" 2021-09-16 11:18:03.814297057 +0200 @@ -3,7 +3,7 @@ "Model for the radiosity balance of a device with two surfaces" extends Buildings.BaseClasses.BaseIcon; - parameter Modelica.SIunits.Area A "Heat transfer area"; + parameter Modelica.Units.SI.Area A "Heat transfer area"; Buildings.HeatTransfer.Interfaces.RadiosityInflow JIn_a(start=A*0.8*Modelica.Constants.sigma*293.15^4) "Incoming radiosity at surface a" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Radiosity/Examples/OutdoorRadiosity.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Radiosity/Examples/OutdoorRadiosity.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Radiosity/Examples/OutdoorRadiosity.mo" 2021-09-16 11:15:38.462780381 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Radiosity/Examples/OutdoorRadiosity.mo" 2021-09-16 11:18:03.766297218 +0200 @@ -7,7 +7,7 @@ Buildings.HeatTransfer.Radiosity.OutdoorRadiosity outRad(A=A, vieFacSky=0.5) "Outdoor radiosity model" annotation (Placement(transformation(extent={{-40,-22},{-20,-2}}))); - parameter Modelica.SIunits.Area A=1 "Area of receiving surface"; + parameter Modelica.Units.SI.Area A=1 "Area of receiving surface"; Modelica.Blocks.Sources.Ramp TSky( duration=1, height=30, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Radiosity/OutdoorRadiosity.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Radiosity/OutdoorRadiosity.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Radiosity/OutdoorRadiosity.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Radiosity/OutdoorRadiosity.mo" 2021-09-16 11:18:03.726297352 +0200 @@ -1,16 +1,16 @@ within Buildings.HeatTransfer.Radiosity; model OutdoorRadiosity "Model for the outdoor radiosity that strikes the window" - parameter Modelica.SIunits.Area A "Area of receiving surface"; + parameter Modelica.Units.SI.Area A "Area of receiving surface"; parameter Real vieFacSky(final min=0, final max=1) "View factor from receiving surface to sky (=1 for roofs)"; parameter Boolean linearize=false "Set to true to linearize emissive power" annotation (Evaluate=true); - parameter Modelica.SIunits.Temperature T0=293.15 + parameter Modelica.Units.SI.Temperature T0=293.15 "Temperature used to linearize radiative heat transfer" annotation (Dialog(enable=linearize)); Real TRad4(unit="K4") "4th power of the mean outdoor temperature"; - Modelica.SIunits.Temperature TRad "Mean radiant temperature"; + Modelica.Units.SI.Temperature TRad "Mean radiant temperature"; Modelica.Blocks.Interfaces.RealInput TOut( final quantity="ThermodynamicTemperature", diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Sources/FixedHeatFlow.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Sources/FixedHeatFlow.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Sources/FixedHeatFlow.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Sources/FixedHeatFlow.mo" 2021-09-16 11:18:03.678297513 +0200 @@ -1,6 +1,6 @@ within Buildings.HeatTransfer.Sources; model FixedHeatFlow "Fixed heat flow boundary condition" - parameter Modelica.SIunits.HeatFlowRate Q_flow "Fixed heat flow rate at port"; + parameter Modelica.Units.SI.HeatFlowRate Q_flow "Fixed heat flow rate at port"; Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_b port annotation (Placement(transformation(extent={{90, -10},{110,10}}))); equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Sources/FixedTemperature.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Sources/FixedTemperature.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Sources/FixedTemperature.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Sources/FixedTemperature.mo" 2021-09-16 11:18:03.662297567 +0200 @@ -1,7 +1,7 @@ within Buildings.HeatTransfer.Sources; model FixedTemperature "Fixed temperature boundary condition in Kelvin" - parameter Modelica.SIunits.Temperature T "Fixed temperature at port"; + parameter Modelica.Units.SI.Temperature T "Fixed temperature at port"; Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_b port annotation (Placement(transformation(extent={{90, -10},{110,10}}))); equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/AbsorbedRadiation.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/AbsorbedRadiation.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/AbsorbedRadiation.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/AbsorbedRadiation.mo" 2021-09-16 11:18:03.530298009 +0200 @@ -33,7 +33,7 @@ annotation (Placement(transformation(extent={{100,-50},{120,-30}}), iconTransformation(extent={{100,-50},{120,-30}}))); - output Modelica.SIunits.Power absRad[2, N + 2, NSta] + output Modelica.Units.SI.Power absRad[2, N + 2, NSta] "Absorbed interior and exterior radiation. (absRad[2,1,iSta]: exterior shading device, absRad[1,2 to N+1,iSta]: glass (unshaded part), diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/CenterOfGlass.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/CenterOfGlass.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/CenterOfGlass.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/CenterOfGlass.mo" 2021-09-16 11:18:03.482298169 +0200 @@ -5,7 +5,7 @@ constant Boolean homotopyInitialization = true "= true, use homotopy method" annotation(HideResult=true); - parameter Modelica.SIunits.Angle til(displayUnit="deg") + parameter Modelica.Units.SI.Angle til(displayUnit="deg") "Surface tilt (only 90 degrees=vertical is implemented)"; parameter Buildings.HeatTransfer.Data.GlazingSystems.Generic glaSys diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Examples/AbsorbedRadiation.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Examples/AbsorbedRadiation.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Examples/AbsorbedRadiation.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Examples/AbsorbedRadiation.mo" 2021-09-16 11:18:03.266298893 +0200 @@ -1,9 +1,9 @@ within Buildings.HeatTransfer.Windows.BaseClasses.Examples; model AbsorbedRadiation "Test model for absorbed radiation by windows" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Angle lat=0.34906585039887 "Latitude"; - parameter Modelica.SIunits.Angle azi=0 "Surface azimuth"; - parameter Modelica.SIunits.Angle til=1.5707963267949 "Surface tilt"; + parameter Modelica.Units.SI.Angle lat=0.34906585039887 "Latitude"; + parameter Modelica.Units.SI.Angle azi=0 "Surface azimuth"; + parameter Modelica.Units.SI.Angle til=1.5707963267949 "Surface tilt"; replaceable parameter Buildings.HeatTransfer.Data.GlazingSystems.DoubleClearAir13Clear glaSys( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Examples/CenterOfGlass.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Examples/CenterOfGlass.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Examples/CenterOfGlass.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Examples/CenterOfGlass.mo" 2021-09-16 11:18:03.234299000 +0200 @@ -1,7 +1,7 @@ within Buildings.HeatTransfer.Windows.BaseClasses.Examples; model CenterOfGlass "Test model for center of glas heat transfer" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Area A=1 "Window surface area"; + parameter Modelica.Units.SI.Area A=1 "Window surface area"; parameter Boolean linearize = false "Set to true to linearize emissive power"; Buildings.HeatTransfer.Windows.BaseClasses.CenterOfGlass sha( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Examples/GlassLayer.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Examples/GlassLayer.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Examples/GlassLayer.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Examples/GlassLayer.mo" 2021-09-16 11:18:03.114299403 +0200 @@ -1,7 +1,7 @@ within Buildings.HeatTransfer.Windows.BaseClasses.Examples; model GlassLayer "Test model for glass layer heat transfer" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Area A=1 "Window surface area"; + parameter Modelica.Units.SI.Area A=1 "Window surface area"; parameter Boolean linearize = false "Set to true to linearize emissive power"; Buildings.HeatTransfer.Windows.BaseClasses.GlassLayer sha( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Examples/Shade.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Examples/Shade.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Examples/Shade.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Examples/Shade.mo" 2021-09-16 11:18:03.010299751 +0200 @@ -1,7 +1,7 @@ within Buildings.HeatTransfer.Windows.BaseClasses.Examples; model Shade "Test model for exterior shade heat transfer" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Area A=1 "Window surface area"; + parameter Modelica.Units.SI.Area A=1 "Window surface area"; parameter Boolean linearize = true "Set to true to linearize emissive power"; Buildings.HeatTransfer.Windows.BaseClasses.ShadeRadiation extShaRad( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Examples/TransmittedRadiation.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Examples/TransmittedRadiation.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Examples/TransmittedRadiation.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Examples/TransmittedRadiation.mo" 2021-09-16 11:18:02.942299980 +0200 @@ -2,9 +2,9 @@ model TransmittedRadiation "Test model for transmitted radiation through window" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Angle lat=0.34906585039887 "Latitude"; - parameter Modelica.SIunits.Angle azi=0 "Surface azimuth"; - parameter Modelica.SIunits.Angle til=1.5707963267949 "Surface tilt"; + parameter Modelica.Units.SI.Angle lat=0.34906585039887 "Latitude"; + parameter Modelica.Units.SI.Angle azi=0 "Surface azimuth"; + parameter Modelica.Units.SI.Angle til=1.5707963267949 "Surface tilt"; parameter Buildings.HeatTransfer.Data.GlazingSystems.DoubleClearAir13Clear glaSys( shade=Buildings.HeatTransfer.Data.Shades.Gray(), diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Examples/WindowRadiation.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Examples/WindowRadiation.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Examples/WindowRadiation.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Examples/WindowRadiation.mo" 2021-09-16 11:18:02.922300047 +0200 @@ -1,9 +1,9 @@ within Buildings.HeatTransfer.Windows.BaseClasses.Examples; model WindowRadiation "Test model for window radiation" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Angle lat=0.34906585039887 "Latitude"; - parameter Modelica.SIunits.Angle azi=0 "Surface azimuth"; - parameter Modelica.SIunits.Angle til=1.5707963267949 "Surface tilt"; + parameter Modelica.Units.SI.Angle lat=0.34906585039887 "Latitude"; + parameter Modelica.Units.SI.Angle azi=0 "Surface azimuth"; + parameter Modelica.Units.SI.Angle til=1.5707963267949 "Surface tilt"; replaceable parameter Buildings.HeatTransfer.Data.GlazingSystems.DoubleClearAir13Clear glaSys( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/ExteriorConvectionCoefficient.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/ExteriorConvectionCoefficient.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/ExteriorConvectionCoefficient.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/ExteriorConvectionCoefficient.mo" 2021-09-16 11:18:02.890300154 +0200 @@ -2,7 +2,7 @@ model ExteriorConvectionCoefficient "Model for the heat transfer coefficient at the outside of the window" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Area A "Heat transfer area"; + parameter Modelica.Units.SI.Area A "Heat transfer area"; Modelica.Blocks.Interfaces.RealOutput GCon(unit="W/K") "Convective thermal conductance" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/GasConvection.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/GasConvection.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/GasConvection.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/GasConvection.mo" 2021-09-16 11:18:02.878300194 +0200 @@ -13,14 +13,14 @@ parameter Buildings.HeatTransfer.Data.Gases.Generic gas "Thermophysical properties of gas fill" annotation(choicesAllMatching=true); - parameter Modelica.SIunits.Area A "Heat transfer area"; - parameter Modelica.SIunits.Area h(min=0) = sqrt(A) "Height of window"; + parameter Modelica.Units.SI.Area A "Heat transfer area"; + parameter Modelica.Units.SI.Area h(min=0) = sqrt(A) "Height of window"; - parameter Modelica.SIunits.Angle til(displayUnit="deg") + parameter Modelica.Units.SI.Angle til(displayUnit="deg") "Surface tilt (only 0, 90 and 180 degrees are implemented)"; parameter Boolean linearize=false "Set to true to linearize emissive power"; - parameter Modelica.SIunits.Temperature T0 = 293.15 + parameter Modelica.Units.SI.Temperature T0 = 293.15 "Temperature used to compute thermophysical properties"; Modelica.Blocks.Interfaces.RealInput u @@ -28,18 +28,18 @@ annotation (Placement(transformation(extent={{-140,50},{-100,90}}), iconTransformation(extent={{-120,70},{-100,90}}))); - Modelica.SIunits.CoefficientOfHeatTransfer hCon(min=0, start=3) + Modelica.Units.SI.CoefficientOfHeatTransfer hCon(min=0, start=3) "Convective heat transfer coefficient"; - Modelica.SIunits.HeatFlux q_flow "Convective heat flux"; + Modelica.Units.SI.HeatFlux q_flow "Convective heat flux"; Real Nu(min=0) "Nusselt number"; Real Ra(min=0) "Rayleigh number"; protected - Modelica.SIunits.Temperature T_a + Modelica.Units.SI.Temperature T_a "Temperature used for thermophysical properties at port_a"; - Modelica.SIunits.Temperature T_b + Modelica.Units.SI.Temperature T_b "Temperature used for thermophysical properties at port_b"; - Modelica.SIunits.Temperature T_m + Modelica.Units.SI.Temperature T_m "Temperature used for thermophysical properties"; Real deltaNu(min=0.01) = 0.1 @@ -54,7 +54,7 @@ "Flag, true if the window is horizontal"; // Quantities that are only used in linearized model - parameter Modelica.SIunits.CoefficientOfHeatTransfer hCon0(fixed=false) + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hCon0(fixed=false) "Convective heat transfer coefficient"; parameter Real Nu0(fixed=false, min=0) "Nusselt number"; parameter Real Ra0(fixed=false, min=0) "Rayleigh number"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/GlassLayer.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/GlassLayer.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/GlassLayer.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/GlassLayer.mo" 2021-09-16 11:18:02.842300314 +0200 @@ -8,9 +8,9 @@ constant Boolean homotopyInitialization = true "= true, use homotopy method" annotation(HideResult=true); - parameter Modelica.SIunits.Length x "Material thickness"; + parameter Modelica.Units.SI.Length x "Material thickness"; - parameter Modelica.SIunits.ThermalConductivity k "Thermal conductivity"; + parameter Modelica.Units.SI.ThermalConductivity k "Thermal conductivity"; Modelica.Blocks.Interfaces.RealInput u "Input connector, used to scale the surface area to take into account an operable shading device" @@ -38,13 +38,13 @@ "4th power of temperature at surface a"; Real T4_b(min=1E8, unit="K4", start=293.15^4, nominal=1E10) "4th power of temperature at surface b"; - Modelica.SIunits.HeatFlowRate E_a(min=0, nominal=1E2) + + Modelica.Units.SI.HeatFlowRate E_a(min=0, nominal=1E2) "Emissive power of surface a"; - Modelica.SIunits.HeatFlowRate E_b(min=0, nominal=1E2) + Modelica.Units.SI.HeatFlowRate E_b(min=0, nominal=1E2) "Emissive power of surface b"; - final parameter Modelica.SIunits.ThermalResistance R = x/2/k/A + final parameter Modelica.Units.SI.ThermalResistance R = x/2/k/A "Thermal resistance from surface of glass to center of glass"; - 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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/HeatCapacity.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/HeatCapacity.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/HeatCapacity.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/HeatCapacity.mo" 2021-09-16 11:18:02.818300395 +0200 @@ -6,7 +6,7 @@ "Parameter, equal to true if the window has a shade" annotation(Evaluate=true); - parameter Modelica.SIunits.HeatCapacity C + parameter Modelica.Units.SI.HeatCapacity C "Heat capacity of element (= cp*m)"; Modelica.Blocks.Interfaces.RealInput ySha if @@ -35,18 +35,18 @@ annotation (Placement(transformation(extent={{95,35},{105,45}}), iconTransformation(extent={{95,35},{105,45}}))); - Modelica.SIunits.Temperature TUns( + Modelica.Units.SI.Temperature TUns( start=293.15) "Temperature of unshaded part of window"; - Modelica.SIunits.Temperature TSha( + Modelica.Units.SI.Temperature TSha( start=293.15) "Temperature of unshaded part of window"; - Modelica.SIunits.TemperatureSlope der_TUns(start=0) + Modelica.Units.SI.TemperatureSlope der_TUns(start=0) "Time derivative of temperature (= der(T))"; - Modelica.SIunits.TemperatureSlope der_TSha(start=0) + Modelica.Units.SI.TemperatureSlope der_TSha(start=0) "Time derivative of temperature (= der(T))"; protected @@ -59,9 +59,9 @@ Modelica.Blocks.Interfaces.RealInput yCom_internal "Internal connector"; - Modelica.SIunits.HeatFlowRate QSha_flow - "Heat flow rate for shaded part of the window"; + Modelica.Units.SI.HeatFlowRate QSha_flow + "Heat flow rate for shaded part of the window"; equation connect(ySha, ySha_internal); connect(yCom, yCom_internal); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/InteriorConvection.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/InteriorConvection.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/InteriorConvection.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/InteriorConvection.mo" 2021-09-16 11:18:02.798300461 +0200 @@ -11,11 +11,11 @@ "Convective heat transfer model" annotation(Evaluate=true); - parameter Modelica.SIunits.CoefficientOfHeatTransfer hFixed=3 + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hFixed=3 "Constant convection coefficient" annotation (Dialog(enable=(conMod == Buildings.HeatTransfer.Types.InteriorConvection.Fixed))); - parameter Modelica.SIunits.Angle til(displayUnit="deg") "Surface tilt" + parameter Modelica.Units.SI.Angle til(displayUnit="deg") "Surface tilt" annotation (Dialog(enable=(conMod <> Buildings.HeatTransfer.Types.InteriorConvection.Fixed))); Modelica.Blocks.Interfaces.RealInput u @@ -24,7 +24,7 @@ iconTransformation(extent={{-120,70},{-100,90}}))); protected - constant Modelica.SIunits.Temperature dT0 = 2 + constant Modelica.Units.SI.Temperature dT0 = 2 "Initial temperature used in homotopy method"; final parameter Real cosTil=Modelica.Math.cos(til) "Cosine of window tilt"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/InteriorConvectionCoefficient.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/InteriorConvectionCoefficient.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/InteriorConvectionCoefficient.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/InteriorConvectionCoefficient.mo" 2021-09-16 11:18:02.770300555 +0200 @@ -2,7 +2,7 @@ model InteriorConvectionCoefficient "Model for the heat transfer coefficient at the inside of the window" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Area A "Heat transfer area"; + parameter Modelica.Units.SI.Area A "Heat transfer area"; Modelica.Blocks.Interfaces.RealOutput GCon(unit="W/K") "Convective thermal conductance" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Overhang.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Overhang.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Overhang.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Overhang.mo" 2021-09-16 11:18:02.758300596 +0200 @@ -22,49 +22,49 @@ final unit="1") "Fraction of window area exposed to the sun" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - parameter Modelica.SIunits.Angle lat "Latitude"; + parameter Modelica.Units.SI.Angle lat "Latitude"; - parameter Modelica.SIunits.Angle azi(displayUnit="deg") + parameter Modelica.Units.SI.Angle azi(displayUnit="deg") "Surface azimuth; azi= -90 degree East; azi= 0 degree South"; // Window dimensions - parameter Modelica.SIunits.Length hWin "Window height" + parameter Modelica.Units.SI.Length hWin "Window height" annotation(Dialog(tab="General",group="Window")); - parameter Modelica.SIunits.Length wWin "Window width" + parameter Modelica.Units.SI.Length wWin "Window width" annotation(Dialog(tab="General",group="Window")); Buildings.BoundaryConditions.WeatherData.Bus weaBus "Weather data" annotation (Placement(transformation(extent={{-112,-10},{-92,10}}))); protected - constant Modelica.SIunits.Angle delSolAzi = 0.005 + constant Modelica.Units.SI.Angle delSolAzi = 0.005 "Half-width of transition interval between left and right formulation for overhang"; - final parameter Modelica.SIunits.Area AWin= hWin*wWin "Window area"; - parameter Modelica.SIunits.Length tmpH[4](each fixed=false) + final parameter Modelica.Units.SI.Area AWin= hWin*wWin "Window area"; + parameter Modelica.Units.SI.Length tmpH[4](each fixed=false) "Height rectangular sections used for superposition"; - Modelica.SIunits.Length w + Modelica.Units.SI.Length w "Either wL or wR, depending on the sun relative to the wall azimuth"; - Modelica.SIunits.Length tmpW[4] + Modelica.Units.SI.Length tmpW[4] "Width of rectangular sections used for superpositions"; - Modelica.SIunits.Length del_L = wWin/100 + Modelica.Units.SI.Length del_L = wWin/100 "Fraction of window dimension over which min-max functions are smoothened"; - Modelica.SIunits.Length x1 + Modelica.Units.SI.Length x1 "Horizontal distance between window side edge and shadow corner"; - Modelica.SIunits.Length x2[4] + Modelica.Units.SI.Length x2[4] "Horizontal distance between window side edge and point where shadow line and window lower edge intersects"; - Modelica.SIunits.Length y1 + Modelica.Units.SI.Length y1 "Vertical distance between overhang and shadow lower edge"; - Modelica.SIunits.Length y2[4] + Modelica.Units.SI.Length y2[4] "Window height (vertical distance corresponding to x2)"; Real shdwTrnglRtio "Ratio of y1 and x1"; - Modelica.SIunits.Area area[4] + Modelica.Units.SI.Area area[4] "Shaded areas of the sections used in superposition"; - Modelica.SIunits.Area shdArea "Shaded area calculated from equations"; - Modelica.SIunits.Area crShdArea "Final value for shaded area"; - Modelica.SIunits.Area crShdArea1 + Modelica.Units.SI.Area shdArea "Shaded area calculated from equations"; + Modelica.Units.SI.Area crShdArea "Final value for shaded area"; + Modelica.Units.SI.Area crShdArea1 "Corrected for the sun behind the surface/wall"; - Modelica.SIunits.Area crShdArea2 "Corrected for the sun below horizon"; + Modelica.Units.SI.Area crShdArea2 "Corrected for the sun below horizon"; Buildings.BoundaryConditions.SolarGeometry.BaseClasses.SolarAzimuth solAzi(lat=lat) "Solar azimuth" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/PartialRadiation.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/PartialRadiation.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/PartialRadiation.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/PartialRadiation.mo" 2021-09-16 11:18:02.706300770 +0200 @@ -9,7 +9,7 @@ "Set to true if window has an exterior shade"; parameter Boolean haveInteriorShade "Set to true if window has an interior shade"; - parameter Modelica.SIunits.Area AWin "Area of window"; + parameter Modelica.Units.SI.Area AWin "Area of window"; ////////////////// Derived parameters final parameter Boolean haveShade=haveExteriorShade or haveInteriorShade diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/PartialShade_weatherBus.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/PartialShade_weatherBus.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/PartialShade_weatherBus.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/PartialShade_weatherBus.mo" 2021-09-16 11:18:02.682300851 +0200 @@ -3,9 +3,9 @@ "Partial model to implement overhang and side fins with weather bus connector" extends Buildings.HeatTransfer.Windows.BaseClasses.ShadeInterface_weatherBus; // Window dimensions - parameter Modelica.SIunits.Length hWin "Window height" + parameter Modelica.Units.SI.Length hWin "Window height" annotation(Dialog(tab="General",group="Window")); - parameter Modelica.SIunits.Length wWin "Window width" + parameter Modelica.Units.SI.Length wWin "Window width" annotation(Dialog(tab="General",group="Window")); protected diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/PartialWindowBoundaryCondition.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/PartialWindowBoundaryCondition.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/PartialWindowBoundaryCondition.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/PartialWindowBoundaryCondition.mo" 2021-09-16 11:18:02.666300904 +0200 @@ -1,10 +1,10 @@ within Buildings.HeatTransfer.Windows.BaseClasses; partial model PartialWindowBoundaryCondition "Partial model for heat convection or radiation between a possibly shaded window that can be outside or inside the room" - parameter Modelica.SIunits.Area A "Heat transfer area of frame and window"; + parameter Modelica.Units.SI.Area A "Heat transfer area of frame and window"; parameter Real fFra "Fraction of window frame divided by total window area"; - final parameter Modelica.SIunits.Area AFra = fFra * A "Frame area"; - final parameter Modelica.SIunits.Area AGla = A-AFra "Glass area"; + final parameter Modelica.Units.SI.Area AFra = fFra * A "Frame area"; + final parameter Modelica.Units.SI.Area AGla = A-AFra "Glass area"; parameter Boolean haveExteriorShade "Set to true if window has exterior shade (at surface a)" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/RadiationBaseData.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/RadiationBaseData.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/RadiationBaseData.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/RadiationBaseData.mo" 2021-09-16 11:18:02.634301011 +0200 @@ -9,30 +9,30 @@ "Number of window states for electrochromic windows (set to 1 for regular windows)" annotation (Evaluate=true); - parameter Modelica.SIunits.Length xGla[N] "Thickness of glass" + + parameter Modelica.Units.SI.Length xGla[N] "Thickness of glass" annotation (Dialog(group="Glass")); - parameter Modelica.SIunits.TransmissionCoefficient tauGlaSol[N, :] + parameter Modelica.Units.SI.TransmissionCoefficient tauGlaSol[N, :] "Solar transmissivity of glass" annotation (Dialog(group="Glass")); - parameter Modelica.SIunits.ReflectionCoefficient rhoGlaSol_a[N, NSta] + parameter Modelica.Units.SI.ReflectionCoefficient rhoGlaSol_a[N, NSta] "Solar reflectivity of glass at surface a (facing outside)" annotation (Dialog(group="Glass")); - parameter Modelica.SIunits.ReflectionCoefficient rhoGlaSol_b[N, NSta] + parameter Modelica.Units.SI.ReflectionCoefficient rhoGlaSol_b[N, NSta] "Solar reflectivity of glass at surface b (facing room-side)" annotation (Dialog(group="Glass")); - parameter Modelica.SIunits.TransmissionCoefficient tauShaSol_a + parameter Modelica.Units.SI.TransmissionCoefficient tauShaSol_a "Solar transmissivity of shade for irradiation from air-side" annotation (Dialog(group="Shade")); - parameter Modelica.SIunits.TransmissionCoefficient tauShaSol_b + parameter Modelica.Units.SI.TransmissionCoefficient tauShaSol_b "Solar transmissivity of shade for irradiation from glass-side" annotation (Dialog(group="Shade")); - parameter Modelica.SIunits.ReflectionCoefficient rhoShaSol_a + parameter Modelica.Units.SI.ReflectionCoefficient rhoShaSol_a "Solar reflectivity of shade for irradiation from air-side" annotation (Dialog(group="Shade")); - parameter Modelica.SIunits.ReflectionCoefficient rhoShaSol_b + parameter Modelica.Units.SI.ReflectionCoefficient rhoShaSol_b "Solar reflectivity of shade for irradiation from glass-side" annotation (Dialog(group="Shade")); - annotation (Documentation(info="
Record that defines basic parameters for the window radiation calculation. diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/RadiationData.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/RadiationData.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/RadiationData.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/RadiationData.mo" 2021-09-16 11:18:02.618301065 +0200 @@ -8,7 +8,7 @@ rhoShaSol_a,rhoShaSol_b}} "Shading device property"; final parameter Integer NDIR=10 "Number of incident angles"; final parameter Integer HEM=NDIR + 1 "Index of hemispherical integration"; - final parameter Modelica.SIunits.Angle psi[NDIR]= + final parameter Modelica.Units.SI.Angle psi[NDIR]= Buildings.HeatTransfer.Windows.Functions.getAngle(NDIR) "Incident angles used for solar radiation calculation"; final parameter Real layer[3, N, HEM, NSta]= diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/ShadeConvection.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/ShadeConvection.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/ShadeConvection.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/ShadeConvection.mo" 2021-09-16 11:18:02.594301145 +0200 @@ -2,7 +2,7 @@ model ShadeConvection "Model for convective heat balance of a layer that may or may not have a shade" - parameter Modelica.SIunits.Area A "Heat transfer area"; + parameter Modelica.Units.SI.Area A "Heat transfer area"; parameter Boolean thisSideHasShade "Set to true if this side of the window has a shade"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/ShadeRadiation.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/ShadeRadiation.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/ShadeRadiation.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/ShadeRadiation.mo" 2021-09-16 11:18:02.374301882 +0200 @@ -5,25 +5,25 @@ constant Boolean homotopyInitialization = true "= true, use homotopy method" annotation(HideResult=true); - parameter Modelica.SIunits.Area A "Heat transfer area"; - parameter Modelica.SIunits.Emissivity absIR_air + parameter Modelica.Units.SI.Area A "Heat transfer area"; + parameter Modelica.Units.SI.Emissivity absIR_air "Infrared absorptivity of surface that faces air"; - parameter Modelica.SIunits.Emissivity absIR_glass + parameter Modelica.Units.SI.Emissivity absIR_glass "Infrared absorptivity of surface that faces glass"; - parameter Modelica.SIunits.TransmissionCoefficient tauIR_air + parameter Modelica.Units.SI.TransmissionCoefficient tauIR_air "Infrared transmissivity of shade for radiation coming from the exterior or the room"; - parameter Modelica.SIunits.TransmissionCoefficient tauIR_glass + parameter Modelica.Units.SI.TransmissionCoefficient tauIR_glass "Infrared transmissivity of shade for radiation coming from the glass"; parameter Boolean thisSideHasShade "Set to true if this side of the window has a shade"; - final parameter Modelica.SIunits.ReflectionCoefficient rhoIR_air=1-absIR_air-tauIR_air + final parameter Modelica.Units.SI.ReflectionCoefficient rhoIR_air=1-absIR_air-tauIR_air "Infrared reflectivity of surface that faces air"; - final parameter Modelica.SIunits.ReflectionCoefficient rhoIR_glass=1-absIR_glass-tauIR_glass + final parameter Modelica.Units.SI.ReflectionCoefficient rhoIR_glass=1-absIR_glass-tauIR_glass "Infrared reflectivity of surface that faces glass"; parameter Boolean linearize = false "Set to true to linearize emissive power" annotation (Evaluate=true); - parameter Modelica.SIunits.Temperature T0=293.15 + parameter Modelica.Units.SI.Temperature T0=293.15 "Temperature used to linearize radiative heat transfer" annotation (Dialog(enable=linearize)); @@ -84,10 +84,10 @@ "3rd power of temperature T0"; Real T4(min=1E8, start=293.15^4, nominal=1E10, final unit="K4") "4th power of temperature"; - Modelica.SIunits.RadiantPower E_air "Emissive power of surface that faces air"; - Modelica.SIunits.RadiantPower E_glass - "Emissive power of surface that faces glass"; + Modelica.Units.SI.RadiantPower E_air "Emissive power of surface that faces air"; + Modelica.Units.SI.RadiantPower E_glass + "Emissive power of surface that faces glass"; 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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/SideFins.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/SideFins.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/SideFins.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/SideFins.mo" 2021-09-16 11:18:02.314302083 +0200 @@ -19,43 +19,43 @@ "Fraction of window area exposed to the sun" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); // Window dimensions - parameter Modelica.SIunits.Length hWin "Window height" + parameter Modelica.Units.SI.Length hWin "Window height" annotation(Dialog(tab="General",group="Window")); - parameter Modelica.SIunits.Length wWin "Window width" + parameter Modelica.Units.SI.Length wWin "Window width" annotation(Dialog(tab="General",group="Window")); // Other calculation variables protected - final parameter Modelica.SIunits.Length tmpH[4]= + final parameter Modelica.Units.SI.Length tmpH[4]= {h+hWin, h, h+hWin, h} "Height of rectangular sections used for superposition"; - final parameter Modelica.SIunits.Length tmpW[4]= + final parameter Modelica.Units.SI.Length tmpW[4]= {gap + wWin,gap + wWin,gap, gap} "Width of rectangular sections used for superpositions; c1,c2 etc"; - final parameter Modelica.SIunits.Length deltaL=wWin/100 + final parameter Modelica.Units.SI.Length deltaL=wWin/100 "Fraction of window dimension over which min-max functions are smoothened"; - final parameter Modelica.SIunits.Area AWin=hWin*wWin "Window area"; - Modelica.SIunits.Length x1[4] + final parameter Modelica.Units.SI.Area AWin=hWin*wWin "Window area"; + Modelica.Units.SI.Length x1[4] "Horizontal distance between side fin and point where shadow line and window lower edge intersects"; - Modelica.SIunits.Length x2 + Modelica.Units.SI.Length x2 "Horizontal distance between side fin and shadow corner"; - Modelica.SIunits.Length x3[4] "Window width"; - Modelica.SIunits.Length y1[4] "Window height"; - Modelica.SIunits.Length y2 + Modelica.Units.SI.Length x3[4] "Window width"; + Modelica.Units.SI.Length y1[4] "Window height"; + Modelica.Units.SI.Length y2 "Vertical distance between window upper edge and shadow corner"; - Modelica.SIunits.Length y3[4] + Modelica.Units.SI.Length y3[4] "Vertical distance between window upper edge and point where shadow line and window side edge intersects"; - Modelica.SIunits.Area area[4] + Modelica.Units.SI.Area area[4] "Shaded areas of the sections used in superposition"; - Modelica.SIunits.Area shdArea "Shaded area"; - Modelica.SIunits.Area crShdArea "Final value of shaded area"; - Modelica.SIunits.Area crShdArea1 + Modelica.Units.SI.Area shdArea "Shaded area"; + Modelica.Units.SI.Area crShdArea "Final value of shaded area"; + Modelica.Units.SI.Area crShdArea1 "Shaded area, corrected for the sun behind the surface/wall"; - Modelica.SIunits.Area crShdArea2 + Modelica.Units.SI.Area crShdArea2 "Shaded area, corrected for the sun below horizon"; - Modelica.SIunits.Length minX[4]; - Modelica.SIunits.Length minY[4]; - Modelica.SIunits.Length minX2X3[4]; - Modelica.SIunits.Length minY2Y3[4]; + Modelica.Units.SI.Length minX[4]; + Modelica.Units.SI.Length minY[4]; + Modelica.Units.SI.Length minX2X3[4]; + Modelica.Units.SI.Length minY2Y3[4]; Real delta=1e-6 "Small number to avoid division by zero"; Real tanLambda "Tangent of angle between horizontal and sun ray projection on vertical wall"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/ThermalConductor.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/ThermalConductor.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/ThermalConductor.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/ThermalConductor.mo" 2021-09-16 11:18:02.258302272 +0200 @@ -2,7 +2,7 @@ model ThermalConductor "Lumped thermal element with variable area, transporting heat without storing it" extends Modelica.Thermal.HeatTransfer.Interfaces.Element1D; - parameter Modelica.SIunits.ThermalConductance G + parameter Modelica.Units.SI.ThermalConductance G "Constant thermal conductance of material"; Modelica.Blocks.Interfaces.RealInput u(min=0) "Input signal for thermal conductance" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/TransmittedRadiation.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/TransmittedRadiation.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/TransmittedRadiation.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/TransmittedRadiation.mo" 2021-09-16 11:18:02.238302338 +0200 @@ -17,13 +17,13 @@ final parameter Real traCoeRoo[NSta](each fixed=false) "Transmitivity of the window glass for interior radiation without shading"; - output Modelica.SIunits.Power QTraDifUns_flow[NSta] + output Modelica.Units.SI.Power QTraDifUns_flow[NSta] "Transmitted diffuse solar radiation through unshaded part of window"; - output Modelica.SIunits.Power QTraDirUns_flow[NSta] + output Modelica.Units.SI.Power QTraDirUns_flow[NSta] "Transmitted direct solar radiation through unshaded part of window"; - output Modelica.SIunits.Power QTraDifSha_flow[NSta] + output Modelica.Units.SI.Power QTraDifSha_flow[NSta] "Transmitted diffuse solar radiation through shaded part of window"; - output Modelica.SIunits.Power QTraDirSha_flow[NSta] + output Modelica.Units.SI.Power QTraDirSha_flow[NSta] "Transmitted direct solar radiation through shaded part of window"; protected diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Validation/HeatCapacityConstantShade.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Validation/HeatCapacityConstantShade.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Validation/HeatCapacityConstantShade.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Validation/HeatCapacityConstantShade.mo" 2021-09-16 11:18:02.198302472 +0200 @@ -2,7 +2,7 @@ model HeatCapacityConstantShade "Validation model for heat capacity with constant shade signal" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Area AGla = 2 "Glass area"; + parameter Modelica.Units.SI.Area AGla = 2 "Glass area"; parameter Data.Solids.Glass datGla(x=0.005) "Thermal properties for glass" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Validation/HeatCapacityVariableShade.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Validation/HeatCapacityVariableShade.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Validation/HeatCapacityVariableShade.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/Validation/HeatCapacityVariableShade.mo" 2021-09-16 11:18:02.162302593 +0200 @@ -2,7 +2,7 @@ model HeatCapacityVariableShade "Validation model for heat capacity with variable shade signal" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Area AGla = 2 "Glass area"; + parameter Modelica.Units.SI.Area AGla = 2 "Glass area"; parameter Buildings.HeatTransfer.Data.Solids.Glass datGla(x=0.005) "Thermal properties for glass" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/convectionHorizontalCavity.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/convectionHorizontalCavity.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/convectionHorizontalCavity.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/convectionHorizontalCavity.mo" 2021-09-16 11:18:02.090302834 +0200 @@ -4,22 +4,22 @@ "Thermophysical properties of gas fill" annotation(choicesAllMatching=true); input Real Ra(min=0) "Rayleigh number"; - input Modelica.SIunits.Temperature T_m + input Modelica.Units.SI.Temperature T_m "Temperature used for thermophysical properties"; - input Modelica.SIunits.TemperatureDifference dT + input Modelica.Units.SI.TemperatureDifference dT "Temperature difference used to compute q_flow = h*dT"; - input Modelica.SIunits.Angle til "Window tilt"; + input Modelica.Units.SI.Angle til "Window tilt"; input Real sinTil "Sine of window tilt"; input Real cosTil "Cosine of the window tilt"; - input Modelica.SIunits.Area h(min=0) = 1.5 "Height of window"; + input Modelica.Units.SI.Area h(min=0) = 1.5 "Height of window"; input Real deltaNu(min=0.01) = 0.1 "Small value for Nusselt number, used for smoothing"; input Real deltaRa(min=0.01) = 1E3 "Small value for Rayleigh number, used for smoothing"; output Real Nu(min=0) "Nusselt number"; - output Modelica.SIunits.CoefficientOfHeatTransfer hCon(min=0) + output Modelica.Units.SI.CoefficientOfHeatTransfer hCon(min=0) "Convective heat transfer coefficient"; - output Modelica.SIunits.HeatFlux q_flow "Convective heat flux"; + output Modelica.Units.SI.HeatFlux q_flow "Convective heat flux"; protected Real Nu_1(min=0) "Nusselt number"; Real Nu_2(min=0) "Nusselt number"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/convectionVerticalCavity.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/convectionVerticalCavity.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/convectionVerticalCavity.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/convectionVerticalCavity.mo" 2021-09-16 11:18:02.074302888 +0200 @@ -4,19 +4,19 @@ "Thermophysical properties of gas fill" annotation(choicesAllMatching=true); input Real Ra(min=0) "Rayleigh number"; - input Modelica.SIunits.Temperature T_m + input Modelica.Units.SI.Temperature T_m "Temperature used for thermophysical properties"; - input Modelica.SIunits.TemperatureDifference dT + input Modelica.Units.SI.TemperatureDifference dT "Temperature difference used to compute q_flow = h*dT"; - input Modelica.SIunits.Area h(min=0) = 1.5 "Height of window"; + input Modelica.Units.SI.Area h(min=0) = 1.5 "Height of window"; input Real deltaNu(min=0.01) = 0.1 "Small value for Nusselt number, used for smoothing"; input Real deltaRa(min=0.01) = 1E3 "Small value for Rayleigh number, used for smoothing"; output Real Nu(min=0) "Nusselt number"; - output Modelica.SIunits.CoefficientOfHeatTransfer hCon(min=0) + output Modelica.Units.SI.CoefficientOfHeatTransfer hCon(min=0) "Convective heat transfer coefficient"; - output Modelica.SIunits.HeatFlux q_flow "Convective heat flux"; + output Modelica.Units.SI.HeatFlux q_flow "Convective heat flux"; protected Real Nu_1(min=0) "Nusselt number"; Real Nu_2(min=0) "Nusselt number"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/nusseltHorizontalCavityEnhanced.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/nusseltHorizontalCavityEnhanced.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/nusseltHorizontalCavityEnhanced.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/nusseltHorizontalCavityEnhanced.mo" 2021-09-16 11:18:02.062302928 +0200 @@ -5,11 +5,11 @@ "Thermophysical properties of gas fill" annotation(choicesAllMatching=true); input Real Ra(min=0) "Rayleigh number"; - input Modelica.SIunits.Temperature T_m + input Modelica.Units.SI.Temperature T_m "Temperature used for thermophysical properties"; - input Modelica.SIunits.TemperatureDifference dT + input Modelica.Units.SI.TemperatureDifference dT "Temperature difference used to compute q_flow = h*dT"; - input Modelica.SIunits.Angle til "Window tilt"; + input Modelica.Units.SI.Angle til "Window tilt"; input Real cosTil(min=0) "Cosine of the window tilt"; output Real Nu(min=0) "Nusselt number"; protected diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/nusseltHorizontalCavityReduced.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/nusseltHorizontalCavityReduced.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/nusseltHorizontalCavityReduced.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BaseClasses/nusseltHorizontalCavityReduced.mo" 2021-09-16 11:18:02.046302982 +0200 @@ -5,11 +5,11 @@ "Thermophysical properties of gas fill" annotation(choicesAllMatching=true); input Real Ra(min=0) "Rayleigh number"; - input Modelica.SIunits.Temperature T_m + input Modelica.Units.SI.Temperature T_m "Temperature used for thermophysical properties"; - input Modelica.SIunits.TemperatureDifference dT + input Modelica.Units.SI.TemperatureDifference dT "Temperature difference used to compute q_flow = h*dT"; - input Modelica.SIunits.Area h(min=0) = 1.5 "Height of window"; + input Modelica.Units.SI.Area h(min=0) = 1.5 "Height of window"; input Real sinTil "Sine of window tilt"; input Real deltaNu(min=0.01) = 0.1 "Small value for Nusselt number, used for smoothing"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BeamDepthInRoom.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BeamDepthInRoom.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BeamDepthInRoom.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/BeamDepthInRoom.mo" 2021-09-16 11:18:02.026303049 +0200 @@ -9,32 +9,32 @@ caption="Select weather file"), group="Location")); - parameter Modelica.SIunits.Angle lon(displayUnit="deg")= + parameter Modelica.Units.SI.Angle lon(displayUnit="deg")= Buildings.BoundaryConditions.WeatherData.BaseClasses.getLongitudeTMY3( absFilNam) "Longitude" annotation (Evaluate=true, Dialog(group="Location")); - parameter Modelica.SIunits.Angle lat(displayUnit="deg")= + parameter Modelica.Units.SI.Angle lat(displayUnit="deg")= Buildings.BoundaryConditions.WeatherData.BaseClasses.getLatitudeTMY3( absFilNam) "Latitude" annotation (Evaluate=true, Dialog(group="Location")); - parameter Modelica.SIunits.Time timZon(displayUnit="h")= + parameter Modelica.Units.SI.Time timZon(displayUnit="h")= Buildings.BoundaryConditions.WeatherData.BaseClasses.getTimeZoneTMY3(absFilNam) "Time zone" annotation (Evaluate=true, Dialog(group="Location")); - parameter Modelica.SIunits.Angle azi "Surface azimuth"; + parameter Modelica.Units.SI.Angle azi "Surface azimuth"; - parameter Modelica.SIunits.Length hWorPla = 0.75 + parameter Modelica.Units.SI.Length hWorPla = 0.75 "Height of workplane above ground"; - parameter Modelica.SIunits.Length hApe + parameter Modelica.Units.SI.Length hApe "Upper height of aperature above ground" annotation (Dialog(group="Aperture")); - parameter Modelica.SIunits.Length depApe = 0.15 + parameter Modelica.Units.SI.Length depApe = 0.15 "Depth of outer corner of aperture, measured from interior surface" annotation (Dialog(group="Aperture")); - parameter Modelica.SIunits.Length depOve = 0 + parameter Modelica.Units.SI.Length depOve = 0 "Depth of overhang, meausured from other exterior surface of aperature (set to 0 if no overhang)" annotation (Dialog(group="Overhang")); - parameter Modelica.SIunits.Length gapOve = 0 + parameter Modelica.Units.SI.Length gapOve = 0 "Gap between upper height of aperature and lower height of overhang (set to 0 if no overhang)" annotation (Dialog(group="Overhang")); @@ -48,9 +48,9 @@ final parameter String absFilNam = Buildings.BoundaryConditions.WeatherData.BaseClasses.getAbsolutePath(filNam) "Absolute name of the file"; - parameter Modelica.SIunits.Length dep = depApe + depOve + parameter Modelica.Units.SI.Length dep = depApe + depOve "Depth of outer corner that throws the shade, measured from interior surface"; - parameter Modelica.SIunits.Length h = hApe - hWorPla + gapOve + parameter Modelica.Units.SI.Length h = hApe - hWorPla + gapOve "Height of outer corner that throws the shade measure from the workplane height"; BoundaryConditions.SolarGeometry.ProjectedShadowLength proShaLen( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Examples/BeamDepthInRoom.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Examples/BeamDepthInRoom.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Examples/BeamDepthInRoom.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Examples/BeamDepthInRoom.mo" 2021-09-16 11:18:01.990303169 +0200 @@ -1,11 +1,11 @@ within Buildings.HeatTransfer.Windows.Examples; model BeamDepthInRoom "Test model for the depth of the solar beam in the room" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Length hApe = 2.0 + parameter Modelica.Units.SI.Length hApe = 2.0 "Upper height of aperature above ground"; - parameter Modelica.SIunits.Length depOve=1.0 + parameter Modelica.Units.SI.Length depOve=1.0 "Depth of overhang, meausured from other exterior surface of aperature (set to 0 if no overhang)"; - parameter Modelica.SIunits.Length gapOve=0.5 + parameter Modelica.Units.SI.Length gapOve=0.5 "Gap between upper height of aperature and lower height of overhang (set to 0 if no overhang)"; Buildings.HeatTransfer.Windows.BeamDepthInRoom winEas( azi=Buildings.Types.Azimuth.E, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Examples/BoundaryHeatTransfer.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Examples/BoundaryHeatTransfer.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Examples/BoundaryHeatTransfer.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Examples/BoundaryHeatTransfer.mo" 2021-09-16 11:18:01.978303210 +0200 @@ -2,7 +2,7 @@ model BoundaryHeatTransfer "Test model for the heat transfer at the window boundary condition" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Area A=1 "Window surface area"; + parameter Modelica.Units.SI.Area A=1 "Window surface area"; parameter Real fFra=0.2 "Fraction of frame, = frame area divided by total area"; parameter diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Examples/Window.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Examples/Window.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Examples/Window.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Examples/Window.mo" 2021-09-16 11:18:01.886303517 +0200 @@ -1,15 +1,15 @@ within Buildings.HeatTransfer.Windows.Examples; model Window "Test model for the window" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Area A=1 "Window surface area"; + parameter Modelica.Units.SI.Area A=1 "Window surface area"; parameter Real fFra=0.2 "Fraction of frame, = frame area divided by total area"; - final parameter Modelica.SIunits.Area AFra = fFra * A "Frame area"; - final parameter Modelica.SIunits.Area AGla = A-AFra "Glass area"; + final parameter Modelica.Units.SI.Area AFra = fFra * A "Frame area"; + final parameter Modelica.Units.SI.Area AGla = A-AFra "Glass area"; parameter Boolean linearize = false "Set to true to linearize emissive power"; - parameter Modelica.SIunits.Angle lat=0.34906585039887 "Latitude"; - parameter Modelica.SIunits.Angle azi=0 "Surface azimuth"; - parameter Modelica.SIunits.Angle til=1.5707963267949 "Surface tilt"; + parameter Modelica.Units.SI.Angle lat=0.34906585039887 "Latitude"; + parameter Modelica.Units.SI.Angle azi=0 "Surface azimuth"; + parameter Modelica.Units.SI.Angle til=1.5707963267949 "Surface tilt"; Buildings.HeatTransfer.Windows.Window window( A=A, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/ExteriorHeatTransfer.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/ExteriorHeatTransfer.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/ExteriorHeatTransfer.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/ExteriorHeatTransfer.mo" 2021-09-16 11:18:01.802303799 +0200 @@ -2,17 +2,17 @@ model ExteriorHeatTransfer "Model for heat convection and radiation at the exterior surface of a window that may have a shading device" extends BaseClasses.PartialWindowBoundaryCondition(final thisSideHasShade=haveExteriorShade); - parameter Modelica.SIunits.Emissivity absIRSha_air + parameter Modelica.Units.SI.Emissivity absIRSha_air "Infrared absorptivity of shade surface that faces air" annotation (Dialog(group="Shading")); - parameter Modelica.SIunits.Emissivity absIRSha_glass + parameter Modelica.Units.SI.Emissivity absIRSha_glass "Infrared absorptivity of shade surface that faces glass" annotation (Dialog(group="Shading")); - parameter Modelica.SIunits.TransmissionCoefficient tauIRSha_air + parameter Modelica.Units.SI.TransmissionCoefficient tauIRSha_air "Infrared transmissivity of shade for radiation coming from the exterior or the room" annotation (Dialog(group="Shading")); - parameter Modelica.SIunits.TransmissionCoefficient tauIRSha_glass + parameter Modelica.Units.SI.TransmissionCoefficient tauIRSha_glass "Infrared transmissivity of shade for radiation coming from the glass" annotation (Dialog(group="Shading")); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/FixedShade.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/FixedShade.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/FixedShade.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/FixedShade.mo" 2021-09-16 11:18:01.566304590 +0200 @@ -4,8 +4,8 @@ parameter Buildings.ThermalZones.Detailed.BaseClasses.ParameterConstructionWithWindow conPar "Construction parameters"; - parameter Modelica.SIunits.Angle lat "Latitude"; - parameter Modelica.SIunits.Angle azi(displayUnit="deg") + parameter Modelica.Units.SI.Angle lat "Latitude"; + parameter Modelica.Units.SI.Angle azi(displayUnit="deg") "Surface azimuth; azi= -90 degree East; azi= 0 South"; Modelica.Blocks.Routing.Multiplex4 mulFraSun( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Functions/getAngle.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Functions/getAngle.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Functions/getAngle.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Functions/getAngle.mo" 2021-09-16 11:18:01.446304992 +0200 @@ -1,7 +1,7 @@ within Buildings.HeatTransfer.Windows.Functions; function getAngle "Generate incident angles" input Integer NDIR "Number of incident angles"; - output Modelica.SIunits.Angle psi[NDIR] "Array of incident angles"; + output Modelica.Units.SI.Angle psi[NDIR] "Array of incident angles"; protected Real deltaX=0.5*Modelica.Constants.pi/(NDIR - 1); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Functions/glassProperty.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Functions/glassProperty.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Functions/glassProperty.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Functions/glassProperty.mo" 2021-09-16 11:18:01.330305381 +0200 @@ -5,7 +5,7 @@ Buildings.HeatTransfer.Windows.Functions.BaseClasses.partialGlassRadiation; input Real glass[3, N, NSta] "Propertry of each glass pane"; input Real xGla[N] "Thickness of each glass pane"; - input Modelica.SIunits.Angle psi[HEM - 1] "Incident angles"; + input Modelica.Units.SI.Angle psi[HEM - 1] "Incident angles"; output Real layer[3, N, HEM, NSta] "Transmittance, front and back reflectance"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Functions/glassPropertyCoated.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Functions/glassPropertyCoated.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Functions/glassPropertyCoated.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Functions/glassPropertyCoated.mo" 2021-09-16 11:18:01.318305421 +0200 @@ -4,7 +4,7 @@ extends Buildings.HeatTransfer.Windows.Functions.BaseClasses.partialSingleGlassRadiation; input Real glass[3] "Propertry of one glass pane"; - input Modelica.SIunits.Angle psi[HEM - 1] "Incident angles"; + input Modelica.Units.SI.Angle psi[HEM - 1] "Incident angles"; output Real layer[3, HEM] "Transmittance, front and back reflectance"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Functions/glassPropertyUncoated.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Functions/glassPropertyUncoated.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Functions/glassPropertyUncoated.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Functions/glassPropertyUncoated.mo" 2021-09-16 11:18:01.298305488 +0200 @@ -5,8 +5,8 @@ Buildings.HeatTransfer.Windows.Functions.BaseClasses.partialSingleGlassRadiation; input Real glass[3] "Propertry of one glass pane"; - input Modelica.SIunits.Length x "Thickness"; - input Modelica.SIunits.Angle psi[HEM - 1] "Incident angles"; + input Modelica.Units.SI.Length x "Thickness"; + input Modelica.Units.SI.Angle psi[HEM - 1] "Incident angles"; output Real layer[3, HEM] "Transmittance, front and back reflectance"; protected diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/InteriorHeatTransferConvective.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/InteriorHeatTransferConvective.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/InteriorHeatTransferConvective.mo" 2021-09-16 11:15:38.466780368 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/InteriorHeatTransferConvective.mo" 2021-09-16 11:18:01.202305809 +0200 @@ -3,11 +3,11 @@ "Model for heat convection at the interior surface of a window that may have a shading device" extends BaseClasses.PartialWindowBoundaryCondition(final thisSideHasShade=haveInteriorShade); - parameter Modelica.SIunits.CoefficientOfHeatTransfer hFixed=4 + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hFixed=4 "Constant convection coefficient"; parameter Types.InteriorConvection conMod=Buildings.HeatTransfer.Types.InteriorConvection.Fixed "Convective heat transfer model"; - parameter Modelica.SIunits.Angle til "Surface tilt"; + parameter Modelica.Units.SI.Angle til "Surface tilt"; Modelica.Blocks.Interfaces.RealInput QRadAbs_flow(final unit="W") if haveShade diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Overhang.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Overhang.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Overhang.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Overhang.mo" 2021-09-16 11:18:01.166305930 +0200 @@ -3,8 +3,8 @@ "For a window with an overhang, outputs the fraction of the window area exposed to the sun" extends Buildings.ThermalZones.Detailed.BaseClasses.Overhang; extends Buildings.HeatTransfer.Windows.BaseClasses.PartialShade_weatherBus; - parameter Modelica.SIunits.Angle lat(displayUnit="deg") "Latitude"; - parameter Modelica.SIunits.Angle azi(displayUnit="deg") + parameter Modelica.Units.SI.Angle lat(displayUnit="deg") "Latitude"; + parameter Modelica.Units.SI.Angle azi(displayUnit="deg") "Surface azimuth; azi= -90 degree East; azi= 0 South"; // Overhang dimensions protected diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Window.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Window.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Window.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/HeatTransfer/Windows/Window.mo" 2021-09-16 11:18:01.102306145 +0200 @@ -8,12 +8,12 @@ "Glazing system" annotation (choicesAllMatching=true, Placement(transformation(extent={{150,174}, {170,194}}))); - parameter Modelica.SIunits.Area A "Heat transfer area"; + parameter Modelica.Units.SI.Area A "Heat transfer area"; parameter Real fFra(min=0, max=1)=0.1 "Fraction of frame"; - final parameter Modelica.SIunits.Area AFra = fFra*A "Frame area"; - final parameter Modelica.SIunits.Area AGla = A-AFra "Glass area"; + final parameter Modelica.Units.SI.Area AFra = fFra*A "Frame area"; + final parameter Modelica.Units.SI.Area AGla = A-AFra "Glass area"; parameter Boolean linearize=false "Set to true to linearize emissive power"; - parameter Modelica.SIunits.Angle til(displayUnit="deg") "Surface tilt"; + parameter Modelica.Units.SI.Angle til(displayUnit="deg") "Surface tilt"; parameter Boolean steadyState = true "Flag, if true, then window is steady-state, else capacity is added at room-side" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Air.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Air.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Air.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Air.mo" 2021-09-16 11:18:00.790307189 +0200 @@ -51,12 +51,12 @@ final standardOrderComponents=true) "Base properties" protected - constant Modelica.SIunits.MolarMass[2] MMX = {steam.MM,dryair.MM} + constant Modelica.Units.SI.MolarMass[2] MMX = {steam.MM,dryair.MM} "Molar masses of components"; MassFraction X_steam "Mass fraction of steam water"; MassFraction X_air "Mass fraction of air"; - Modelica.SIunits.TemperatureDifference dT(start=T_default-reference_T) + Modelica.Units.SI.TemperatureDifference dT(start=T_default-reference_T) "Temperature difference used to compute enthalpy"; equation assert(T >= 200.0, " @@ -74,7 +74,7 @@ dT = T - reference_T; h = dT*dryair.cp * X_air + (dT * steam.cp + h_fg) * X_steam; - R = dryair.R*X_air + steam.R*X_steam; + R_s = dryair.R*X_air + steam.R*X_steam; // Equation for ideal gas, from h=u+p*v and R*T=p*v, from which follows that u = h-R*T. // u = h-R*T; @@ -302,7 +302,8 @@ "Return the specific entropy, only valid for phi<1" protected - Modelica.SIunits.MoleFraction[2] Y "Molar fraction"; + Modelica.Units.SI.MoleFraction[2] Y "Molar fraction"; + algorithm Y := massToMoleFractions( state.X, {steam.MM,dryair.MM}); @@ -375,6 +376,7 @@ ")); + end specificEntropy; redeclare function extends density_derp_T @@ -531,9 +533,11 @@ redeclare function extends setState_psX "Return the thermodynamic state as function of p, s and composition X or Xi" protected - Modelica.SIunits.MassFraction[2] X_int "Mass fraction"; - Modelica.SIunits.MoleFraction[2] Y "Molar fraction"; - Modelica.SIunits.Temperature T "Temperature"; + Modelica.Units.SI.MassFraction[2] X_int "Mass fraction"; + Modelica.Units.SI.MoleFraction[2] Y "Molar fraction"; + Modelica.Units.SI.Temperature T "Temperature"; + + algorithm if size(X, 1) == nX then X_int:=X; @@ -581,6 +585,7 @@ ")); + end setState_psX; redeclare replaceable function extends specificEnthalpy @@ -595,10 +600,10 @@ redeclare replaceable function specificEnthalpy_pTX "Specific enthalpy" extends Modelica.Icons.Function; - input Modelica.SIunits.Pressure p "Pressure"; - input Modelica.SIunits.Temperature T "Temperature"; - input Modelica.SIunits.MassFraction X[:] "Mass fractions of moist air"; - output Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy at p, T, X"; + input Modelica.Units.SI.Pressure p "Pressure"; + input Modelica.Units.SI.Temperature T "Temperature"; + input Modelica.Units.SI.MassFraction X[:] "Mass fractions of moist air"; + output Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy at p, T, X"; algorithm h := specificEnthalpy(setState_pTX(p, T, X)); @@ -620,6 +625,7 @@ ")); + end specificEnthalpy_pTX; redeclare replaceable function extends specificGibbsEnergy @@ -738,10 +744,10 @@ redeclare function extends thermalConductivity "Thermal conductivity of dry air as a polynomial in the temperature" algorithm - lambda := Modelica.Media.Incompressible.TableBased.Polynomials_Temp.evaluate( - {(-4.8737307422969E-008), 7.67803133753502E-005, 0.0241814385504202}, - Modelica.SIunits.Conversions.to_degC(state.T)); + lambda := Modelica.Math.Polynomials.evaluate({-4.8737307422969E-008, 7.67803133753502E-005, 0.0241814385504202}, Modelica.Units.Conversions.to_degC(state.T)); + annotation(LateInline=true); + end thermalConductivity; ////////////////////////////////////////////////////////////////////// // Protected classes. @@ -755,11 +761,11 @@ "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.SIunits.SpecificHeatCapacity cp + Modelica.Units.SI.MolarMass MM "Molar mass"; + Modelica.Units.SI.SpecificHeatCapacity R "Gas constant"; + Modelica.Units.SI.SpecificHeatCapacity cp "Specific heat capacity at constant pressure"; - Modelica.SIunits.SpecificHeatCapacity cv = cp-R + Modelica.Units.SI.SpecificHeatCapacity cv = cp-R "Specific heat capacity at constant volume"; annotation ( preferredView="info", @@ -784,29 +790,29 @@ // In the assignments below, we compute cv as OpenModelica // cannot evaluate cv=cp-R as defined in GasProperties. constant GasProperties dryair( - R = Modelica.Media.IdealGases.Common.SingleGasesData.Air.R, + R = Modelica.Media.IdealGases.Common.SingleGasesData.Air.R_s, MM = Modelica.Media.IdealGases.Common.SingleGasesData.Air.MM, cp = Buildings.Utilities.Psychrometrics.Constants.cpAir, cv = Buildings.Utilities.Psychrometrics.Constants.cpAir - -Modelica.Media.IdealGases.Common.SingleGasesData.Air.R) + - Modelica.Media.IdealGases.Common.SingleGasesData.Air.R_s) "Dry air properties"; 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, cp = Buildings.Utilities.Psychrometrics.Constants.cpSte, cv = Buildings.Utilities.Psychrometrics.Constants.cpSte - -Modelica.Media.IdealGases.Common.SingleGasesData.H2O.R) + - Modelica.Media.IdealGases.Common.SingleGasesData.H2O.R_s) "Steam properties"; constant Real k_mair = steam.MM/dryair.MM "Ratio of molar weights"; - constant Modelica.SIunits.MolarMass[2] MMX={steam.MM,dryair.MM} + constant Modelica.Units.SI.MolarMass[2] MMX={steam.MM,dryair.MM} "Molar masses of components"; - constant Modelica.SIunits.SpecificEnergy h_fg= + constant Modelica.Units.SI.SpecificEnergy h_fg= Buildings.Utilities.Psychrometrics.Constants.h_fg "Latent heat of evaporation of water"; - constant Modelica.SIunits.SpecificHeatCapacity cpWatLiq= + constant Modelica.Units.SI.SpecificHeatCapacity cpWatLiq= Buildings.Utilities.Psychrometrics.Constants.cpWatLiq "Specific heat capacity of liquid water"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Antifreeze/BaseClasses/PropertyCoefficients.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Antifreeze/BaseClasses/PropertyCoefficients.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Antifreeze/BaseClasses/PropertyCoefficients.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Antifreeze/BaseClasses/PropertyCoefficients.mo" 2021-09-16 11:18:00.678307565 +0200 @@ -3,8 +3,8 @@ "Polynomial coefficients to evaluate fluid properties" extends Modelica.Icons.Record; - Modelica.SIunits.MassFraction X_a_ref "Reference mass fraction"; - Modelica.SIunits.Temperature T_ref "Reference temperature"; + Modelica.Units.SI.MassFraction X_a_ref "Reference mass fraction"; + Modelica.Units.SI.Temperature T_ref "Reference temperature"; parameter Integer nX_a "Order of polynomial in x"; Integer nT[nX_a] "Order of polynomial in y"; parameter Integer nTot "Total number of coefficients"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Antifreeze/PropyleneGlycolWater.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Antifreeze/PropyleneGlycolWater.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Antifreeze/PropyleneGlycolWater.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Antifreeze/PropyleneGlycolWater.mo" 2021-09-16 11:18:00.666307605 +0200 @@ -12,7 +12,7 @@ final lambda_const=thermalConductivity_TX_a(T = property_T, X_a = X_a), a_const=1484, final T_min=fusionTemperature_TX_a(T = property_T, X_a = X_a), - T_max=Modelica.SIunits.Conversions.from_degC(100), + T_max=Modelica.Units.Conversions.from_degC(100), T0=273.15, MM_const=(X_a/simplePropyleneGlycolWaterConstants[1].molarMass + (1 - X_a)/0.018015268)^(-1), @@ -25,9 +25,9 @@ Temperature(start=T_default), Density(start=d_const)); - constant Modelica.SIunits.Temperature property_T + constant Modelica.Units.SI.Temperature property_T "Temperature for evaluation of constant fluid properties"; - constant Modelica.SIunits.MassFraction X_a + constant Modelica.Units.SI.MassFraction X_a "Mass fraction of propylene glycol in water"; redeclare model BaseProperties "Base properties" @@ -39,14 +39,14 @@ InputMassFraction[nXi] Xi=fill(0, 0) "Structurally independent mass fractions"; InputSpecificEnthalpy h "Specific enthalpy of medium"; - Modelica.SIunits.SpecificInternalEnergy u + Modelica.Units.SI.SpecificInternalEnergy u "Specific internal energy of medium"; - Modelica.SIunits.Density d=d_const "Density of medium"; - Modelica.SIunits.MassFraction[nX] X={1} + Modelica.Units.SI.Density d=d_const "Density of medium"; + Modelica.Units.SI.MassFraction[nX] X={1} "Mass fractions (= (component mass)/total mass m_i/m)"; - final Modelica.SIunits.SpecificHeatCapacity R=0 + final Modelica.Units.SI.SpecificHeatCapacity R=0 "Gas constant (of mixture if applicable)"; - final Modelica.SIunits.MolarMass MM=MM_const + final Modelica.Units.SI.MolarMass MM=MM_const "Molar mass (of mixture or single fluid)"; ThermodynamicState state "Thermodynamic state record for optional functions"; @@ -55,21 +55,21 @@ annotation(Evaluate=true, Dialog(tab="Advanced")); final parameter Boolean standardOrderComponents=true "If true, and reducedX = true, the last element of X will be computed from the other ones"; - Modelica.SIunits.Conversions.NonSIunits.Temperature_degC T_degC= - Modelica.SIunits.Conversions.to_degC(T) + + Modelica.Units.NonSI.Temperature_degC T_degC= + Modelica.Units.Conversions.to_degC(T) "Temperature of medium in [degC]"; - Modelica.SIunits.Conversions.NonSIunits.Pressure_bar p_bar= - Modelica.SIunits.Conversions.to_bar(p) + Modelica.Units.NonSI.Pressure_bar p_bar= + Modelica.Units.Conversions.to_bar(p) "Absolute pressure of medium in [bar]"; // Local connector definition, used for equation balancing check - connector InputAbsolutePressure = input Modelica.SIunits.AbsolutePressure + connector InputAbsolutePressure = input Modelica.Units.SI.AbsolutePressure "Pressure as input signal connector"; - connector InputSpecificEnthalpy = input Modelica.SIunits.SpecificEnthalpy + connector InputSpecificEnthalpy = input Modelica.Units.SI.SpecificEnthalpy "Specific enthalpy as input signal connector"; - connector InputMassFraction = input Modelica.SIunits.MassFraction + connector InputMassFraction = input Modelica.Units.SI.MassFraction "Mass fraction as input signal connector"; - equation assert(T >= T_min, " In " + getInstanceName() + ": Temperature T exceeded its minimum allowed value of " + String(T_min-273.15) @@ -107,9 +107,9 @@ ")); end BaseProperties; protected - constant Modelica.SIunits.MassFraction X_a_min=0. + constant Modelica.Units.SI.MassFraction X_a_min=0. "Minimum allowed mass fraction of propylene glycol in water"; - constant Modelica.SIunits.MassFraction X_a_max=0.6 + constant Modelica.Units.SI.MassFraction X_a_max=0.6 "Maximum allowed mass fraction of propylene glycol in water"; // Fluid constants based on pure Propylene Glycol @@ -125,7 +125,7 @@ constant Buildings.Media.Antifreeze.BaseClasses.PropertyCoefficients proCoe( X_a_ref=0.307031, - T_ref=Modelica.SIunits.Conversions.from_degC(32.7083), + T_ref=Modelica.Units.Conversions.from_degC(32.7083), nX_a=6, nT={4,4,4,3,2,1}, nTot=18, @@ -149,9 +149,9 @@ replaceable function density_TX_a "Evaluate density of antifreeze-water mixture" extends Modelica.Icons.Function; - input Modelica.SIunits.Temperature T "Temperature of antifreeze-water mixture"; - input Modelica.SIunits.MassFraction X_a "Mass fraction of antifreeze"; - output Modelica.SIunits.Density d "Density of antifreeze-water mixture"; + input Modelica.Units.SI.Temperature T "Temperature of antifreeze-water mixture"; + input Modelica.Units.SI.MassFraction X_a "Mass fraction of antifreeze"; + output Modelica.Units.SI.Density d "Density of antifreeze-water mixture"; algorithm d :=polynomialProperty( X_a, @@ -187,9 +187,9 @@ replaceable function dynamicViscosity_TX_a "Evaluate dynamic viscosity of antifreeze-water mixture" extends Modelica.Icons.Function; - input Modelica.SIunits.Temperature T "Temperature of antifreeze-water mixture"; - input Modelica.SIunits.MassFraction X_a "Mass fraction of antifreeze"; - output Modelica.SIunits.DynamicViscosity eta "Dynamic Viscosity of antifreeze-water mixture"; + input Modelica.Units.SI.Temperature T "Temperature of antifreeze-water mixture"; + input Modelica.Units.SI.MassFraction X_a "Mass fraction of antifreeze"; + output Modelica.Units.SI.DynamicViscosity eta "Dynamic Viscosity of antifreeze-water mixture"; algorithm eta :=1e-3*exp(polynomialProperty( X_a, @@ -224,11 +224,11 @@ replaceable function fusionTemperature_TX_a "Evaluate temperature of fusion of antifreeze-water mixture" extends Modelica.Icons.Function; - input Modelica.SIunits.Temperature T "Temperature of antifreeze-water mixture"; - input Modelica.SIunits.MassFraction X_a "Mass fraction of antifreeze"; - output Modelica.SIunits.Temperature Tf "Temperature of fusion of antifreeze-water mixture"; + input Modelica.Units.SI.Temperature T "Temperature of antifreeze-water mixture"; + input Modelica.Units.SI.MassFraction X_a "Mass fraction of antifreeze"; + output Modelica.Units.SI.Temperature Tf "Temperature of fusion of antifreeze-water mixture"; algorithm - Tf :=Modelica.SIunits.Conversions.from_degC(polynomialProperty( + Tf :=Modelica.Units.Conversions.from_degC(polynomialProperty( X_a, T, proCoe.a_Tf)); @@ -326,9 +326,9 @@ replaceable function specificHeatCapacityCp_TX_a "Evaluate specific heat capacity of antifreeze-water mixture" extends Modelica.Icons.Function; - input Modelica.SIunits.Temperature T "Temperature of antifreeze-water mixture"; - input Modelica.SIunits.MassFraction X_a "Mass fraction of antifreeze"; - output Modelica.SIunits.SpecificHeatCapacity cp "Specific heat capacity of antifreeze-water mixture"; + input Modelica.Units.SI.Temperature T "Temperature of antifreeze-water mixture"; + input Modelica.Units.SI.MassFraction X_a "Mass fraction of antifreeze"; + output Modelica.Units.SI.SpecificHeatCapacity cp "Specific heat capacity of antifreeze-water mixture"; algorithm cp :=polynomialProperty( X_a, @@ -363,9 +363,9 @@ replaceable function thermalConductivity_TX_a "Evaluate thermal conductivity of antifreeze-water mixture" extends Modelica.Icons.Function; - input Modelica.SIunits.Temperature T "Temperature of antifreeze-water mixture"; - input Modelica.SIunits.MassFraction X_a "Mass fraction of antifreeze"; - output Modelica.SIunits.ThermalConductivity lambda "Thermal conductivity of antifreeze-water mixture"; + input Modelica.Units.SI.Temperature T "Temperature of antifreeze-water mixture"; + input Modelica.Units.SI.MassFraction X_a "Mass fraction of antifreeze"; + output Modelica.Units.SI.ThermalConductivity lambda "Thermal conductivity of antifreeze-water mixture"; algorithm lambda :=polynomialProperty( X_a, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Antifreeze/Validation/BaseClasses/FluidProperties.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Antifreeze/Validation/BaseClasses/FluidProperties.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Antifreeze/Validation/BaseClasses/FluidProperties.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Antifreeze/Validation/BaseClasses/FluidProperties.mo" 2021-09-16 11:18:00.578307900 +0200 @@ -8,30 +8,30 @@ parameter Integer nX_a "Number of mass fractions to evaluate fluid properties"; - parameter Modelica.SIunits.MassFraction X_a[nX_a] "Mass fraction of additive"; - parameter Modelica.SIunits.Temperature T_min + parameter Modelica.Units.SI.MassFraction X_a[nX_a] "Mass fraction of additive"; + parameter Modelica.Units.SI.Temperature T_min "Minimum temperature of mixture"; - parameter Modelica.SIunits.Temperature T_max + parameter Modelica.Units.SI.Temperature T_max "Maximum temperature of mixture"; - parameter Modelica.SIunits.Temperature reference_T = 293.15 + parameter Modelica.Units.SI.Temperature reference_T = 293.15 "Reference temperature"; - Modelica.SIunits.Temperature Tf[nX_a] "Fluid temperature"; - Modelica.SIunits.Density d[nX_a] "Density of fluid mixture"; - Modelica.SIunits.SpecificHeatCapacity cp[nX_a] "Specific heat capacity of fluid mixture"; - Modelica.SIunits.ThermalConductivity lambda[nX_a] "Density of fluid mixture"; - Modelica.SIunits.DynamicViscosity eta[nX_a] "Dynamic viscosity of fluid mixture"; - Modelica.SIunits.Temperature T "Temperature of fluid mixture"; - Modelica.SIunits.Conversions.NonSIunits.Temperature_degC T_degC "Celsius temperature"; + Modelica.Units.SI.Temperature Tf[nX_a] "Fluid temperature"; + Modelica.Units.SI.Density d[nX_a] "Density of fluid mixture"; + Modelica.Units.SI.SpecificHeatCapacity cp[nX_a] "Specific heat capacity of fluid mixture"; + Modelica.Units.SI.ThermalConductivity lambda[nX_a] "Density of fluid mixture"; + Modelica.Units.SI.DynamicViscosity eta[nX_a] "Dynamic viscosity of fluid mixture"; + Modelica.Units.SI.Temperature T "Temperature of fluid mixture"; + Modelica.Units.NonSI.Temperature_degC T_degC "Celsius temperature"; protected - parameter Modelica.SIunits.Time dt = 1 + parameter Modelica.Units.SI.Time dt = 1 "Simulation length"; parameter Real convT(unit="K/s") = (T_max-T_min)/dt "Rate of temperature change"; equation T = T_min + convT*time; - T_degC = Modelica.SIunits.Conversions.to_degC(T); + T_degC = Modelica.Units.Conversions.to_degC(T); for i in 1:nX_a loop Tf[i] =Medium.testFusionTemperature_TX_a(T=T, X_a=X_a[i]); d[i] =if T >= Tf[i] then Medium.testDensity_TX_a(T=T, X_a=X_a[i]) else 0.; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Antifreeze/Validation/BaseClasses/PropyleneGlycolWater.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Antifreeze/Validation/BaseClasses/PropyleneGlycolWater.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Antifreeze/Validation/BaseClasses/PropyleneGlycolWater.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Antifreeze/Validation/BaseClasses/PropyleneGlycolWater.mo" 2021-09-16 11:18:00.562307953 +0200 @@ -6,9 +6,9 @@ replaceable function testDensity_TX_a "Evaluate density of antifreeze-water mixture" extends Modelica.Icons.Function; - input Modelica.SIunits.Temperature T "Temperature of antifreeze-water mixture"; - input Modelica.SIunits.MassFraction X_a "Mass fraction of antifreeze"; - output Modelica.SIunits.Density d "Density of antifreeze-water mixture"; + input Modelica.Units.SI.Temperature T "Temperature of antifreeze-water mixture"; + input Modelica.Units.SI.MassFraction X_a "Mass fraction of antifreeze"; + output Modelica.Units.SI.Density d "Density of antifreeze-water mixture"; algorithm d := density_TX_a(T = T, X_a = X_a); @@ -34,9 +34,9 @@ function testDynamicViscosity_TX_a "Evaluate dynamic viscosity of antifreeze-water mixture" extends Modelica.Icons.Function; - input Modelica.SIunits.Temperature T "Temperature of antifreeze-water mixture"; - input Modelica.SIunits.MassFraction X_a "Mass fraction of antifreeze"; - output Modelica.SIunits.DynamicViscosity eta "Dynamic Viscosity of antifreeze-water mixture"; + input Modelica.Units.SI.Temperature T "Temperature of antifreeze-water mixture"; + input Modelica.Units.SI.MassFraction X_a "Mass fraction of antifreeze"; + output Modelica.Units.SI.DynamicViscosity eta "Dynamic Viscosity of antifreeze-water mixture"; algorithm eta := dynamicViscosity_TX_a(T = T, X_a = X_a); @@ -62,9 +62,9 @@ function testFusionTemperature_TX_a "Evaluate temperature of fusion of antifreeze-water mixture" extends Modelica.Icons.Function; - input Modelica.SIunits.Temperature T "Temperature of antifreeze-water mixture"; - input Modelica.SIunits.MassFraction X_a "Mass fraction of antifreeze"; - output Modelica.SIunits.Temperature Tf "Temperature of fusion of antifreeze-water mixture"; + input Modelica.Units.SI.Temperature T "Temperature of antifreeze-water mixture"; + input Modelica.Units.SI.MassFraction X_a "Mass fraction of antifreeze"; + output Modelica.Units.SI.Temperature Tf "Temperature of fusion of antifreeze-water mixture"; algorithm Tf := fusionTemperature_TX_a(T = T, X_a = X_a); @@ -90,9 +90,9 @@ function testSpecificHeatCapacityCp_TX_a "Evaluate specific heat capacity of antifreeze-water mixture" extends Modelica.Icons.Function; - input Modelica.SIunits.Temperature T "Temperature of antifreeze-water mixture"; - input Modelica.SIunits.MassFraction X_a "Mass fraction of antifreeze"; - output Modelica.SIunits.SpecificHeatCapacity cp "Specific heat capacity of antifreeze-water mixture"; + input Modelica.Units.SI.Temperature T "Temperature of antifreeze-water mixture"; + input Modelica.Units.SI.MassFraction X_a "Mass fraction of antifreeze"; + output Modelica.Units.SI.SpecificHeatCapacity cp "Specific heat capacity of antifreeze-water mixture"; algorithm cp := specificHeatCapacityCp_TX_a(T = T, X_a = X_a); @@ -118,9 +118,9 @@ function testThermalConductivity_TX_a "Evaluate thermal conductivity of antifreeze-water mixture" extends Modelica.Icons.Function; - input Modelica.SIunits.Temperature T "Temperature of antifreeze-water mixture"; - input Modelica.SIunits.MassFraction X_a "Mass fraction of antifreeze"; - output Modelica.SIunits.ThermalConductivity lambda "Thermal conductivity of antifreeze-water mixture"; + input Modelica.Units.SI.Temperature T "Temperature of antifreeze-water mixture"; + input Modelica.Units.SI.MassFraction X_a "Mass fraction of antifreeze"; + output Modelica.Units.SI.ThermalConductivity lambda "Thermal conductivity of antifreeze-water mixture"; algorithm lambda := thermalConductivity_TX_a(T = T, X_a = X_a); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Examples/AirDerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Examples/AirDerivativeCheck.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Examples/AirDerivativeCheck.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Examples/AirDerivativeCheck.mo" 2021-09-16 11:18:00.518308101 +0200 @@ -3,19 +3,19 @@ extends Modelica.Icons.Example; package Medium = Buildings.Media.Air; - Modelica.SIunits.Temperature T "Temperature"; - Modelica.SIunits.MassFraction X[1] "Water vapor mass fraction"; + Modelica.Units.SI.Temperature T "Temperature"; + Modelica.Units.SI.MassFraction X[1] "Water vapor mass fraction"; - Modelica.SIunits.SpecificEnthalpy hLiqSym "Liquid phase enthalpy"; - Modelica.SIunits.SpecificEnthalpy hLiqCod "Liquid phase enthalpy"; - Modelica.SIunits.SpecificEnthalpy hSteSym "Water vapor enthalpy"; - Modelica.SIunits.SpecificEnthalpy hSteCod "Water vapor enthalpy"; - Modelica.SIunits.SpecificEnthalpy hAirSym "Dry air enthalpy"; - Modelica.SIunits.SpecificEnthalpy hAirCod "Dry air enthalpy"; - Modelica.SIunits.SpecificHeatCapacity cpSym "Specific heat capacity"; - Modelica.SIunits.SpecificHeatCapacity cpCod "Specific heat capacity"; - Modelica.SIunits.SpecificHeatCapacity cvSym "Specific heat capacity"; - Modelica.SIunits.SpecificHeatCapacity cvCod "Specific heat capacity"; + Modelica.Units.SI.SpecificEnthalpy hLiqSym "Liquid phase enthalpy"; + Modelica.Units.SI.SpecificEnthalpy hLiqCod "Liquid phase enthalpy"; + Modelica.Units.SI.SpecificEnthalpy hSteSym "Water vapor enthalpy"; + Modelica.Units.SI.SpecificEnthalpy hSteCod "Water vapor enthalpy"; + Modelica.Units.SI.SpecificEnthalpy hAirSym "Dry air enthalpy"; + Modelica.Units.SI.SpecificEnthalpy hAirCod "Dry air enthalpy"; + Modelica.Units.SI.SpecificHeatCapacity cpSym "Specific heat capacity"; + Modelica.Units.SI.SpecificHeatCapacity cpCod "Specific heat capacity"; + Modelica.Units.SI.SpecificHeatCapacity cvSym "Specific heat capacity"; + Modelica.Units.SI.SpecificHeatCapacity cvCod "Specific heat capacity"; constant Real convT(unit="K/s3") = 270 "Conversion factor to satisfy unit check"; constant Real convX(unit="1/s3") = 0.01 diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Examples/AirProperties.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Examples/AirProperties.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Examples/AirProperties.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Examples/AirProperties.mo" 2021-09-16 11:18:00.502308155 +0200 @@ -7,7 +7,7 @@ TMin=273.15-30, TMax=273.15+60); - Modelica.SIunits.SpecificEnthalpy hLiq "Specific enthalpy of liquid"; + Modelica.Units.SI.SpecificEnthalpy hLiq "Specific enthalpy of liquid"; equation // Check the implementation of the base properties diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Examples/BaseClasses/FluidProperties.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Examples/BaseClasses/FluidProperties.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Examples/BaseClasses/FluidProperties.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Examples/BaseClasses/FluidProperties.mo" 2021-09-16 11:18:00.470308262 +0200 @@ -10,7 +10,7 @@ "Density derivative w.r.t. pressure"; Modelica.Media.Interfaces.Types.DerDensityByTemperature ddTp "Density derivative w.r.t. temperature"; - Modelica.SIunits.Density[Medium.nX] dddX + Modelica.Units.SI.Density[Medium.nX] dddX "Density derivative w.r.t. mass fraction"; equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Examples/BaseClasses/PartialProperties.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Examples/BaseClasses/PartialProperties.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Examples/BaseClasses/PartialProperties.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Examples/BaseClasses/PartialProperties.mo" 2021-09-16 11:18:00.458308302 +0200 @@ -4,40 +4,40 @@ replaceable package Medium = Modelica.Media.Interfaces.PartialMedium; - parameter Modelica.SIunits.Temperature TMin + parameter Modelica.Units.SI.Temperature TMin "Minimum temperature for the simulation"; - parameter Modelica.SIunits.Temperature TMax + parameter Modelica.Units.SI.Temperature TMax "Maximum temperature for the simulation"; - parameter Modelica.SIunits.Pressure p = Medium.p_default "Pressure"; - parameter Modelica.SIunits.MassFraction X[Medium.nX]= + parameter Modelica.Units.SI.Pressure p = Medium.p_default "Pressure"; + parameter Modelica.Units.SI.MassFraction X[Medium.nX]= Medium.X_default "Mass fraction"; Medium.Temperature T "Temperature"; - Modelica.SIunits.Conversions.NonSIunits.Temperature_degC T_degC + Modelica.Units.NonSI.Temperature_degC T_degC "Celsius temperature"; Medium.ThermodynamicState state_pTX "Medium state"; - Modelica.SIunits.Density d "Density"; - Modelica.SIunits.DynamicViscosity eta "Dynamic viscosity"; - Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy"; - Modelica.SIunits.SpecificInternalEnergy u "Specific internal energy"; - Modelica.SIunits.SpecificEntropy s "Specific entropy"; - Modelica.SIunits.SpecificEnergy g "Specific Gibbs energy"; - Modelica.SIunits.SpecificEnergy f "Specific Helmholtz energy"; + Modelica.Units.SI.Density d "Density"; + Modelica.Units.SI.DynamicViscosity eta "Dynamic viscosity"; + Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy"; + Modelica.Units.SI.SpecificInternalEnergy u "Specific internal energy"; + Modelica.Units.SI.SpecificEntropy s "Specific entropy"; + Modelica.Units.SI.SpecificEnergy g "Specific Gibbs energy"; + Modelica.Units.SI.SpecificEnergy f "Specific Helmholtz energy"; - Modelica.SIunits.SpecificEnthalpy hIse "Isentropic enthalpy"; + Modelica.Units.SI.SpecificEnthalpy hIse "Isentropic enthalpy"; Modelica.Media.Interfaces.Types.IsobaricExpansionCoefficient beta "Isobaric expansion coefficient"; - Modelica.SIunits.IsothermalCompressibility kappa "Isothermal compressibility"; + Modelica.Units.SI.IsothermalCompressibility kappa "Isothermal compressibility"; - Modelica.SIunits.SpecificHeatCapacity cp "Specific heat capacity"; - Modelica.SIunits.SpecificHeatCapacity cv "Specific heat capacity"; - Modelica.SIunits.ThermalConductivity lambda "Thermal conductivity"; + Modelica.Units.SI.SpecificHeatCapacity cp "Specific heat capacity"; + Modelica.Units.SI.SpecificHeatCapacity cv "Specific heat capacity"; + Modelica.Units.SI.ThermalConductivity lambda "Thermal conductivity"; - Modelica.SIunits.AbsolutePressure pMed "Pressure"; + Modelica.Units.SI.AbsolutePressure pMed "Pressure"; Medium.Temperature TMed "Temperature"; - Modelica.SIunits.MolarMass MM "Mixture molar mass"; + Modelica.Units.SI.MolarMass MM "Mixture molar mass"; Medium.BaseProperties basPro "Medium base properties"; protected @@ -57,7 +57,7 @@ equation // Compute temperatures that are used as input to the functions T = TMin + conv*time * (TMax-TMin); - T_degC = Modelica.SIunits.Conversions.to_degC(T); + T_degC = Modelica.Units.Conversions.to_degC(T); // Check the implementation of the functions d = Medium.density(state_pTX); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Examples/BaseClasses/TestTemperatureEnthalpyInversion.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Examples/BaseClasses/TestTemperatureEnthalpyInversion.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Examples/BaseClasses/TestTemperatureEnthalpyInversion.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Examples/BaseClasses/TestTemperatureEnthalpyInversion.mo" 2021-09-16 11:18:00.434308382 +0200 @@ -3,10 +3,10 @@ "Model to check computation of h(T) and its inverse with a controlleable tolerance" replaceable package Medium = Modelica.Media.Interfaces.PartialMedium; - parameter Modelica.SIunits.Temperature T0=273.15+20 "Temperature"; + parameter Modelica.Units.SI.Temperature T0=273.15+20 "Temperature"; parameter Real tol = 1E-8 "Numerical tolerance"; - Modelica.SIunits.Temperature T "Temperature"; - Modelica.SIunits.SpecificEnthalpy h "Enthalpy"; + Modelica.Units.SI.Temperature T "Temperature"; + Modelica.Units.SI.SpecificEnthalpy h "Enthalpy"; Medium.MassFraction Xi[:] = Medium.reference_X "Mass fraction"; equation h = Medium.specificEnthalpy_pTX(p=101325, T=T0, X=Xi); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Examples/PropyleneGlycolWaterDerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Examples/PropyleneGlycolWaterDerivativeCheck.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Examples/PropyleneGlycolWaterDerivativeCheck.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Examples/PropyleneGlycolWaterDerivativeCheck.mo" 2021-09-16 11:18:00.418308436 +0200 @@ -7,13 +7,13 @@ X_a=0.60, property_T=293.15); - Modelica.SIunits.Temperature T "Temperature"; - Modelica.SIunits.SpecificEnthalpy hLiqSym "Liquid phase enthalpy"; - Modelica.SIunits.SpecificEnthalpy hLiqCod "Liquid phase enthalpy"; - Modelica.SIunits.SpecificHeatCapacity cpSym "Specific heat capacity"; - Modelica.SIunits.SpecificHeatCapacity cpCod "Specific heat capacity"; - Modelica.SIunits.SpecificHeatCapacity cvSym "Specific heat capacity"; - Modelica.SIunits.SpecificHeatCapacity cvCod "Specific heat capacity"; + Modelica.Units.SI.Temperature T "Temperature"; + Modelica.Units.SI.SpecificEnthalpy hLiqSym "Liquid phase enthalpy"; + Modelica.Units.SI.SpecificEnthalpy hLiqCod "Liquid phase enthalpy"; + Modelica.Units.SI.SpecificHeatCapacity cpSym "Specific heat capacity"; + Modelica.Units.SI.SpecificHeatCapacity cpCod "Specific heat capacity"; + Modelica.Units.SI.SpecificHeatCapacity cvSym "Specific heat capacity"; + Modelica.Units.SI.SpecificHeatCapacity cvCod "Specific heat capacity"; constant Real convT(unit="K/s3") = 100 "Conversion factor to satisfy unit check"; initial equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Examples/WaterDerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Examples/WaterDerivativeCheck.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Examples/WaterDerivativeCheck.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Examples/WaterDerivativeCheck.mo" 2021-09-16 11:18:00.386308543 +0200 @@ -4,13 +4,13 @@ package Medium = Buildings.Media.Water; - Modelica.SIunits.Temperature T "Temperature"; - Modelica.SIunits.SpecificEnthalpy hLiqSym "Liquid phase enthalpy"; - Modelica.SIunits.SpecificEnthalpy hLiqCod "Liquid phase enthalpy"; - Modelica.SIunits.SpecificHeatCapacity cpSym "Specific heat capacity"; - Modelica.SIunits.SpecificHeatCapacity cpCod "Specific heat capacity"; - Modelica.SIunits.SpecificHeatCapacity cvSym "Specific heat capacity"; - Modelica.SIunits.SpecificHeatCapacity cvCod "Specific heat capacity"; + Modelica.Units.SI.Temperature T "Temperature"; + Modelica.Units.SI.SpecificEnthalpy hLiqSym "Liquid phase enthalpy"; + Modelica.Units.SI.SpecificEnthalpy hLiqCod "Liquid phase enthalpy"; + Modelica.Units.SI.SpecificHeatCapacity cpSym "Specific heat capacity"; + Modelica.Units.SI.SpecificHeatCapacity cpCod "Specific heat capacity"; + Modelica.Units.SI.SpecificHeatCapacity cvSym "Specific heat capacity"; + Modelica.Units.SI.SpecificHeatCapacity cvCod "Specific heat capacity"; constant Real convT(unit="K/s3") = 270 "Conversion factor to satisfy unit check"; initial equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/dPressureVap_dSpecificVolume_Tv.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/dPressureVap_dSpecificVolume_Tv.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/dPressureVap_dSpecificVolume_Tv.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/dPressureVap_dSpecificVolume_Tv.mo" 2021-09-16 11:18:00.334308717 +0200 @@ -2,16 +2,16 @@ function dPressureVap_dSpecificVolume_Tv "Derivative of the Martin-Hou equation of state with regards to specific volume" - input Modelica.SIunits.Temperature T + input Modelica.Units.SI.Temperature T "Temperature of refrigerant"; - input Modelica.SIunits.SpecificVolume v + input Modelica.Units.SI.SpecificVolume v "Specific volume of refrigerant"; output Real dpdv( final unit="Pa.kg/m3") "Derivative of pressure with regards to specific volume"; protected - Modelica.SIunits.SpecificEntropy R = 114.55 + Modelica.Units.SI.SpecificEntropy R = 114.55 "Refrigerant gas constant for Martin-Hou equation of state"; Real A[:] = {-1.721781e2, 2.381558e-1, -4.329207e-4, -6.241072e-7} @@ -29,10 +29,10 @@ Real k = 5.75 "Coefficient K for Martin-Hou equation of state"; - Modelica.SIunits.Temperature TCri = 345.25 + Modelica.Units.SI.Temperature TCri = 345.25 "Critical temperature of refrigerant"; - Modelica.SIunits.SpecificVolume v_abs + Modelica.Units.SI.SpecificVolume v_abs "Smoothed specific volume"; parameter Integer n = size(A, 1); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/dPressureVap_dTemperature_Tv.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/dPressureVap_dTemperature_Tv.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/dPressureVap_dTemperature_Tv.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/dPressureVap_dTemperature_Tv.mo" 2021-09-16 11:18:00.314308784 +0200 @@ -2,16 +2,16 @@ function dPressureVap_dTemperature_Tv "Derivative of the Martin-Hou equation of state with regards to temperature" - input Modelica.SIunits.Temperature T + input Modelica.Units.SI.Temperature T "Temperature of refrigerant"; - input Modelica.SIunits.SpecificVolume v + input Modelica.Units.SI.SpecificVolume v "Specific volume of refrigerant"; output Real dpdT( final unit="Pa/K") "Derivative of pressure with regards to temperature"; protected - Modelica.SIunits.SpecificEntropy R = 114.55 + Modelica.Units.SI.SpecificEntropy R = 114.55 "Refrigerant gas constant for Martin-Hou equation of state"; Real A[:] = {-1.721781e2, 2.381558e-1, -4.329207e-4, -6.241072e-7} @@ -29,10 +29,10 @@ Real k = 5.75 "Coefficient K for Martin-Hou equation of state"; - Modelica.SIunits.Temperature TCri = 345.25 + Modelica.Units.SI.Temperature TCri = 345.25 "Critical temperature of refrigerant"; - Modelica.SIunits.SpecificVolume v_abs + Modelica.Units.SI.SpecificVolume v_abs "Smoothed specific volume"; parameter Integer n = size(A, 1); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/dSpecificVolumeVap_pT.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/dSpecificVolumeVap_pT.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/dSpecificVolumeVap_pT.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/dSpecificVolumeVap_pT.mo" 2021-09-16 11:18:00.294308852 +0200 @@ -1,9 +1,9 @@ within Buildings.Media.Refrigerants.R410A; function dSpecificVolumeVap_pT "Function that calculates the Jacobian of specific volume R410A vapor based on pressure and temperature" - input Modelica.SIunits.AbsolutePressure p + input Modelica.Units.SI.AbsolutePressure p "Pressure of refrigerant vapor"; - input Modelica.SIunits.Temperature T + input Modelica.Units.SI.Temperature T "Temperature of refrigerant"; input Real dp( final unit="Pa/s") @@ -24,9 +24,9 @@ final unit="Pa.kg/m3") "Derivative of pressure with regards to specific volume"; - Modelica.SIunits.SpecificVolume v - "Specific volume of refrigerant"; + Modelica.Units.SI.SpecificVolume v + "Specific volume of refrigerant"; algorithm v := Buildings.Media.Refrigerants.R410A.specificVolumeVap_pT(p, T); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/enthalpySatLiq_T.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/enthalpySatLiq_T.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/enthalpySatLiq_T.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/enthalpySatLiq_T.mo" 2021-09-16 11:18:00.278308905 +0200 @@ -1,9 +1,9 @@ within Buildings.Media.Refrigerants.R410A; function enthalpySatLiq_T "Function that calculates the enthalpy of saturated liquid R410A based on temperature" - input Modelica.SIunits.Temperature T + input Modelica.Units.SI.Temperature T "Temperature of refrigerant"; - output Modelica.SIunits.SpecificEnthalpy h + output Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy of saturated liquid refrigerant"; protected @@ -13,7 +13,7 @@ final Real x0 = 0.5541498 "x0 for saturation pressure of liquid refrigerant"; - final Modelica.SIunits.Temperature TCri = 345.25 + final Modelica.Units.SI.Temperature TCri = 345.25 "Critical temperature of refrigerant"; Real x diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/enthalpySatVap_T.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/enthalpySatVap_T.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/enthalpySatVap_T.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/enthalpySatVap_T.mo" 2021-09-16 11:18:00.262308959 +0200 @@ -1,9 +1,9 @@ within Buildings.Media.Refrigerants.R410A; function enthalpySatVap_T "Function that calculates the specific enthalpy of saturated R410A vapor based on temperature" - input Modelica.SIunits.Temperature T + input Modelica.Units.SI.Temperature T "Temperature of refrigerant"; - output Modelica.SIunits.SpecificEnthalpy h + output Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy of saturated liquid refrigerant"; protected @@ -13,7 +13,7 @@ final Real x0 = 0 "x0 for saturation pressure of liquid refrigerant"; - final Modelica.SIunits.Temperature TCri = 345.25 + final Modelica.Units.SI.Temperature TCri = 345.25 "Critical temperature of refrigerant"; Real x diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/isentropicExponentVap_Tv.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/isentropicExponentVap_Tv.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/isentropicExponentVap_Tv.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/isentropicExponentVap_Tv.mo" 2021-09-16 11:18:00.054309656 +0200 @@ -1,20 +1,20 @@ within Buildings.Media.Refrigerants.R410A; function isentropicExponentVap_Tv "Function that calculates the isentropic exponent of R410A vapor based on temperature and specific volume" - input Modelica.SIunits.Temperature T + input Modelica.Units.SI.Temperature T "Temperature of refrigerant"; - input Modelica.SIunits.SpecificVolume v + input Modelica.Units.SI.SpecificVolume v "Specific volume of refrigerant"; - output Modelica.SIunits.IsentropicExponent k + output Modelica.Units.SI.IsentropicExponent k "Specific isobaric heat capacity"; protected - Modelica.SIunits.SpecificHeatCapacity cp + + Modelica.Units.SI.SpecificHeatCapacity cp "Specific isobaric heat capacity"; - Modelica.SIunits.SpecificHeatCapacity cv + Modelica.Units.SI.SpecificHeatCapacity cv "Specific isochoric heat capacity"; - algorithm // Evaluate the specific isobaric and isochoric heat capacities cp := Buildings.Media.Refrigerants.R410A.specificIsobaricHeatCapacityVap_Tv(T, v); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/package.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/package.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/package.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/package.mo" 2021-09-16 11:18:00.346308677 +0200 @@ -2,16 +2,16 @@ package R410A "Refrigerant R410A" extends Modelica.Icons.VariantsPackage; - final constant Modelica.SIunits.SpecificEntropy R = 114.55 + final constant Modelica.Units.SI.SpecificEntropy R = 114.55 "Gas constant for use in Martin-Hou equation of state"; - final constant Modelica.SIunits.Temperature TCri = 345.25 + final constant Modelica.Units.SI.Temperature TCri = 345.25 "Critical temperature"; - final constant Modelica.SIunits.Temperature T_min = 173.15 + final constant Modelica.Units.SI.Temperature T_min = 173.15 "Minimum temperature for correlated properties"; - final constant Modelica.SIunits.AbsolutePressure pCri = 4926.1e3 + final constant Modelica.Units.SI.AbsolutePressure pCri = 4926.1e3 "Critical pressure"; annotation (preferredView="info",Documentation(info=" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/pressureSatVap_T.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/pressureSatVap_T.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/pressureSatVap_T.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/pressureSatVap_T.mo" 2021-09-16 11:18:00.046309683 +0200 @@ -1,9 +1,9 @@ within Buildings.Media.Refrigerants.R410A; function pressureSatVap_T "Function that calculates the pressure of saturated R410A vapor based on temperature" - input Modelica.SIunits.Temperature T + input Modelica.Units.SI.Temperature T "Temperature of refrigerant"; - output Modelica.SIunits.AbsolutePressure p + output Modelica.Units.SI.AbsolutePressure p "Pressure of saturated refrigerant vapor"; protected @@ -13,10 +13,10 @@ final Real x0 = 0.2086902 "x0 for saturation pressure of refrigerant vapor"; - final Modelica.SIunits.Temperature TCri = 345.25 + final Modelica.Units.SI.Temperature TCri = 345.25 "Critical temperature of refrigerant"; - final Modelica.SIunits.AbsolutePressure pCri = 4925.1e3 + final Modelica.Units.SI.AbsolutePressure pCri = 4925.1e3 "Critical pressure of refrigerant"; Real x diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/pressureVap_Tv.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/pressureVap_Tv.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/pressureVap_Tv.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/pressureVap_Tv.mo" 2021-09-16 11:18:00.034309723 +0200 @@ -1,15 +1,15 @@ within Buildings.Media.Refrigerants.R410A; function pressureVap_Tv "Function that calculates the pressure R410A vapor based on temperature and specific volume" -input Modelica.SIunits.Temperature T +input Modelica.Units.SI.Temperature T "Temperature of refrigerant"; -input Modelica.SIunits.SpecificVolume v +input Modelica.Units.SI.SpecificVolume v "Specific volume of refrigerant"; -output Modelica.SIunits.AbsolutePressure p +output Modelica.Units.SI.AbsolutePressure p "Pressure of refrigerant vapor"; protected - Modelica.SIunits.SpecificEntropy R = 114.55 + Modelica.Units.SI.SpecificEntropy R = 114.55 "Refrigerant gas constant for Martin-Hou equation of state"; Real A[:] = {-1.721781e2, 2.381558e-1, -4.329207e-4, -6.241072e-7} @@ -27,10 +27,10 @@ Real k = 5.75 "Coefficient K for Martin-Hou equation of state"; - Modelica.SIunits.Temperature TCri = 345.25 + Modelica.Units.SI.Temperature TCri = 345.25 "Critical temperature of refrigerant"; - Modelica.SIunits.SpecificVolume v_abs + Modelica.Units.SI.SpecificVolume v_abs "Smoothed specific volume"; parameter Integer n = size(A, 1); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/specificIsobaricHeatCapacityVap_Tv.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/specificIsobaricHeatCapacityVap_Tv.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/specificIsobaricHeatCapacityVap_Tv.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/specificIsobaricHeatCapacityVap_Tv.mo" 2021-09-16 11:18:00.022309763 +0200 @@ -1,15 +1,15 @@ within Buildings.Media.Refrigerants.R410A; function specificIsobaricHeatCapacityVap_Tv "Function that calculates the specific isobaric heat capacity of R410A vapor based on temperature and specific volume" - input Modelica.SIunits.Temperature T + input Modelica.Units.SI.Temperature T "Temperature of refrigerant"; - input Modelica.SIunits.SpecificVolume v + input Modelica.Units.SI.SpecificVolume v "Specific volume of refrigerant"; - output Modelica.SIunits.SpecificHeatCapacity cp + output Modelica.Units.SI.SpecificHeatCapacity cp "Specific isobaric heat capacity"; protected - Modelica.SIunits.SpecificEntropy R = 114.55 + Modelica.Units.SI.SpecificEntropy R = 114.55 "Refrigerant gas constant for Martin-Hou equation of state"; Real A[:] = {-1.721781e2, 2.381558e-1, -4.329207e-4, -6.241072e-7} @@ -33,10 +33,10 @@ Real dpdv "First derivative w.r.t. specific volume of the Martin-Hou equation"; - Modelica.SIunits.SpecificHeatCapacity cv + Modelica.Units.SI.SpecificHeatCapacity cv "Specific isochoric heat capacity"; - Modelica.SIunits.Temperature TCri = 345.25 + Modelica.Units.SI.Temperature TCri = 345.25 "Critical temperature of refrigerant"; parameter Integer n = size(A, 1); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/specificIsochoricHeatCapacityVap_Tv.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/specificIsochoricHeatCapacityVap_Tv.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/specificIsochoricHeatCapacityVap_Tv.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/specificIsochoricHeatCapacityVap_Tv.mo" 2021-09-16 11:18:00.010309803 +0200 @@ -2,15 +2,15 @@ function specificIsochoricHeatCapacityVap_Tv "Function that calculates the specific isochoric heat capacity of R410A vapor based on temperature and specific volume" - input Modelica.SIunits.Temperature T + input Modelica.Units.SI.Temperature T "Temperature of refrigerant"; - input Modelica.SIunits.SpecificVolume v + input Modelica.Units.SI.SpecificVolume v "Specific volume of refrigerant"; - output Modelica.SIunits.SpecificHeatCapacity cv + output Modelica.Units.SI.SpecificHeatCapacity cv "Specific isochoric heat capacity"; protected - Modelica.SIunits.SpecificEntropy R = 114.55 + Modelica.Units.SI.SpecificEntropy R = 114.55 "Refrigerant gas constant for Martin-Hou equation of state"; Real A[:] = {-1.721781e2, 2.381558e-1, -4.329207e-4, -6.241072e-7} @@ -34,13 +34,13 @@ Real integral_of_d2pdT2 "Integral over v of the second derivative w.r.t. temperature of the Martin-Hou equation"; - Modelica.SIunits.SpecificHeatCapacity cpo + Modelica.Units.SI.SpecificHeatCapacity cpo "Ideal gas specific isobaric heat capacity"; - Modelica.SIunits.SpecificHeatCapacity cvo + Modelica.Units.SI.SpecificHeatCapacity cvo "Ideal gas specific isochoric heat capacity"; - Modelica.SIunits.Temperature TCri = 345.25 + Modelica.Units.SI.Temperature TCri = 345.25 "Critical temperature of refrigerant"; parameter Integer n = size(A, 1); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/specificVolumeVap_pT.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/specificVolumeVap_pT.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/specificVolumeVap_pT.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/R410A/specificVolumeVap_pT.mo" 2021-09-16 11:17:59.994309857 +0200 @@ -1,15 +1,15 @@ within Buildings.Media.Refrigerants.R410A; function specificVolumeVap_pT "Function that calculates the specific volume R410A vapor based on pressure and temperature" - input Modelica.SIunits.AbsolutePressure p + input Modelica.Units.SI.AbsolutePressure p "Pressure of refrigerant vapor"; - input Modelica.SIunits.Temperature T + input Modelica.Units.SI.Temperature T "Temperature of refrigerant"; - output Modelica.SIunits.SpecificVolume v + output Modelica.Units.SI.SpecificVolume v "Specific volume of refrigerant"; protected - Modelica.SIunits.SpecificEntropy R = 114.55 + Modelica.Units.SI.SpecificEntropy R = 114.55 "Refrigerant gas constant for Martin-Hou equation of state"; Real A[:] = {-1.721781e2, 2.381558e-1, -4.329207e-4, -6.241072e-7} @@ -27,10 +27,10 @@ Real k = 5.75 "Coefficient K for Martin-Hou equation of state"; - Modelica.SIunits.SpecificVolume dv + Modelica.Units.SI.SpecificVolume dv "Error on specific volume of refrigerant"; - Modelica.SIunits.Pressure dp + Modelica.Units.SI.Pressure dp "Error on pressure of refrigerant"; Real dpdv( final unit = "(Pa.kg)/m3"); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/Validation/R410A_dSpecificVolumeVap_pT.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/Validation/R410A_dSpecificVolumeVap_pT.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/Validation/R410A_dSpecificVolumeVap_pT.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Refrigerants/Validation/R410A_dSpecificVolumeVap_pT.mo" 2021-09-16 11:17:59.974309923 +0200 @@ -3,10 +3,10 @@ "Validation of the derivatives of the specific volume with regards to p and T" extends Modelica.Icons.Example; - parameter Modelica.SIunits.AbsolutePressure p = 400e3 + parameter Modelica.Units.SI.AbsolutePressure p = 400e3 "Pressure of refrigerant vapor"; - parameter Modelica.SIunits.Temperature T = 273.15 + parameter Modelica.Units.SI.Temperature T = 273.15 "Temperature of refrigerant"; parameter Real dp(final unit="Pa") = 1.0 @@ -50,9 +50,9 @@ "Numerical delta of specific volume of refrigerant with regards to temperature"; - constant Modelica.SIunits.Time oneSec = 1.0 - "Unit time variable for unit conversion of time derivatives"; + constant Modelica.Units.SI.Time oneSec = 1.0 + "Unit time variable for unit conversion of time derivatives"; equation // Analytical derivatives diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Specialized/Air/Examples/PerfectGasDerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Specialized/Air/Examples/PerfectGasDerivativeCheck.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Specialized/Air/Examples/PerfectGasDerivativeCheck.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Specialized/Air/Examples/PerfectGasDerivativeCheck.mo" 2021-09-16 11:17:59.930310071 +0200 @@ -4,13 +4,13 @@ package Medium = Buildings.Media.Specialized.Air.PerfectGas; - Modelica.SIunits.Temperature T "Temperature"; - Modelica.SIunits.SpecificEnthalpy hLiqSym "Liquid phase enthalpy"; - Modelica.SIunits.SpecificEnthalpy hLiqCod "Liquid phase enthalpy"; - Modelica.SIunits.SpecificEnthalpy hSteSym "Water vapor enthalpy"; - Modelica.SIunits.SpecificEnthalpy hSteCod "Water vapor enthalpy"; - Modelica.SIunits.SpecificEnthalpy hAirSym "Dry air enthalpy"; - Modelica.SIunits.SpecificEnthalpy hAirCod "Dry air enthalpy"; + Modelica.Units.SI.Temperature T "Temperature"; + Modelica.Units.SI.SpecificEnthalpy hLiqSym "Liquid phase enthalpy"; + Modelica.Units.SI.SpecificEnthalpy hLiqCod "Liquid phase enthalpy"; + Modelica.Units.SI.SpecificEnthalpy hSteSym "Water vapor enthalpy"; + Modelica.Units.SI.SpecificEnthalpy hSteCod "Water vapor enthalpy"; + Modelica.Units.SI.SpecificEnthalpy hAirSym "Dry air enthalpy"; + Modelica.Units.SI.SpecificEnthalpy hAirCod "Dry air enthalpy"; constant Real convT(unit="K/s3") = 270 "Conversion factor to satisfy unit check"; initial equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Specialized/Air/PerfectGas.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Specialized/Air/PerfectGas.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Specialized/Air/PerfectGas.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Specialized/Air/PerfectGas.mo" 2021-09-16 11:17:59.910310138 +0200 @@ -37,7 +37,7 @@ is no longer possible and non-linear algebraic equations occur. */ protected - constant Modelica.SIunits.MolarMass[2] MMX = {steam.MM,dryair.MM} + constant Modelica.Units.SI.MolarMass[2] MMX = {steam.MM,dryair.MM} "Molar masses of components"; MassFraction X_steam "Mass fraction of steam water"; @@ -57,11 +57,10 @@ h = (T - reference_T)*dryair.cp * (1 - Xi[Water]) + ((T-reference_T) * steam.cp + h_fg) * Xi[Water]; - - R = dryair.R*(1 - X_steam) + steam.R*X_steam; - // - u = h - R*T; - d = p/(R*T); + R_s = dryair.R * (1 - X_steam) + steam.R * X_steam; +// + u = h - R_s * T; + d = p / (R_s * T); /* Note, u and d are computed under the assumption that the volume of the liquid water is negligible with respect to the volume of air and of steam */ @@ -140,8 +139,8 @@ "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 "saturation temperature"; - output Modelica.SIunits.AbsolutePressure psat "saturation pressure"; + input Modelica.Units.SI.Temperature Tsat "saturation temperature"; + output Modelica.Units.SI.AbsolutePressure psat "saturation pressure"; // This function is declared here explicitly, instead of referencing the function in its // base class, since otherwise Dymola 7.3 does not find the derivative for the model // Buildings.Fluid.Sensors.Examples.MassFraction @@ -155,13 +154,14 @@ Saturation pressure of water above the triple point temperature is computed from temperature. It's range of validity is between 273.16 and 373.16 K. Outside these limits a less accurate result is returned. ")); + end saturationPressureLiquid; function saturationPressureLiquid_der "Time derivative of 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") "Saturation pressure"; @@ -176,6 +176,7 @@ Buildings.Media.Specialized.Air.PerfectGas.saturationPressureLiquid ")); + end saturationPressureLiquid_der; function sublimationPressureIce = @@ -425,11 +426,10 @@ redeclare function extends thermalConductivity "Thermal conductivity of dry air as a polynomial in the temperature" algorithm - lambda := Modelica.Media.Incompressible.TableBased.Polynomials_Temp.evaluate( - {(-4.8737307422969E-008), 7.67803133753502E-005, 0.0241814385504202}, - Modelica.SIunits.Conversions.to_degC(state.T)); + lambda := Modelica.Math.Polynomials.evaluate({-4.8737307422969E-008, 7.67803133753502E-005, 0.0241814385504202}, Modelica.Units.Conversions.to_degC(state.T)); annotation ( Inline=true); + end thermalConductivity; redeclare function extends specificEnthalpy "Specific enthalpy" @@ -441,13 +441,13 @@ redeclare replaceable function specificEnthalpy_pTX "Specific enthalpy" extends Modelica.Icons.Function; - input Modelica.SIunits.Pressure p "Pressure"; - input Modelica.SIunits.Temperature T "Temperature"; - input Modelica.SIunits.MassFraction X[:] "Mass fractions of moist air"; - output Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy at p, T, X"; + input Modelica.Units.SI.Pressure p "Pressure"; + input Modelica.Units.SI.Temperature T "Temperature"; + input Modelica.Units.SI.MassFraction X[:] "Mass fractions of moist air"; + output Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy at p, T, X"; protected - Modelica.SIunits.SpecificEnthalpy hDryAir "Enthalpy of dry air"; + Modelica.Units.SI.SpecificEnthalpy hDryAir "Enthalpy of dry air"; algorithm hDryAir := (T - reference_T)*dryair.cp; h := hDryAir * (1 - X[Water]) + @@ -455,6 +455,7 @@ annotation(smoothOrder=5, Inline=true, inverse(T=temperature_phX(p, h, X))); + end specificEnthalpy_pTX; redeclare function extends specificInternalEnergy "Specific internal energy" @@ -512,11 +513,11 @@ "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.SIunits.SpecificHeatCapacity cp + Modelica.Units.SI.MolarMass MM "Molar mass"; + Modelica.Units.SI.SpecificHeatCapacity R "Gas constant"; + Modelica.Units.SI.SpecificHeatCapacity cp "Specific heat capacity at constant pressure"; - Modelica.SIunits.SpecificHeatCapacity cv = cp-R + Modelica.Units.SI.SpecificHeatCapacity cv = cp-R "Specific heat capacity at constant volume"; annotation ( preferredView="info", @@ -558,27 +559,27 @@ // In the assignments below, we compute cv as OpenModelica // cannot evaluate cv=cp-R as defined in GasProperties. constant GasProperties dryair( - R = Modelica.Media.IdealGases.Common.SingleGasesData.Air.R, + R = Modelica.Media.IdealGases.Common.SingleGasesData.Air.R_s, MM = Modelica.Media.IdealGases.Common.SingleGasesData.Air.MM, cp = Buildings.Utilities.Psychrometrics.Constants.cpAir, cv = Buildings.Utilities.Psychrometrics.Constants.cpAir - -Modelica.Media.IdealGases.Common.SingleGasesData.Air.R) + - Modelica.Media.IdealGases.Common.SingleGasesData.Air.R_s) "Dry air properties"; 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, cp = Buildings.Utilities.Psychrometrics.Constants.cpSte, cv = Buildings.Utilities.Psychrometrics.Constants.cpSte - -Modelica.Media.IdealGases.Common.SingleGasesData.H2O.R) + - Modelica.Media.IdealGases.Common.SingleGasesData.H2O.R_s) "Steam properties"; constant Real k_mair = steam.MM/dryair.MM "Ratio of molar weights"; - constant Modelica.SIunits.SpecificEnergy h_fg= + constant Modelica.Units.SI.SpecificEnergy h_fg= Buildings.Utilities.Psychrometrics.Constants.h_fg "Latent heat of evaporation of water"; - constant Modelica.SIunits.SpecificHeatCapacity cpWatLiq= + constant Modelica.Units.SI.SpecificHeatCapacity cpWatLiq= Buildings.Utilities.Psychrometrics.Constants.cpWatLiq "Specific heat capacity of liquid water"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Specialized/Water/ConstantProperties_pT/package.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Specialized/Water/ConstantProperties_pT/package.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Specialized/Water/ConstantProperties_pT/package.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Specialized/Water/ConstantProperties_pT/package.mo" 2021-09-16 11:17:59.802310500 +0200 @@ -12,40 +12,40 @@ a_const=a_nominal, T_max=T_max_nominal); - constant Modelica.SIunits.Temperature T_max_nominal= + constant Modelica.Units.SI.Temperature T_max_nominal= Modelica.Media.Water.IF97_Utilities.BaseIF97.Basic.tsat(p_nominal) "Maximum temperature valid for medium model"; - constant Modelica.SIunits.Temperature T_nominal = 273.15 + 20 + constant Modelica.Units.SI.Temperature T_nominal = 273.15 + 20 "Nominal temperature for calculation of water properties"; - constant Modelica.SIunits.VelocityOfSound a_nominal= + constant Modelica.Units.SI.VelocityOfSound a_nominal= Modelica.Media.Water.IF97_Utilities.velocityOfSound_pT(p_nominal, T_nominal) "Constant velocity of sound"; - constant Modelica.SIunits.SpecificHeatCapacity cp_nominal= + constant Modelica.Units.SI.SpecificHeatCapacity cp_nominal= Modelica.Media.Water.IF97_Utilities.cp_pT(p_nominal, T_nominal) "Specific heat capacity at nominal water conditions"; - constant Modelica.SIunits.Density d_nominal= + constant Modelica.Units.SI.Density d_nominal= Modelica.Media.Water.IF97_Utilities.rho_pT(p_nominal, T_nominal) "Density at nominal water conditions"; - constant Modelica.SIunits.DynamicViscosity eta_nominal= + constant Modelica.Units.SI.DynamicViscosity eta_nominal= Modelica.Media.Water.IF97_Utilities.dynamicViscosity( d_nominal, T_nominal, p_nominal) "Constant dynamic viscosity"; - constant Modelica.SIunits.ThermalConductivity lambda_nominal= + constant Modelica.Units.SI.ThermalConductivity lambda_nominal= Modelica.Media.Water.IF97_Utilities.thermalConductivity( d_nominal, T_nominal, p_nominal) "Constant thermal conductivity"; - constant Modelica.SIunits.AbsolutePressure p_nominal = 101325 + constant Modelica.Units.SI.AbsolutePressure p_nominal = 101325 "Nominal pressure for calculation of water properties"; annotation (Documentation(info=" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Specialized/Water/Examples/TemperatureDependentDensityDerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Specialized/Water/Examples/TemperatureDependentDensityDerivativeCheck.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Specialized/Water/Examples/TemperatureDependentDensityDerivativeCheck.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Specialized/Water/Examples/TemperatureDependentDensityDerivativeCheck.mo" 2021-09-16 11:17:59.774310593 +0200 @@ -7,13 +7,13 @@ Buildings.Media.Specialized.Water.TemperatureDependentDensity "Medium model"; - Modelica.SIunits.Temperature T "Temperature"; - Modelica.SIunits.SpecificEnthalpy hLiqSym "Liquid phase enthalpy"; - Modelica.SIunits.SpecificEnthalpy hLiqCod "Liquid phase enthalpy"; - Modelica.SIunits.SpecificHeatCapacity cpSym "Specific heat capacity"; - Modelica.SIunits.SpecificHeatCapacity cpCod "Specific heat capacity"; - Modelica.SIunits.SpecificHeatCapacity cvSym "Specific heat capacity"; - Modelica.SIunits.SpecificHeatCapacity cvCod "Specific heat capacity"; + Modelica.Units.SI.Temperature T "Temperature"; + Modelica.Units.SI.SpecificEnthalpy hLiqSym "Liquid phase enthalpy"; + Modelica.Units.SI.SpecificEnthalpy hLiqCod "Liquid phase enthalpy"; + Modelica.Units.SI.SpecificHeatCapacity cpSym "Specific heat capacity"; + Modelica.Units.SI.SpecificHeatCapacity cpCod "Specific heat capacity"; + Modelica.Units.SI.SpecificHeatCapacity cvSym "Specific heat capacity"; + Modelica.Units.SI.SpecificHeatCapacity cvCod "Specific heat capacity"; constant Real convT(unit="K/s3") = 270 "Conversion factor to satisfy unit check"; initial equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Specialized/Water/TemperatureDependentDensity.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Specialized/Water/TemperatureDependentDensity.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Specialized/Water/TemperatureDependentDensity.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Specialized/Water/TemperatureDependentDensity.mo" 2021-09-16 11:17:59.734310727 +0200 @@ -26,7 +26,7 @@ AbsolutePressure p(start=p_default) "Pressure of medium"; end ThermodynamicState; - constant Modelica.SIunits.SpecificHeatCapacity cp_const = 4184 + constant Modelica.Units.SI.SpecificHeatCapacity cp_const = 4184 "Specific heat capacity at constant pressure"; redeclare model extends BaseProperties( @@ -37,7 +37,7 @@ d = density(state); state.T = T; state.p = p; - R=Modelica.Constants.R; + R_s =Modelica.Constants.R; MM=MM_const; annotation(Documentation(info="
@@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Water.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Water.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Water.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Media/Water.mo" 2021-09-16 11:17:59.678310915 +0200 @@ -20,14 +20,14 @@ InputMassFraction[nXi] Xi=fill(0, 0) "Structurally independent mass fractions"; InputSpecificEnthalpy h "Specific enthalpy of medium"; - Modelica.SIunits.SpecificInternalEnergy u + Modelica.Units.SI.SpecificInternalEnergy u "Specific internal energy of medium"; - Modelica.SIunits.Density d=d_const "Density of medium"; - Modelica.SIunits.MassFraction[nX] X={1} + Modelica.Units.SI.Density d=d_const "Density of medium"; + Modelica.Units.SI.MassFraction[nX] X={1} "Mass fractions (= (component mass)/total mass m_i/m)"; - final Modelica.SIunits.SpecificHeatCapacity R=0 + final Modelica.Units.SI.SpecificHeatCapacity R=0 "Gas constant (of mixture if applicable)"; - final Modelica.SIunits.MolarMass MM=MM_const + final Modelica.Units.SI.MolarMass MM=MM_const "Molar mass (of mixture or single fluid)"; ThermodynamicState state "Thermodynamic state record for optional functions"; @@ -36,21 +36,21 @@ annotation(Evaluate=true, Dialog(tab="Advanced")); final parameter Boolean standardOrderComponents=true "If true, and reducedX = true, the last element of X will be computed from the other ones"; - Modelica.SIunits.Conversions.NonSIunits.Temperature_degC T_degC= - Modelica.SIunits.Conversions.to_degC(T) + + Modelica.Units.NonSI.Temperature_degC T_degC= + Modelica.Units.Conversions.to_degC(T) "Temperature of medium in [degC]"; - Modelica.SIunits.Conversions.NonSIunits.Pressure_bar p_bar= - Modelica.SIunits.Conversions.to_bar(p) + Modelica.Units.NonSI.Pressure_bar p_bar= + Modelica.Units.Conversions.to_bar(p) "Absolute pressure of medium in [bar]"; // Local connector definition, used for equation balancing check - connector InputAbsolutePressure = input Modelica.SIunits.AbsolutePressure + connector InputAbsolutePressure = input Modelica.Units.SI.AbsolutePressure "Pressure as input signal connector"; - connector InputSpecificEnthalpy = input Modelica.SIunits.SpecificEnthalpy + connector InputSpecificEnthalpy = input Modelica.Units.SI.SpecificEnthalpy "Specific enthalpy as input signal connector"; - connector InputMassFraction = input Modelica.SIunits.MassFraction + connector InputMassFraction = input Modelica.Units.SI.MassFraction "Mass fraction as input signal connector"; - equation assert(T >= T_min, " In " + getInstanceName() + ": Temperature T = " + String(T) + " K exceeded its minimum allowed value of " + @@ -80,8 +80,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 ( @@ -102,6 +102,7 @@ ")); + end enthalpyOfLiquid; annotation(preferredView="info", Documentation(info="
diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Obsolete/Controls/OBC/CDL/Discrete/MovingMean.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Obsolete/Controls/OBC/CDL/Discrete/MovingMean.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Obsolete/Controls/OBC/CDL/Discrete/MovingMean.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Obsolete/Controls/OBC/CDL/Discrete/MovingMean.mo" 2021-09-16 11:17:59.582311237 +0200 @@ -4,7 +4,7 @@ parameter Integer n(min=2) "Number of samples over which the input is averaged"; - parameter Modelica.SIunits.Time samplePeriod(min=1E-3) + parameter Modelica.Units.SI.Time samplePeriod(min=1E-3) "Sampling period of component"; Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Continuous input signal" @@ -13,7 +13,7 @@ annotation (Placement(transformation(extent={{100,-20},{140,20}}))); protected - parameter Modelica.SIunits.Time t0(fixed=false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(fixed=false) "First sample time instant"; Boolean sampleTrigger "Trigger samples at each sampling instant"; Integer iSample(start=0, fixed=true) "Sample numbering in the simulation"; Integer counter(start=0, fixed=true) diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Obsolete/Utilities/IO/Python27/Examples/KalmanFilter.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Obsolete/Utilities/IO/Python27/Examples/KalmanFilter.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Obsolete/Utilities/IO/Python27/Examples/KalmanFilter.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Obsolete/Utilities/IO/Python27/Examples/KalmanFilter.mo" 2021-09-16 11:17:59.278312255 +0200 @@ -9,7 +9,7 @@ moduleName="KalmanFilter", samplePeriod=samplePeriod) "Generate a random number in Python" annotation (Placement(transformation(extent={{-40,0},{-20,20}}))); - Modelica.Blocks.Sources.Clock clock + Modelica.Blocks.Sources.ContinuousClock clock annotation (Placement(transformation(extent={{-80,0},{-60,20}}))); Real_Real kalFil( moduleName="KalmanFilter", @@ -19,9 +19,9 @@ samplePeriod=samplePeriod) "Kalman filter in Python" annotation (Placement(transformation(extent={{60,20},{80,40}}))); - parameter Modelica.SIunits.Time samplePeriod=0.001 + parameter Modelica.Units.SI.Time samplePeriod=0.001 "Sample period of component"; - Modelica.Blocks.Sources.Sine sine(freqHz=1) "Sine wave" + Modelica.Blocks.Sources.Sine sine(f =1) "Sine wave" annotation (Placement(transformation(extent={{-40,40},{-20,60}}))); Modelica.Blocks.Math.Add add annotation (Placement(transformation(extent={{20,20},{40,40}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Obsolete/Utilities/IO/Python27/Examples/SimpleRoom.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Obsolete/Utilities/IO/Python27/Examples/SimpleRoom.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Obsolete/Utilities/IO/Python27/Examples/SimpleRoom.mo" 2021-09-16 11:15:38.470780355 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Obsolete/Utilities/IO/Python27/Examples/SimpleRoom.mo" 2021-09-16 11:17:59.254312335 +0200 @@ -2,7 +2,7 @@ model SimpleRoom "Simple room model implemented in Python that outputs the temperature and the energy" extends Modelica.Icons.Example; - Modelica.Blocks.Sources.Clock clock + Modelica.Blocks.Sources.ContinuousClock clock annotation (Placement(transformation(extent={{-80,-10},{-60,10}}))); Real_Real pyt( @@ -28,7 +28,7 @@ amplitude=5, offset=283.15, y(unit="K", displayUnit="degC"), - freqHz=1/86400, +f =1/86400, phase=-1.5707963267949) "Ambient temperature" annotation (Placement(transformation(extent={{-80,30},{-60,50}}))); equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/BinaryVariableGeneration.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/BinaryVariableGeneration.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/BinaryVariableGeneration.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/BinaryVariableGeneration.mo" 2021-09-16 11:17:59.070312952 +0200 @@ -6,7 +6,7 @@ Real p "Time-varying real number as input"; output Real y "Output"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/ExponentialVariableGeneration.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/ExponentialVariableGeneration.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/ExponentialVariableGeneration.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/ExponentialVariableGeneration.mo" 2021-09-16 11:17:59.058312992 +0200 @@ -6,7 +6,7 @@ Real mu "Time-varying real number as input"; output Real y "Output"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/Linear1D.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/Linear1D.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/Linear1D.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/Linear1D.mo" 2021-09-16 11:17:59.050313018 +0200 @@ -8,7 +8,7 @@ Real x "Time-varying real number as input"; output Real y "Output"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/Logit1D.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/Logit1D.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/Logit1D.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/Logit1D.mo" 2021-09-16 11:17:59.038313059 +0200 @@ -8,7 +8,7 @@ Real x "Time-varying real number as input"; output Real y "Output"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/Logit1DQuadratic.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/Logit1DQuadratic.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/Logit1DQuadratic.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/Logit1DQuadratic.mo" 2021-09-16 11:17:59.026313099 +0200 @@ -10,7 +10,7 @@ Real x "Time-varying real number as input"; output Real y "Output"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/Logit2D.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/Logit2D.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/Logit2D.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/Logit2D.mo" 2021-09-16 11:17:59.018313125 +0200 @@ -10,7 +10,7 @@ Real x2 "Time-varying real number as input"; output Real y "Output"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/Weibull1DOFF.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/Weibull1DOFF.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/Weibull1DOFF.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/Weibull1DOFF.mo" 2021-09-16 11:17:59.006313166 +0200 @@ -11,7 +11,7 @@ Real x "Time-varying real number as input"; output Real y "Output"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/Weibull1DON.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/Weibull1DON.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/Weibull1DON.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/Weibull1DON.mo" 2021-09-16 11:17:58.994313206 +0200 @@ -11,7 +11,7 @@ Real x "Time-varying real number as input"; output Real y "Output"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/WeibullVariableGeneration.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/WeibullVariableGeneration.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/WeibullVariableGeneration.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/BaseClasses/Validation/WeibullVariableGeneration.mo" 2021-09-16 11:17:58.982313247 +0200 @@ -9,7 +9,7 @@ output Real y "Output"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Haldi2008BlindsTIn.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Haldi2008BlindsTIn.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Haldi2008BlindsTIn.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Haldi2008BlindsTIn.mo" 2021-09-16 11:17:58.726314104 +0200 @@ -5,7 +5,7 @@ parameter Real A(final unit="1/K") = 0.425 "Slope of indoor temperature"; parameter Real B(final unit="1") = -11.37 "Intercept"; parameter Integer seed = 20 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TIn( final unit="K", @@ -27,7 +27,7 @@ final max=1) "The probability of lowering the blinds"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Haldi2008BlindsTOut.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Haldi2008BlindsTOut.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Haldi2008BlindsTOut.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Haldi2008BlindsTOut.mo" 2021-09-16 11:17:58.710314158 +0200 @@ -5,7 +5,7 @@ parameter Real A(final unit="1/K") = 0.139 "Slope of outdoor temperature"; parameter Real B(final unit="1") = -3.54 "Intercept"; parameter Integer seed = 20 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -27,7 +27,7 @@ final max=1) "The probability of lowering the blinds"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Inkarojrit2008BlindsSolarIntensity.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Inkarojrit2008BlindsSolarIntensity.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Inkarojrit2008BlindsSolarIntensity.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Inkarojrit2008BlindsSolarIntensity.mo" 2021-09-16 11:17:58.690314225 +0200 @@ -9,7 +9,7 @@ seven-point scale, 1 for least sensitive, 7 for most sensitive" annotation(Dialog(tab = "Advanced")); parameter Integer seed = 10 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput H(unit="W/m2") "Solar intensity" annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}), @@ -30,7 +30,7 @@ final max=1) "The probability of keeping the blinds on"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Newsham1994BlindsSolarIntensity.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Newsham1994BlindsSolarIntensity.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Newsham1994BlindsSolarIntensity.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Newsham1994BlindsSolarIntensity.mo" 2021-09-16 11:17:58.666314305 +0200 @@ -3,7 +3,7 @@ "A model to predict occupants' blinds behavior with solar intensity" extends Modelica.Blocks.Icons.DiscreteBlock; parameter Real HSet = 233 "Threshold for moving blinds up or down"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput H(unit="W/m2") "Solar intensity at the room-side of the window" annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}), @@ -19,7 +19,7 @@ annotation (Placement(transformation(extent={{100,-10},{120,10}}))); protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; initial equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Validation/Haldi2008BlindsTIn.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Validation/Haldi2008BlindsTIn.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Validation/Haldi2008BlindsTIn.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Validation/Haldi2008BlindsTIn.mo" 2021-09-16 11:17:58.638314398 +0200 @@ -9,7 +9,7 @@ Modelica.Blocks.Sources.Sine TIn( amplitude=15, offset=293, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Indoor temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Validation/Haldi2008BlindsTOut.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Validation/Haldi2008BlindsTOut.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Validation/Haldi2008BlindsTOut.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Validation/Haldi2008BlindsTOut.mo" 2021-09-16 11:17:58.618314465 +0200 @@ -9,7 +9,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=293, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Validation/Inkarojrit2008BlindsSolarIntensity.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Validation/Inkarojrit2008BlindsSolarIntensity.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Validation/Inkarojrit2008BlindsSolarIntensity.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Validation/Inkarojrit2008BlindsSolarIntensity.mo" 2021-09-16 11:17:58.602314519 +0200 @@ -9,7 +9,7 @@ Modelica.Blocks.Sources.Sine H( amplitude=250, offset=300, - freqHz=0.001, +f =0.001, y(unit="W/m2")) "Solar intensity at the window" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); Buildings.Occupants.Office.Blinds.Inkarojrit2008BlindsSolarIntensity bli(LSen= 1) diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Validation/Newsham1994BlindsSolarIntensity.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Validation/Newsham1994BlindsSolarIntensity.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Validation/Newsham1994BlindsSolarIntensity.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Validation/Newsham1994BlindsSolarIntensity.mo" 2021-09-16 11:17:58.586314572 +0200 @@ -9,7 +9,7 @@ Modelica.Blocks.Sources.Sine H( amplitude=250, offset=300, - freqHz=0.001, +f =0.001, y(unit="W/m2")) "Solar intensity at the window" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); Buildings.Occupants.Office.Blinds.Newsham1994BlindsSolarIntensity bli "Tested blinds model" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Validation/Zhang2012BlindsSolarAltitude.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Validation/Zhang2012BlindsSolarAltitude.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Validation/Zhang2012BlindsSolarAltitude.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Validation/Zhang2012BlindsSolarAltitude.mo" 2021-09-16 11:17:58.570314626 +0200 @@ -9,7 +9,7 @@ Modelica.Blocks.Sources.Sine SA( amplitude=30*3.14159/180, offset=35*3.14159/180, - freqHz=0.001, +f =0.001, y(unit="1")) "Solar altitude" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); Buildings.Occupants.Office.Blinds.Zhang2012BlindsSolarAltitude bli "Tested blinds model" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Validation/Zhang2012BlindsSolarIntensity.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Validation/Zhang2012BlindsSolarIntensity.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Validation/Zhang2012BlindsSolarIntensity.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Validation/Zhang2012BlindsSolarIntensity.mo" 2021-09-16 11:17:58.554314680 +0200 @@ -9,7 +9,7 @@ Modelica.Blocks.Sources.Sine H( amplitude=250, offset=300, - freqHz=0.001, +f =0.001, y(unit="W/m2")) "Solar intensity at the window" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); Buildings.Occupants.Office.Blinds.Zhang2012BlindsSolarIntensity bli "Tested blinds model" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Zhang2012BlindsSolarAltitude.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Zhang2012BlindsSolarAltitude.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Zhang2012BlindsSolarAltitude.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Zhang2012BlindsSolarAltitude.mo" 2021-09-16 11:17:58.538314734 +0200 @@ -7,7 +7,7 @@ parameter Real BUp = -3.446 "Intercept for blinds up"; parameter Real BDown = -3.424 "Intercept for blinds down"; parameter Integer seed = 10 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput solarAltitude( unit="rad") "Solar Altitude" annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}), @@ -32,7 +32,7 @@ final max=1) "The probability of blinds down"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Boolean isOpen "Blind state as a boolean"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Zhang2012BlindsSolarIntensity.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Zhang2012BlindsSolarIntensity.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Zhang2012BlindsSolarIntensity.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Blinds/Zhang2012BlindsSolarIntensity.mo" 2021-09-16 11:17:58.518314801 +0200 @@ -7,7 +7,7 @@ parameter Real BUp = -3.33 "Intercept for blinds up"; parameter Real BDown = -3.17 "Intercept for blinds down"; parameter Integer seed = 10 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput H( unit="W/m2") "Solar intensity" annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}), @@ -32,7 +32,7 @@ final max=1) "The probability of blinds down"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Boolean isOpen "Blind state as a boolean"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Gunay2016Light.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Gunay2016Light.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Gunay2016Light.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Gunay2016Light.mo" 2021-09-16 11:17:58.486314908 +0200 @@ -6,7 +6,7 @@ parameter Real AInter = -0.002 "Slope of logistic regression intermediate"; parameter Real BInter = -3.9 "Intercept of logistic regression intermediate"; parameter Integer seed = 30 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput ill "Illuminance on the working planein units of lux" annotation ( @@ -28,7 +28,7 @@ final max=1) "Intermediate robability of switch on the lighting"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Hunt1979Light.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Hunt1979Light.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Hunt1979Light.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Hunt1979Light.mo" 2021-09-16 11:17:58.470314961 +0200 @@ -6,7 +6,7 @@ parameter Real CArriv = 1.0361 "Upon arrival"; parameter Real MArriv = 1.8223 "Upon arrival"; parameter Integer seed = 30 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput ill "Illuminance on the working planein units of lux" annotation ( Placement(transformation(extent={{-140,-80},{-100,-40}}), @@ -23,7 +23,7 @@ max=1) "Probability of switch on the lighting upon arrival"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Love1998Light1.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Love1998Light1.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Love1998Light1.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Love1998Light1.mo" 2021-09-16 11:17:58.454315015 +0200 @@ -4,7 +4,7 @@ parameter Real B = 5.85 "Intercept for logistic regression"; parameter Real M = -11.9 "Slope for logistic regression"; parameter Integer seed = 30 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput ill "Daylight illuminance level on the deskin units of lux" annotation ( Placement(transformation(extent={{-140,-80},{-100,-40}}), @@ -21,7 +21,7 @@ final max=1) "Probability of switch on the lighting"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Love1998Light2.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Love1998Light2.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Love1998Light2.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Love1998Light2.mo" 2021-09-16 11:17:58.438315068 +0200 @@ -4,7 +4,7 @@ parameter Real B = 7.19 "Intercept for logistic regression"; parameter Real M = -17.06 "Slope for logistic regression"; parameter Integer seed = 30 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput ill "Daylight illuminance level on the deskin units of lux" annotation ( Placement(transformation(extent={{-140,-80},{-100,-40}}), @@ -21,7 +21,7 @@ final max=1) "Probability of switch on the lighting"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Reinhart2003Light.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Reinhart2003Light.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Reinhart2003Light.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Reinhart2003Light.mo" 2021-09-16 11:17:58.422315122 +0200 @@ -10,7 +10,7 @@ parameter Real CInter = 0.017 "intermediate"; parameter Real MInter = 2.41 "intermediate"; parameter Integer seed = 30 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput ill "Illuminance on the working planein units of lux" annotation ( Placement(transformation(extent={{-140,-80},{-100,-40}}), @@ -31,7 +31,7 @@ final max=1) "Intermediate robability of switch on the lighting"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Validation/Gunay2016Light.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Validation/Gunay2016Light.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Validation/Gunay2016Light.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Validation/Gunay2016Light.mo" 2021-09-16 11:17:58.394315216 +0200 @@ -5,7 +5,7 @@ Modelica.Blocks.Sources.Sine ill( amplitude=200, offset=250, - freqHz=0.001) "Illuminance at working planein units of lux" +f =0.001) "Illuminance at working planein units of lux" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); Buildings.Occupants.Office.Lighting.Gunay2016Light lig "Tested lighting model" annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Validation/Hunt1979Light.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Validation/Hunt1979Light.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Validation/Hunt1979Light.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Validation/Hunt1979Light.mo" 2021-09-16 11:17:58.382315256 +0200 @@ -5,7 +5,7 @@ Modelica.Blocks.Sources.Sine ill( amplitude=200, offset=250, - freqHz=0.001) "Minimum illuminance at working plane" +f =0.001) "Minimum illuminance at working plane" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); Buildings.Occupants.Office.Lighting.Hunt1979Light lig "Tested lighting model" annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Validation/Love1998Light1.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Validation/Love1998Light1.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Validation/Love1998Light1.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Validation/Love1998Light1.mo" 2021-09-16 11:17:58.370315296 +0200 @@ -4,7 +4,7 @@ Modelica.Blocks.Sources.Sine ill( offset=250, - freqHz=0.001, +f =0.001, amplitude=200) "Daylight illuminance level on the deskin units of lux" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Validation/Love1998Light2.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Validation/Love1998Light2.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Validation/Love1998Light2.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Validation/Love1998Light2.mo" 2021-09-16 11:17:58.354315350 +0200 @@ -5,7 +5,7 @@ Modelica.Blocks.Sources.Sine ill( amplitude=200, offset=250, - freqHz=0.001) "Daylight illuminance level on the deskin units of lux" +f =0.001) "Daylight illuminance level on the deskin units of lux" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); Buildings.Occupants.Office.Lighting.Love1998Light2 lig "Tested lighting model" annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Validation/Reinhart2003Light.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Validation/Reinhart2003Light.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Validation/Reinhart2003Light.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Lighting/Validation/Reinhart2003Light.mo" 2021-09-16 11:17:58.342315391 +0200 @@ -5,7 +5,7 @@ Modelica.Blocks.Sources.Sine ill( amplitude=200, offset=250, - freqHz=0.001) "Minimum illuminance at working plane" +f =0.001) "Minimum illuminance at working plane" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); Buildings.Occupants.Office.Lighting.Reinhart2003Light lig "Tested lighting model" annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Occupancy/Wang2005Occupancy.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Occupancy/Wang2005Occupancy.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Occupancy/Wang2005Occupancy.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Occupancy/Wang2005Occupancy.mo" 2021-09-16 11:17:58.302315524 +0200 @@ -3,8 +3,8 @@ "A model to predict Occupancy of a single person office" extends Modelica.Blocks.Icons.DiscreteBlock; - parameter Modelica.SIunits.Time one_mu(displayUnit="min") = 4368 "Mean occupancy duration"; - parameter Modelica.SIunits.Time zero_mu(displayUnit="min") = 2556 "Mean vacancy duration"; + parameter Modelica.Units.SI.Time one_mu(displayUnit="min") = 4368 "Mean occupancy duration"; + parameter Modelica.Units.SI.Time zero_mu(displayUnit="min") = 2556 "Mean vacancy duration"; parameter Integer seed = 10 "Seed for the random number generator"; Modelica.Blocks.Interfaces.BooleanOutput occ(start=true, fixed=true) diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Haldi2008WindowsTIn.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Haldi2008WindowsTIn.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Haldi2008WindowsTIn.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Haldi2008WindowsTIn.mo" 2021-09-16 11:17:58.278315605 +0200 @@ -4,7 +4,7 @@ parameter Real A = 0.22 "Slope of the logistic relation"; parameter Real B = -5.64 "Intercept of the logistic relation"; parameter Integer seed = 30 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TIn( final unit="K", @@ -22,7 +22,7 @@ max=1) "Probability of window opened"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Haldi2008WindowsTOut.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Haldi2008WindowsTOut.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Haldi2008WindowsTOut.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Haldi2008WindowsTOut.mo" 2021-09-16 11:17:58.258315671 +0200 @@ -4,7 +4,7 @@ parameter Real A = 0.049 "Slope of the logistic relation"; parameter Real B = -1.12 "Intercept of the logistic relation"; parameter Integer seed = 30 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -22,7 +22,7 @@ max=1) "Probability of window opened"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Haldi2009WindowsTInTout.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Haldi2009WindowsTInTout.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Haldi2009WindowsTInTout.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Haldi2009WindowsTInTout.mo" 2021-09-16 11:17:58.106316181 +0200 @@ -8,7 +8,7 @@ parameter Real ACloseOut = -0.065 "Slope of outdoor temp of the logistic relation for the closing probability"; parameter Real BClose = -4.14 "Intercept of the logistic relation for the closing probability"; parameter Integer seed = 10 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TIn( final unit="K", @@ -35,7 +35,7 @@ max=1) "Probability of closing windows"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Herkel2008WindowsCompletelyOpen.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Herkel2008WindowsCompletelyOpen.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Herkel2008WindowsCompletelyOpen.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Herkel2008WindowsCompletelyOpen.mo" 2021-09-16 11:17:58.082316261 +0200 @@ -5,7 +5,7 @@ parameter Real A = 0.08 "Slope of the logistic relation"; parameter Real B = -4.05 "Intercept of the logistic relation"; parameter Integer seed = 3 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -23,7 +23,7 @@ max=1) "Probability of window opened"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Herkel2008WindowsSmall.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Herkel2008WindowsSmall.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Herkel2008WindowsSmall.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Herkel2008WindowsSmall.mo" 2021-09-16 11:17:58.062316328 +0200 @@ -4,7 +4,7 @@ parameter Real A = 0.16 "Slope of the logistic relation"; parameter Real B = -2.99 "Intercept of the logistic relation"; parameter Integer seed = 30 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -22,7 +22,7 @@ max=1) "Probability of window opened"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Herkel2008WindowsTiltedOpen.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Herkel2008WindowsTiltedOpen.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Herkel2008WindowsTiltedOpen.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Herkel2008WindowsTiltedOpen.mo" 2021-09-16 11:17:58.030316435 +0200 @@ -5,7 +5,7 @@ parameter Real A = 0.08 "Slope of the logistic relation"; parameter Real B = -3.13 "Intercept of the logistic relation"; parameter Integer seed = 30 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -23,7 +23,7 @@ max=1) "Probability of window opened"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Rijal2007WindowsTInTOutTComf.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Rijal2007WindowsTInTOutTComf.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Rijal2007WindowsTInTOutTComf.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Rijal2007WindowsTInTOutTComf.mo" 2021-09-16 11:17:58.006316515 +0200 @@ -5,7 +5,7 @@ parameter Real AOut = 0.166 "Slope of the outdoor temperature in the logistic relation"; parameter Real B = -6.4 "Intercept of the logistic relation"; parameter Integer seed = 3 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TIn( final unit="K", @@ -34,7 +34,7 @@ max=1) "Probability of window opened"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Haldi2008WindowsTIn.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Haldi2008WindowsTIn.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Haldi2008WindowsTIn.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Haldi2008WindowsTIn.mo" 2021-09-16 11:17:57.966316649 +0200 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TIn( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Indoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Haldi2008WindowsTOut.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Haldi2008WindowsTOut.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Haldi2008WindowsTOut.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Haldi2008WindowsTOut.mo" 2021-09-16 11:17:57.934316756 +0200 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Haldi2009WindowsTInTout.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Haldi2009WindowsTInTout.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Haldi2009WindowsTInTout.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Haldi2009WindowsTInTout.mo" 2021-09-16 11:17:57.914316824 +0200 @@ -7,13 +7,13 @@ annotation (Placement(transformation(extent={{-80,50},{-60,70}}))); Modelica.Blocks.Sources.Sine TIn( amplitude=10, - freqHz=0.0007, +f =0.0007, y(unit="K", displayUnit="degC"), offset=298) "Indoor air temperature" annotation (Placement(transformation(extent={{-80,0},{-60,20}}))); Modelica.Blocks.Sources.Sine TOut( - freqHz=0.001, + f =0.001, y(unit="K", displayUnit="degC"), offset=298, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Herkel2008WindowsCompletelyOpen.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Herkel2008WindowsCompletelyOpen.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Herkel2008WindowsCompletelyOpen.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Herkel2008WindowsCompletelyOpen.mo" 2021-09-16 11:17:57.898316878 +0200 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Herkel2008WindowsSmall.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Herkel2008WindowsSmall.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Herkel2008WindowsSmall.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Herkel2008WindowsSmall.mo" 2021-09-16 11:17:57.882316931 +0200 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Herkel2008WindowsTiltedOpen.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Herkel2008WindowsTiltedOpen.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Herkel2008WindowsTiltedOpen.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Herkel2008WindowsTiltedOpen.mo" 2021-09-16 11:17:57.870316971 +0200 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Rijal2007WindowsTInTOutTComf.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Rijal2007WindowsTInTOutTComf.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Rijal2007WindowsTInTOutTComf.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Rijal2007WindowsTInTOutTComf.mo" 2021-09-16 11:17:57.858317011 +0200 @@ -7,13 +7,13 @@ annotation (Placement(transformation(extent={{-80,30},{-60,50}}))); Modelica.Blocks.Sources.Sine TIn( amplitude=10, - freqHz=0.0007, +f =0.0007, y(unit="K", displayUnit="degC"), offset=298) "Indoor air temperature" annotation (Placement(transformation(extent={{-80,0},{-60,20}}))); Modelica.Blocks.Sources.Sine TOut( - freqHz=0.001, + f =0.001, y(unit="K", displayUnit="degC"), offset=298, @@ -22,7 +22,7 @@ Modelica.Blocks.Sources.Sine TComf( amplitude=2, offset=298, - freqHz=0.0005, +f =0.0005, y(unit="K", displayUnit="degC")) "Comfort air temperature" annotation (Placement(transformation(extent={{-80,-70},{-60,-50}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Yun2008WindowsTIn.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Yun2008WindowsTIn.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Yun2008WindowsTIn.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Yun2008WindowsTIn.mo" 2021-09-16 11:17:57.834317092 +0200 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TIn( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Indoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Yun2008WindowsTOut.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Yun2008WindowsTOut.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Yun2008WindowsTOut.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Yun2008WindowsTOut.mo" 2021-09-16 11:17:57.822317132 +0200 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Zhang2012WindowsAll.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Zhang2012WindowsAll.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Zhang2012WindowsAll.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Zhang2012WindowsAll.mo" 2021-09-16 11:17:57.806317185 +0200 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Zhang2012WindowsEast.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Zhang2012WindowsEast.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Zhang2012WindowsEast.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Zhang2012WindowsEast.mo" 2021-09-16 11:17:57.794317225 +0200 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Zhang2012WindowsNorth.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Zhang2012WindowsNorth.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Zhang2012WindowsNorth.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Zhang2012WindowsNorth.mo" 2021-09-16 11:17:57.782317266 +0200 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Zhang2012WindowsSouth.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Zhang2012WindowsSouth.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Zhang2012WindowsSouth.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Zhang2012WindowsSouth.mo" 2021-09-16 11:17:57.766317319 +0200 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Zhang2012WindowsWest.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Zhang2012WindowsWest.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Zhang2012WindowsWest.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Validation/Zhang2012WindowsWest.mo" 2021-09-16 11:17:57.754317359 +0200 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Yun2008WindowsTIn.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Yun2008WindowsTIn.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Yun2008WindowsTIn.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Yun2008WindowsTIn.mo" 2021-09-16 11:17:57.742317399 +0200 @@ -6,7 +6,7 @@ parameter Real AClose = -0.007 "Slope of the logistic relation for closing the window"; parameter Real BClose = -0.209 "Intercept of the logistic relation for closing the window"; parameter Integer seed = 30 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TIn( final unit="K", @@ -28,7 +28,7 @@ max=1) "Probability of closing the window"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Yun2008WindowsTOut.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Yun2008WindowsTOut.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Yun2008WindowsTOut.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Yun2008WindowsTOut.mo" 2021-09-16 11:17:57.722317467 +0200 @@ -6,7 +6,7 @@ parameter Real AClose = 0 "Slope of the logistic relation for closing the window"; parameter Real BClose = -0.040 "Intercept of the logistic relation for closing the window"; parameter Integer seed = 30 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -28,7 +28,7 @@ max=1) "Probability of closing the window"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Zhang2012WindowsAll.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Zhang2012WindowsAll.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Zhang2012WindowsAll.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Zhang2012WindowsAll.mo" 2021-09-16 11:17:57.702317534 +0200 @@ -4,7 +4,7 @@ parameter Real A = 0.10 "Slope of the logistic relation"; parameter Real B = -4.01 "Intercept of the logistic relation"; parameter Integer seed = 30 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -22,7 +22,7 @@ max=1) "Probability of window opened"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Zhang2012WindowsEast.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Zhang2012WindowsEast.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Zhang2012WindowsEast.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Zhang2012WindowsEast.mo" 2021-09-16 11:17:57.682317601 +0200 @@ -4,7 +4,7 @@ parameter Real A = 0.09 "Slope of the logistic relation"; parameter Real B = -3.72 "Intercept of the logistic relation"; parameter Integer seed = 50 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -22,7 +22,7 @@ max=1) "Probability of window opened"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Zhang2012WindowsNorth.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Zhang2012WindowsNorth.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Zhang2012WindowsNorth.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Zhang2012WindowsNorth.mo" 2021-09-16 11:17:57.666317654 +0200 @@ -4,7 +4,7 @@ parameter Real A = 0.12 "Slope of the logistic relation"; parameter Real B = -4.38 "Intercept of the logistic relation"; parameter Integer seed = 30 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -22,7 +22,7 @@ max=1) "Probability of window opened"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Zhang2012WindowsSouth.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Zhang2012WindowsSouth.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Zhang2012WindowsSouth.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Zhang2012WindowsSouth.mo" 2021-09-16 11:17:57.642317735 +0200 @@ -4,7 +4,7 @@ parameter Real A = 0.10 "Slope of the logistic relation"; parameter Real B = -3.64 "Intercept of the logistic relation"; parameter Integer seed = 30 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -22,7 +22,7 @@ max=1) "Probability of window opened"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Zhang2012WindowsWest.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Zhang2012WindowsWest.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Zhang2012WindowsWest.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Office/Windows/Zhang2012WindowsWest.mo" 2021-09-16 11:17:57.626317788 +0200 @@ -4,7 +4,7 @@ parameter Real A = 0.12 "Slope of the logistic relation"; parameter Real B = -4.77 "Intercept of the logistic relation"; parameter Integer seed = 50 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -22,7 +22,7 @@ max=1) "Probability of window opened"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/AirConditioning/Ren2014ACBedroom.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/AirConditioning/Ren2014ACBedroom.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/AirConditioning/Ren2014ACBedroom.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/AirConditioning/Ren2014ACBedroom.mo" 2021-09-16 11:17:57.586317922 +0200 @@ -8,7 +8,7 @@ parameter Real L2 = 42.86 "Normalization factor for turning on the AC of the Weibull Distribution"; parameter Real k1 = 1.73 "Shape factor for turning off the AC of the Weibull Distribution"; parameter Real k2 = 1.80 "Shape factor for turning on the AC of the Weibull Distribution"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; parameter Integer seed = 10 "Seed for random number generator"; Modelica.Blocks.Interfaces.RealInput TIn( @@ -33,7 +33,7 @@ final max=1) "Probability of turning off the AC"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/AirConditioning/Ren2014ACLivingroom.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/AirConditioning/Ren2014ACLivingroom.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/AirConditioning/Ren2014ACLivingroom.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/AirConditioning/Ren2014ACLivingroom.mo" 2021-09-16 11:17:57.566317989 +0200 @@ -8,7 +8,7 @@ parameter Real L2 = 15.87 "Normalization factor for turning on the AC of the Weibull Distribution"; parameter Real k1 = 1.30 "Shape factor for turning off the AC of the Weibull Distribution"; parameter Real k2 = 2.22 "Shape factor for turning on the AC of the Weibull Distribution"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; parameter Integer seed = 10 "Seed for random number generator"; Modelica.Blocks.Interfaces.RealInput TIn( @@ -32,7 +32,7 @@ max=1) "Probability of turning off the AC"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/AirConditioning/Validation/Ren2014ACBedroom.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/AirConditioning/Validation/Ren2014ACBedroom.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/AirConditioning/Validation/Ren2014ACBedroom.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/AirConditioning/Validation/Ren2014ACBedroom.mo" 2021-09-16 11:17:57.538318083 +0200 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine Tin( amplitude=10, offset=303, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Indoor air temperature" annotation (Placement(transformation(extent={{-80,-26},{-60,-6}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/AirConditioning/Validation/Ren2014ACLivingroom.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/AirConditioning/Validation/Ren2014ACLivingroom.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/AirConditioning/Validation/Ren2014ACLivingroom.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/AirConditioning/Validation/Ren2014ACLivingroom.mo" 2021-09-16 11:17:57.386318592 +0200 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine Tin( amplitude=10, offset=303, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Indoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Heating/Nicol2001HeatingEU.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Heating/Nicol2001HeatingEU.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Heating/Nicol2001HeatingEU.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Heating/Nicol2001HeatingEU.mo" 2021-09-16 11:17:57.366318659 +0200 @@ -4,7 +4,7 @@ parameter Real A(final unit="1/K") = -0.32 "Slope of the logistic relation"; parameter Real B(final unit="1") = 2.72 "Intercept of the logistic relation"; parameter Integer seed = 10 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -22,7 +22,7 @@ final max=1) "Probability of heating being on"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Heating/Nicol2001HeatingPakistan.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Heating/Nicol2001HeatingPakistan.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Heating/Nicol2001HeatingPakistan.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Heating/Nicol2001HeatingPakistan.mo" 2021-09-16 11:17:57.354318699 +0200 @@ -4,7 +4,7 @@ parameter Real A(final unit="1/K") = -0.345 "Slope of the logistic relation"; parameter Real B(final unit="1") = 2.73 "Intercept of the logistic relation"; parameter Integer seed = 10 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -23,7 +23,7 @@ final max=1) "Probability of heating being on"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Heating/Nicol2001HeatingUK.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Heating/Nicol2001HeatingUK.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Heating/Nicol2001HeatingUK.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Heating/Nicol2001HeatingUK.mo" 2021-09-16 11:17:57.334318766 +0200 @@ -4,7 +4,7 @@ parameter Real A(final unit="1/K") = -0.514 "Slope of the logistic relation"; parameter Real B(final unit="1") = 5.28 "Intercept of the logistic relation"; parameter Integer seed = 10 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -23,7 +23,7 @@ final max=1) "Probability of heating being on"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Heating/Validation/Nicol2001HeatingEU.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Heating/Validation/Nicol2001HeatingEU.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Heating/Validation/Nicol2001HeatingEU.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Heating/Validation/Nicol2001HeatingEU.mo" 2021-09-16 11:17:57.306318860 +0200 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Heating/Validation/Nicol2001HeatingPakistan.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Heating/Validation/Nicol2001HeatingPakistan.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Heating/Validation/Nicol2001HeatingPakistan.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Heating/Validation/Nicol2001HeatingPakistan.mo" 2021-09-16 11:17:57.290318914 +0200 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Heating/Validation/Nicol2001HeatingUK.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Heating/Validation/Nicol2001HeatingUK.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Heating/Validation/Nicol2001HeatingUK.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Heating/Validation/Nicol2001HeatingUK.mo" 2021-09-16 11:17:57.274318967 +0200 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Windows/Nicol2001WindowsEU.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Windows/Nicol2001WindowsEU.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Windows/Nicol2001WindowsEU.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Windows/Nicol2001WindowsEU.mo" 2021-09-16 11:17:57.254319034 +0200 @@ -4,7 +4,7 @@ parameter Real A(final unit="1/K") = 0.104 "Slope of the logistic relation"; parameter Real B(final unit="1") = -2.31 "Intercept of the logistic relation"; parameter Integer seed = 30 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -22,7 +22,7 @@ max=1) "Probability of window opened"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Windows/Nicol2001WindowsPakistan.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Windows/Nicol2001WindowsPakistan.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Windows/Nicol2001WindowsPakistan.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Windows/Nicol2001WindowsPakistan.mo" 2021-09-16 11:17:57.234319101 +0200 @@ -4,7 +4,7 @@ parameter Real A(final unit="1/K") = 0.118 "Slope of the logistic relation"; parameter Real B(final unit="1") = -3.73 "Intercept of the logistic relation"; parameter Integer seed = 5 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -22,7 +22,7 @@ max=1) "Probability of window opened"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Windows/Nicol2001WindowsUK.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Windows/Nicol2001WindowsUK.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Windows/Nicol2001WindowsUK.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Windows/Nicol2001WindowsUK.mo" 2021-09-16 11:17:57.222319141 +0200 @@ -4,7 +4,7 @@ parameter Real A(final unit="1/K") = 0.169 "Slope of the logistic relation"; parameter Real B(final unit="1") = -2.65 "Intercept of the logistic relation"; parameter Integer seed = 30 "Seed for the random number generator"; - parameter Modelica.SIunits.Time samplePeriod = 120 "Sample period"; + parameter Modelica.Units.SI.Time samplePeriod = 120 "Sample period"; Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", @@ -22,7 +22,7 @@ max=1) "Probability of window opened"; protected - parameter Modelica.SIunits.Time t0(final fixed = false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(final fixed = false) "First sample time instant"; output Boolean sampleTrigger "True, if sample time instant"; Real curSeed "Current value for seed as a real-valued variable"; initial equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Windows/Validation/Nicol2001WindowsEU.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Windows/Validation/Nicol2001WindowsEU.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Windows/Validation/Nicol2001WindowsEU.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Windows/Validation/Nicol2001WindowsEU.mo" 2021-09-16 11:17:57.198319222 +0200 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Windows/Validation/Nicol2001WindowsPakistan.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Windows/Validation/Nicol2001WindowsPakistan.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Windows/Validation/Nicol2001WindowsPakistan.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Windows/Validation/Nicol2001WindowsPakistan.mo" 2021-09-16 11:17:57.186319262 +0200 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Windows/Validation/Nicol2001WindowsUK.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Windows/Validation/Nicol2001WindowsUK.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Windows/Validation/Nicol2001WindowsUK.mo" 2021-09-16 11:15:38.474780342 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Occupants/Residential/Windows/Validation/Nicol2001WindowsUK.mo" 2021-09-16 11:17:57.174319302 +0200 @@ -8,7 +8,7 @@ Modelica.Blocks.Sources.Sine TOut( amplitude=15, offset=288, - freqHz=0.001, +f =0.001, y(unit="K", displayUnit="degC")) "Outdoor air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/CFDAirHeatMassBalance.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/CFDAirHeatMassBalance.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/CFDAirHeatMassBalance.mo" 2021-09-16 11:15:38.958778746 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/CFDAirHeatMassBalance.mo" 2021-09-16 11:17:57.134319436 +0200 @@ -21,7 +21,7 @@ "Set to false to deactivate the CFD interface and use instead yFixed as output" annotation (Evaluate=true); - parameter Modelica.SIunits.Time samplePeriod(min=100*Modelica.Constants.eps) + parameter Modelica.Units.SI.Time samplePeriod(min=100*Modelica.Constants.eps) "Sample period of component" annotation (Dialog(group="Sampling")); parameter Boolean haveSensor @@ -63,23 +63,23 @@ origin={180,-250}))); protected - parameter Modelica.SIunits.Time startTime(fixed=false) + parameter Modelica.Units.SI.Time startTime(fixed=false) "First sample time instant."; // Values that are used for yFixed parameter Real yFixed[kSen + nSen](each fixed=false) "Values used for yFixed in CFDExchange"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_fixed[kSurBou + nSurBou]= + parameter Modelica.Units.SI.HeatFlowRate Q_flow_fixed[kSurBou + nSurBou]= fill(0, kSurBou + nSurBou) "Surface heat flow rate used for yFixed" annotation (Dialog(group="Outputs if activateInterface=false")); - parameter Modelica.SIunits.Temperature TRooAve_fixed=Medium.T_default + parameter Modelica.Units.SI.Temperature TRooAve_fixed=Medium.T_default "Average room air temperature used for yFixed" annotation (Dialog(group="Outputs if activateInterface=false")); - parameter Modelica.SIunits.Temperature TSha_fixed[NConExtWin]= + parameter Modelica.Units.SI.Temperature TSha_fixed[NConExtWin]= fill(Medium.T_default, NConExtWin) "Shade temperature used for yFixed" annotation (Dialog(group="Outputs if activateInterface=false")); - parameter Modelica.SIunits.Temperature T_outflow_fixed[nPorts]= + parameter Modelica.Units.SI.Temperature T_outflow_fixed[nPorts]= fill(Medium.T_default, nPorts) "Temperature of the fluid that flows into the HVAC system used for yFixed" annotation (Dialog(group="Outputs if activateInterface=false")); @@ -90,7 +90,7 @@ "Trace substances of the fluid that flows into the HVAC system used for yFixed" annotation (Dialog(group="Outputs if activateInterface=false")); - parameter Modelica.SIunits.Density rho_start=Medium.density( + parameter Modelica.Units.SI.Density rho_start=Medium.density( Medium.setState_pTX( T=Medium.T_default, p=p_start, @@ -261,6 +261,7 @@ final parameter Integer nSur=kSurBou + nSurBou "Number of surfaces"; protected + function assignSurfaceIdentifier input Integer nConExt(min=0) "Number of exterior constructions"; @@ -290,34 +291,34 @@ */ // Declaration of construction data input String nameConExt[nConExt] "Surface name"; - input Modelica.SIunits.Area AConExt[nConExt] "Surface area"; - input Modelica.SIunits.Angle tilConExt[nConExt] "Surface tilt"; + input Modelica.Units.SI.Area AConExt[nConExt] "Surface area"; + input Modelica.Units.SI.Angle tilConExt[nConExt] "Surface tilt"; input Buildings.ThermalZones.Detailed.Types.CFDBoundaryConditions bouConConExt[nConExt] "Boundary condition"; input String nameConExtWin[nConExtWin] "Surface name"; - input Modelica.SIunits.Area AConExtWin[nConExtWin] "Surface area"; - input Modelica.SIunits.Angle tilConExtWin[nConExtWin] "Surface tilt"; + input Modelica.Units.SI.Area AConExtWin[nConExtWin] "Surface area"; + input Modelica.Units.SI.Angle tilConExtWin[nConExtWin] "Surface tilt"; input Buildings.ThermalZones.Detailed.Types.CFDBoundaryConditions bouConConExtWin[ nConExtWin] "Boundary condition"; - input Modelica.SIunits.Area AGla[nConExtWin] "Surface area"; - input Modelica.SIunits.Area AFra[nConExtWin] "Surface area"; + input Modelica.Units.SI.Area AGla[nConExtWin] "Surface area"; + input Modelica.Units.SI.Area AFra[nConExtWin] "Surface area"; input Real uSha[nConExtWin] "Shade ratio"; input String nameConPar[nConPar] "Surface name"; - input Modelica.SIunits.Area AConPar[nConPar] "Surface area"; - input Modelica.SIunits.Angle tilConPar[nConPar] "Surface tilt"; + input Modelica.Units.SI.Area AConPar[nConPar] "Surface area"; + input Modelica.Units.SI.Angle tilConPar[nConPar] "Surface tilt"; input Buildings.ThermalZones.Detailed.Types.CFDBoundaryConditions bouConConPar[nConPar] "Boundary condition"; input String nameConBou[nConBou] "Surface name"; - input Modelica.SIunits.Area AConBou[nConBou] "Surface area"; - input Modelica.SIunits.Angle tilConBou[nConBou] "Surface tilt"; + input Modelica.Units.SI.Area AConBou[nConBou] "Surface area"; + input Modelica.Units.SI.Angle tilConBou[nConBou] "Surface tilt"; input Buildings.ThermalZones.Detailed.Types.CFDBoundaryConditions bouConConBou[nConBou] "Boundary condition"; input String nameSurBou[nSurBou] "Surface name"; - input Modelica.SIunits.Area ASurBou[nSurBou] "Surface area"; - input Modelica.SIunits.Angle tilSurBou[nSurBou] "Surface tilt"; + input Modelica.Units.SI.Area ASurBou[nSurBou] "Surface area"; + input Modelica.Units.SI.Angle tilSurBou[nSurBou] "Surface tilt"; input Buildings.ThermalZones.Detailed.Types.CFDBoundaryConditions bouConSurBou[nSurBou] "Boundary condition"; @@ -373,7 +374,6 @@ til=tilSurBou[i], bouCon=bouConSurBou[i]) for i in 1:nSurBou}); end assignSurfaceIdentifier; - public Modelica.Blocks.Math.Add QTotCon_flow "Total sensible convective heat flow rate added to the room" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/CFDExchange.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/CFDExchange.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/CFDExchange.mo" 2021-09-16 11:15:38.958778746 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/CFDExchange.mo" 2021-09-16 11:17:56.954320039 +0200 @@ -34,7 +34,7 @@ parameter String portName[:] "Names of fluid ports as declared in the CFD input file"; parameter Boolean verbose=false "Set to true for verbose output"; - parameter Modelica.SIunits.Density rho_start "Density at initial state"; + parameter Modelica.Units.SI.Density rho_start "Density at initial state"; CFDThread CFDThre = CFDThread() "Allocate memory for cosimulation variables via constructor and send stop command to FFD via destructor"; @@ -54,7 +54,7 @@ "Number of sensors that are connected to CFD output"; final parameter Integer nPorts=size(portName, 1) "Number of fluid ports for the HVAC inlet and outlets"; - discrete Modelica.SIunits.Time modTimRea(fixed=false) + discrete Modelica.Units.SI.Time modTimRea(fixed=false) "Current model time received from CFD"; discrete Integer retVal(start=0, fixed=true) "Return value from CFD"; @@ -64,8 +64,8 @@ function sendParameters input String cfdFilNam "CFD input file name"; input String[nSur] name "Surface names"; - input Modelica.SIunits.Area[nSur] A "Surface areas"; - input Modelica.SIunits.Angle[nSur] til "Surface tilt"; + input Modelica.Units.SI.Area[nSur] A "Surface areas"; + input Modelica.Units.SI.Angle[nSur] til "Surface tilt"; input Buildings.ThermalZones.Detailed.Types.CFDBoundaryConditions[nSur] bouCon "Type of boundary condition"; input Integer nPorts(min=0) @@ -85,7 +85,7 @@ input Integer nXi "Number of independent species concentration of the inflowing medium"; input Integer nC "Number of trace substances of the inflowing medium"; - input Modelica.SIunits.Density rho_start "Density at initial state"; + input Modelica.Units.SI.Density rho_start "Density at initial state"; protected Integer coSimFlag=0; algorithm @@ -124,14 +124,14 @@ // Modelica and CFD. function exchange input Integer flag "Communication flag to write to CFD"; - input Modelica.SIunits.Time t "Current simulation time in seconds to write"; - input Modelica.SIunits.Time dt(min=100*Modelica.Constants.eps) + input Modelica.Units.SI.Time t "Current simulation time in seconds to write"; + input Modelica.Units.SI.Time dt(min=100*Modelica.Constants.eps) "Requested time step length"; input Real[nU] u "Input for CFD"; input Integer nU "Number of inputs for CFD"; input Real[nY] yFixed "Fixed values (used for debugging only)"; input Integer nY "Number of outputs from CFD"; - output Modelica.SIunits.Time modTimRea + output Modelica.Units.SI.Time modTimRea "Current model time in seconds read from CFD"; input Boolean verbose "Set to true for verbose output"; output Real[nY] y "Output computed by CFD"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/CFDFluidInterface.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/CFDFluidInterface.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/CFDFluidInterface.mo" 2021-09-16 11:15:38.958778746 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/CFDFluidInterface.mo" 2021-09-16 11:17:56.890320253 +0200 @@ -18,10 +18,10 @@ // Parameters for the model parameter Integer nPorts(min=0)=0 "Number of ports" annotation(Evaluate=true, Dialog(connectorSizing=true, tab="General",group="Ports")); - parameter Modelica.SIunits.Density rho_start + parameter Modelica.Units.SI.Density rho_start "Density, used to compute fluid mass"; - parameter Modelica.SIunits.Volume V "Volume"; - final parameter Modelica.SIunits.Mass m_start = rho_start * V + parameter Modelica.Units.SI.Volume V "Volume"; + final parameter Modelica.Units.SI.Mass m_start = rho_start * V "Initial mass of air inside the room."; Modelica.Blocks.Interfaces.RealInput T_outflow[nPorts]( @@ -98,10 +98,10 @@ Modelica.Blocks.Interfaces.RealInput C_outflow_internal[max(nPorts, nPorts*Medium.nC)]( each min=0) "Trace substances if m_flow < 0"; - Modelica.SIunits.MassFlowRate[Medium.nXi] mbXi_flow - "Substance mass flows across boundaries"; - Modelica.SIunits.MassFlowRate ports_mXi_flow[nPorts,Medium.nXi]; + Modelica.Units.SI.MassFlowRate[Medium.nXi] mbXi_flow + "Substance mass flows across boundaries"; + Modelica.Units.SI.MassFlowRate ports_mXi_flow[nPorts,Medium.nXi]; initial equation //Disable it for shoebox model test //assert(nPorts >= 2, "The CFD model requires at least two fluid connections."); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/CFDSurfaceIdentifier.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/CFDSurfaceIdentifier.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/CFDSurfaceIdentifier.mo" 2021-09-16 11:15:38.958778746 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/CFDSurfaceIdentifier.mo" 2021-09-16 11:17:56.858320361 +0200 @@ -2,8 +2,8 @@ record CFDSurfaceIdentifier "Data record to identify surfaces in the CFD code" extends Modelica.Icons.Record; parameter String name "Name of the surface"; - parameter Modelica.SIunits.Area A "Area of the surface"; - parameter Modelica.SIunits.Angle til "Tilt of the surface"; + parameter Modelica.Units.SI.Area A "Area of the surface"; + parameter Modelica.Units.SI.Angle til "Tilt of the surface"; parameter Buildings.ThermalZones.Detailed.Types.CFDBoundaryConditions bouCon "Boundary condition used in the CFD simulation"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/Examples/HeatGain.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/Examples/HeatGain.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/Examples/HeatGain.mo" 2021-09-16 11:15:38.958778746 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/Examples/HeatGain.mo" 2021-09-16 11:17:56.610321191 +0200 @@ -4,7 +4,7 @@ package MediumA = Buildings.Media.Air "Medium model"; - parameter Modelica.SIunits.Area AFlo=50 "Floor area"; + parameter Modelica.Units.SI.Area AFlo=50 "Floor area"; Buildings.ThermalZones.Detailed.BaseClasses.HeatGain heatGain( AFlo=AFlo) diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/ExteriorBoundaryConditions.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/ExteriorBoundaryConditions.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/ExteriorBoundaryConditions.mo" 2021-09-16 11:15:38.958778746 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/ExteriorBoundaryConditions.mo" 2021-09-16 11:17:56.534321445 +0200 @@ -3,7 +3,7 @@ "Model for convection and radiation bounary condition of exterior constructions" parameter Integer nCon(min=1) "Number of exterior constructions" annotation (Dialog(group="Exterior constructions")); - parameter Modelica.SIunits.Angle lat "Latitude"; + parameter Modelica.Units.SI.Angle lat "Latitude"; parameter Boolean linearizeRadiation "Set to true to linearize emissive power"; @@ -19,7 +19,7 @@ Buildings.HeatTransfer.Types.ExteriorConvection.TemperatureWind "Convective heat transfer model for opaque part of the constructions" annotation (Dialog(group="Convective heat transfer")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer hFixed=10.0 + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hFixed=10.0 "Constant convection coefficient for opaque part of the constructions" annotation (Dialog(group="Convective heat transfer", enable=(conMod == Buildings.HeatTransfer.Types.ExteriorConvection.Fixed))); @@ -67,7 +67,7 @@ annotation (Placement(transformation(extent={{0,100},{-20,120}}))); protected - parameter Modelica.SIunits.Area AOpa[nCon]=conPar[:].A + parameter Modelica.Units.SI.Area AOpa[nCon]=conPar[:].A "Area of opaque construction"; Buildings.HeatTransfer.Sources.PrescribedTemperature TAirConExt[ diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/ExteriorBoundaryConditionsWithWindow.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/ExteriorBoundaryConditionsWithWindow.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/ExteriorBoundaryConditionsWithWindow.mo" 2021-09-16 11:15:38.958778746 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/ExteriorBoundaryConditionsWithWindow.mo" 2021-09-16 11:17:56.494321579 +0200 @@ -5,7 +5,7 @@ final AOpa=conPar[:].AOpa, redeclare Buildings.ThermalZones.Detailed.BaseClasses.ParameterConstructionWithWindow conPar); - final parameter Modelica.SIunits.Area AWin[nCon] = conPar[:].hWin .* conPar[:].wWin + final parameter Modelica.Units.SI.Area AWin[nCon] = conPar[:].hWin .* conPar[:].wWin "Window area" annotation (Dialog(group="Glazing system")); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/HeatGain.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/HeatGain.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/HeatGain.mo" 2021-09-16 11:15:38.958778746 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/HeatGain.mo" 2021-09-16 11:17:56.434321780 +0200 @@ -2,7 +2,7 @@ model HeatGain "Model to convert internal heat gain signals" extends Buildings.BaseClasses.BaseIcon; - parameter Modelica.SIunits.Area AFlo "Floor area"; + parameter Modelica.Units.SI.Area AFlo "Floor area"; Modelica.Blocks.Interfaces.RealInput qGai_flow[3] "Radiant, convective and latent heat input into room (positive if heat gain)" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/InfraredRadiationExchange.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/InfraredRadiationExchange.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/InfraredRadiationExchange.mo" 2021-09-16 11:15:38.958778746 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/InfraredRadiationExchange.mo" 2021-09-16 11:17:56.418321834 +0200 @@ -40,9 +40,9 @@ each min=0, each max=1, each fixed=false) "Reflectivity of opaque surfaces"; - final parameter Modelica.SIunits.Area AOpa[nOpa](each fixed=false) + final parameter Modelica.Units.SI.Area AOpa[nOpa](each fixed=false) "Surface area of opaque surfaces"; - final parameter Modelica.SIunits.Area A[nTot](each fixed=false) + final parameter Modelica.Units.SI.Area A[nTot](each fixed=false) "Surface areas"; final parameter Real kOpa[nOpa](each unit="W/K4", each fixed=false) "Product sigma*epsilon*A for opaque surfaces"; @@ -53,40 +53,40 @@ each max=1, each fixed=false) "View factor from surface i to j"; - parameter Modelica.SIunits.Time t0(fixed=false) "First sample time instant"; + parameter Modelica.Units.SI.Time t0(fixed=false) "First sample time instant"; Buildings.HeatTransfer.Interfaces.RadiosityInflow JInConExtWin_internal[ NConExtWin](start=AConExtWinGla*0.8*Modelica.Constants.sigma*293.15^4, each fixed=sampleModel and nConExtWin > 0) "Incoming radiosity that connects to non-frame part of the window"; - Modelica.SIunits.HeatFlowRate J[nTot]( + Modelica.Units.SI.HeatFlowRate J[nTot]( each max=0, start=-A .* 0.8*Modelica.Constants.sigma*293.15^4, fixed={sampleModel and (i <= nOpa or i > nOpa + nWin) for i in 1:nTot}, each nominal=10*0.8*Modelica.Constants.sigma*293.15^4) "Radiosity leaving the surface"; - Modelica.SIunits.HeatFlowRate G[nTot]( + Modelica.Units.SI.HeatFlowRate G[nTot]( each min=0, start=A .* 0.8*Modelica.Constants.sigma*293.15^4, each nominal=10*0.8*Modelica.Constants.sigma*293.15^4) "Radiosity entering the surface"; - Modelica.SIunits.Temperature TOpa[nOpa](each start=293.15, each nominal= + Modelica.Units.SI.Temperature TOpa[nOpa](each start=293.15, each nominal= 293.15) "Temperature of opaque surfaces"; Real T4Opa[nOpa]( each unit="K4", each start=T40, each nominal=293.15^4) "Forth power of temperature of opaque surfaces"; - Modelica.SIunits.HeatFlowRate Q_flow[nTot](each start=0, each fixed= + Modelica.Units.SI.HeatFlowRate Q_flow[nTot](each start=0, each fixed= sampleModel) "Heat flow rate at surfaces"; - parameter Modelica.SIunits.Temperature T0=293.15 + parameter Modelica.Units.SI.Temperature T0=293.15 "Temperature used to linearize radiative heat transfer"; final parameter Real T03( min=0, unit="K3") = T0^3 "3rd power of temperature T0"; - Modelica.SIunits.HeatFlowRate sumEBal(start=0, fixed=sampleModel) + Modelica.Units.SI.HeatFlowRate sumEBal(start=0, fixed=sampleModel) "Sum of energy balance, should be zero"; initial equation assert(homotopyInitialization, "In " + getInstanceName() + diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/MixedAirHeatMassBalance.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/MixedAirHeatMassBalance.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/MixedAirHeatMassBalance.mo" 2021-09-16 11:15:38.958778746 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/MixedAirHeatMassBalance.mo" 2021-09-16 11:17:56.330322128 +0200 @@ -7,14 +7,14 @@ constant Boolean homotopyInitialization = true "= true, use homotopy method" annotation(HideResult=true); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal(min=0) + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal(min=0) "Nominal mass flow rate" annotation(Dialog(group = "Nominal condition")); parameter Buildings.HeatTransfer.Types.InteriorConvection conMod "Convective heat transfer model for opaque constructions" annotation (Dialog(group="Convective heat transfer")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer hFixed + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hFixed "Constant convection coefficient for opaque constructions" annotation (Dialog(group="Convective heat transfer", enable=(conMod == Buildings.HeatTransfer.Types.InteriorConvection.Fixed))); @@ -115,7 +115,7 @@ // Latent and convective sensible heat gains protected - constant Modelica.SIunits.SpecificEnergy h_fg= + constant Modelica.Units.SI.SpecificEnergy h_fg= Buildings.Media.Air.enthalpyOfCondensingGas(273.15+37) "Latent heat of water vapor"; Modelica.Blocks.Math.Gain mWat_flow( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/Overhang.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/Overhang.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/Overhang.mo" 2021-09-16 11:15:38.958778746 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/Overhang.mo" 2021-09-16 11:17:56.262322356 +0200 @@ -2,17 +2,17 @@ record Overhang "Record for window overhang" extends Modelica.Icons.Record; - parameter Modelica.SIunits.Length wL(min=0) + parameter Modelica.Units.SI.Length wL(min=0) "Overhang width left to the window, measured from the window corner" annotation(Dialog(tab="General",group="Overhang")); - parameter Modelica.SIunits.Length wR(min=0) + parameter Modelica.Units.SI.Length wR(min=0) "Overhang width right to the window, measured from the window corner" annotation(Dialog(tab="General",group="Overhang")); - parameter Modelica.SIunits.Length dep(min=0) + parameter Modelica.Units.SI.Length dep(min=0) "Overhang depth (measured perpendicular to the wall plane)" annotation(Dialog(tab="General",group="Overhang")); - parameter Modelica.SIunits.Length gap(min=0) + parameter Modelica.Units.SI.Length gap(min=0) "Distance between window upper edge and overhang lower edge" annotation(Dialog(tab="General",group="Overhang")); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/ParameterConstruction.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/ParameterConstruction.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/ParameterConstruction.mo" 2021-09-16 11:15:38.958778746 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/ParameterConstruction.mo" 2021-09-16 11:17:56.246322410 +0200 @@ -2,7 +2,7 @@ record ParameterConstruction "Record for exterior constructions that have no window" extends Buildings.ThermalZones.Detailed.BaseClasses.PartialParameterConstruction; - parameter Modelica.SIunits.Area A "Heat transfer area"; + parameter Modelica.Units.SI.Area A "Heat transfer area"; annotation ( Documentation(info=" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/ParameterConstructionWithWindow.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/ParameterConstructionWithWindow.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/ParameterConstructionWithWindow.mo" 2021-09-16 11:15:38.958778746 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/ParameterConstructionWithWindow.mo" 2021-09-16 11:17:56.238322437 +0200 @@ -3,17 +3,17 @@ "Record for exterior constructions that have a window" extends Buildings.ThermalZones.Detailed.BaseClasses.PartialParameterConstruction; - parameter Modelica.SIunits.Area A + parameter Modelica.Units.SI.Area A "Heat transfer area of opaque construction and window combined"; - parameter Modelica.SIunits.Length hWin "Window height" + parameter Modelica.Units.SI.Length hWin "Window height" annotation (Dialog(group="Glazing system")); - parameter Modelica.SIunits.Length wWin "Window width" + parameter Modelica.Units.SI.Length wWin "Window width" annotation (Dialog(group="Glazing system")); - final parameter Modelica.SIunits.Area AWin=hWin*wWin + final parameter Modelica.Units.SI.Area AWin=hWin*wWin "Heat transfer area of window" annotation (Dialog(group="Glazing system")); - final parameter Modelica.SIunits.Area AOpa = A-AWin + final parameter Modelica.Units.SI.Area AOpa = A-AWin "Heat transfer area of opaque construction" annotation (Dialog(group="Opaque construction")); @@ -34,9 +34,9 @@ annotation (Dialog(group="Glazing system"), choicesAllMatching=true, Placement(transformation(extent={{60,-20}, {80,0}}))); - final parameter Modelica.SIunits.Area AFra = fFra*AWin "Frame area" + final parameter Modelica.Units.SI.Area AFra = fFra*AWin "Frame area" annotation (Dialog(group="Glazing system")); - final parameter Modelica.SIunits.Area AGla=AWin - AFra "Glass area" + final parameter Modelica.Units.SI.Area AGla=AWin - AFra "Glass area" annotation (Dialog(group="Glazing system")); parameter HeatTransfer.Data.GlazingSystems.Generic glaSys diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/PartialAirHeatMassBalance.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/PartialAirHeatMassBalance.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/PartialAirHeatMassBalance.mo" 2021-09-16 11:15:38.958778746 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/PartialAirHeatMassBalance.mo" 2021-09-16 11:17:56.222322490 +0200 @@ -13,7 +13,7 @@ parameter Boolean haveShade "Set to true if at least one window has an interior or exterior shade"; - parameter Modelica.SIunits.Volume V "Volume"; + parameter Modelica.Units.SI.Volume V "Volume"; // Input/output signals Modelica.Blocks.Interfaces.RealInput uSha[NConExtWin] if haveShade @@ -103,19 +103,19 @@ // Surface areas protected - final parameter Modelica.SIunits.Area AConExt[NConExt] = datConExt.A + final parameter Modelica.Units.SI.Area AConExt[NConExt] = datConExt.A "Areas of exterior constructions"; - final parameter Modelica.SIunits.Area AConExtWinOpa[NConExtWin] = datConExtWin.AOpa + final parameter Modelica.Units.SI.Area AConExtWinOpa[NConExtWin] = datConExtWin.AOpa "Opaque areas of exterior construction that have a window"; - final parameter Modelica.SIunits.Area AConExtWinGla[NConExtWin] = (1 .- datConExtWin.fFra) .* datConExtWin.AWin + final parameter Modelica.Units.SI.Area AConExtWinGla[NConExtWin] = (1 .- datConExtWin.fFra) .* datConExtWin.AWin "Glass areas of exterior construction that have a window"; - final parameter Modelica.SIunits.Area AConExtWinFra[NConExtWin] = datConExtWin.fFra .* datConExtWin.AWin + final parameter Modelica.Units.SI.Area AConExtWinFra[NConExtWin] = datConExtWin.fFra .* datConExtWin.AWin "Frame areas of exterior construction that have a window"; - final parameter Modelica.SIunits.Area AConPar[NConPar] = datConPar.A + final parameter Modelica.Units.SI.Area AConPar[NConPar] = datConPar.A "Areas of partition constructions"; - final parameter Modelica.SIunits.Area AConBou[NConBou] = datConBou.A + final parameter Modelica.Units.SI.Area AConBou[NConBou] = datConBou.A "Areas of constructions with exterior boundary conditions exposed to outside of room model"; - final parameter Modelica.SIunits.Area ASurBou[NSurBou] = surBou.A + final parameter Modelica.Units.SI.Area ASurBou[NSurBou] = surBou.A "Area of surface models of constructions that are modeled outside of this room"; annotation ( preferredView="info", diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/PartialParameterConstruction.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/PartialParameterConstruction.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/PartialParameterConstruction.mo" 2021-09-16 11:15:38.958778746 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/PartialParameterConstruction.mo" 2021-09-16 11:17:56.190322597 +0200 @@ -11,8 +11,8 @@ choicesAllMatching=true, Placement(transformation(extent={{146,258}, {166,278}}))); - parameter Modelica.SIunits.Angle til "Surface tilt"; - parameter Modelica.SIunits.Angle azi "Surface azimuth"; + parameter Modelica.Units.SI.Angle til "Surface tilt"; + parameter Modelica.Units.SI.Angle azi "Surface azimuth"; final parameter Boolean isFloor=til > 2.74889125 and til < 3.53428875 "Flag, true if construction is a floor" annotation (Evaluate=true); final parameter Boolean isCeiling=til > -0.392699 and til < 0.392699 @@ -24,10 +24,10 @@ parameter Boolean steadyStateInitial=false "=true initializes dT(0)/dt=0, false initializes T(0) at fixed temperature using T_a_start and T_b_start" annotation (Dialog(group="Initialization"), Evaluate=true); - parameter Modelica.SIunits.Temperature T_a_start=293.15 + parameter Modelica.Units.SI.Temperature T_a_start=293.15 "Initial temperature at port_a, used if steadyStateInitial = false" annotation (Dialog(group="Initialization", enable=not steadyStateInitial)); - parameter Modelica.SIunits.Temperature T_b_start=293.15 + parameter Modelica.Units.SI.Temperature T_b_start=293.15 "Initial temperature at port_b, used if steadyStateInitial = false" annotation (Dialog(group="Initialization", enable=not steadyStateInitial)); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/PartialSurfaceInterface.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/PartialSurfaceInterface.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/PartialSurfaceInterface.mo" 2021-09-16 11:15:38.958778746 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/PartialSurfaceInterface.mo" 2021-09-16 11:17:56.174322651 +0200 @@ -35,25 +35,25 @@ annotation (Placement(transformation(extent={{231, -230},{251,-210}}))); protected - final parameter Modelica.SIunits.Area AConExt[NConExt] = datConExt.A + final parameter Modelica.Units.SI.Area AConExt[NConExt] = datConExt.A "Areas of exterior constructions"; - final parameter Modelica.SIunits.Area AConExtWinOpa[NConExtWin] = datConExtWin.AOpa + final parameter Modelica.Units.SI.Area AConExtWinOpa[NConExtWin] = datConExtWin.AOpa "Opaque areas of exterior construction that have a window"; - final parameter Modelica.SIunits.Area AConExtWinGla[NConExtWin] = (1 .- datConExtWin.fFra) .* datConExtWin.AWin + final parameter Modelica.Units.SI.Area AConExtWinGla[NConExtWin] = (1 .- datConExtWin.fFra) .* datConExtWin.AWin "Glass areas of exterior construction that have a window"; - final parameter Modelica.SIunits.Area AConExtWinFra[NConExtWin] = datConExtWin.fFra .* datConExtWin.AWin + final parameter Modelica.Units.SI.Area AConExtWinFra[NConExtWin] = datConExtWin.fFra .* datConExtWin.AWin "Frame areas of exterior construction that have a window"; - final parameter Modelica.SIunits.Area AConPar[NConPar] = datConPar.A + final parameter Modelica.Units.SI.Area AConPar[NConPar] = datConPar.A "Areas of partition constructions"; - final parameter Modelica.SIunits.Area AConBou[NConBou] = datConBou.A + final parameter Modelica.Units.SI.Area AConBou[NConBou] = datConBou.A "Areas of constructions with exterior boundary conditions exposed to outside of room model"; - final parameter Modelica.SIunits.Area ASurBou[NSurBou] = surBou.A + final parameter Modelica.Units.SI.Area ASurBou[NSurBou] = surBou.A "Area of surface models of constructions that are modeled outside of this room"; protected function checkSurfaceAreas input Integer n "Number of surfaces"; - input Modelica.SIunits.Area A[:] "Surface areas"; + input Modelica.Units.SI.Area A[:] "Surface areas"; input String name "Name of the surface data record, used in error message"; algorithm if n == 0 then diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/PartialSurfaceInterfaceRadiative.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/PartialSurfaceInterfaceRadiative.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/PartialSurfaceInterfaceRadiative.mo" 2021-09-16 11:15:38.958778746 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/PartialSurfaceInterfaceRadiative.mo" 2021-09-16 11:17:56.142322758 +0200 @@ -4,26 +4,26 @@ extends Buildings.ThermalZones.Detailed.BaseClasses.PartialSurfaceInterface; protected - parameter Modelica.SIunits.Emissivity epsConExt[NConExt] = datConExt.layers.absIR_b + + parameter Modelica.Units.SI.Emissivity epsConExt[NConExt] = datConExt.layers.absIR_b "Absorptivity of exterior constructions"; - parameter Modelica.SIunits.Emissivity epsConExtWinOpa[NConExtWin] = datConExtWin.layers.absIR_b + parameter Modelica.Units.SI.Emissivity epsConExtWinOpa[NConExtWin] = datConExtWin.layers.absIR_b "Absorptivity of opaque part of exterior constructions that contain a window"; - parameter Modelica.SIunits.Emissivity epsConExtWinUns[NConExtWin]= + parameter Modelica.Units.SI.Emissivity epsConExtWinUns[NConExtWin]= {(datConExtWin[i].glaSys.glass[size(datConExtWin[i].glaSys.glass, 1)].absIR_b) for i in 1:NConExtWin} "Absorptivity of unshaded part of window constructions"; - parameter Modelica.SIunits.Emissivity epsConExtWinSha[NConExtWin] = datConExtWin.glaSys.shade.absIR_a + parameter Modelica.Units.SI.Emissivity epsConExtWinSha[NConExtWin] = datConExtWin.glaSys.shade.absIR_a "Absorptivity of shaded part of window constructions"; - parameter Modelica.SIunits.Emissivity epsConExtWinFra[NConExtWin] = datConExtWin.glaSys.absIRFra + parameter Modelica.Units.SI.Emissivity epsConExtWinFra[NConExtWin] = datConExtWin.glaSys.absIRFra "Absorptivity of window frame"; - parameter Modelica.SIunits.Emissivity epsConPar_a[NConPar] = datConPar.layers.absIR_a + parameter Modelica.Units.SI.Emissivity epsConPar_a[NConPar] = datConPar.layers.absIR_a "Absorptivity of partition constructions surface a"; - parameter Modelica.SIunits.Emissivity epsConPar_b[NConPar] = datConPar.layers.absIR_b + parameter Modelica.Units.SI.Emissivity epsConPar_b[NConPar] = datConPar.layers.absIR_b "Absorptivity of partition constructions surface b"; - parameter Modelica.SIunits.Emissivity epsConBou[NConBou] = datConBou.layers.absIR_b + parameter Modelica.Units.SI.Emissivity epsConBou[NConBou] = datConBou.layers.absIR_b "Absorptivity of constructions with exterior boundary conditions exposed to outside of room model"; - parameter Modelica.SIunits.Emissivity epsSurBou[NSurBou] = surBou.absIR + parameter Modelica.Units.SI.Emissivity epsSurBou[NSurBou] = surBou.absIR "Absorptivity of surface models of constructions that are modeled outside of this room"; - annotation (Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-240, -240},{240,240}}), graphics), Icon(coordinateSystem(preserveAspectRatio=true, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/RadiationTemperature.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/RadiationTemperature.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/RadiationTemperature.mo" 2021-09-16 11:15:38.958778746 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/RadiationTemperature.mo" 2021-09-16 11:17:56.110322865 +0200 @@ -34,7 +34,7 @@ final parameter Integer NWin = NConExtWin "Number of window surfaces"; final parameter Integer NTot = NOpa + NWin "Total number of surfaces"; - final parameter Modelica.SIunits.Area AGla[NWin] = datConExtWin.AGla + final parameter Modelica.Units.SI.Area AGla[NWin] = datConExtWin.AGla "Surface area of opaque surfaces"; final parameter Real epsGla[NWin](each min=0, each max=1)= {datConExtWin[i].glaSys.glass[size(datConExtWin[i].glaSys.glass, 1)].absIR_b for i in 1:NWin} @@ -46,21 +46,21 @@ {(if datConExtWin[i].glaSys.haveInteriorShade then datConExtWin[i].glaSys.shade.tauIR_a else 1) for i in 1:NWin} "Transmissivity of shade"; - final parameter Modelica.SIunits.Area epsAOpa[NOpa](each fixed=false) + final parameter Modelica.Units.SI.Area epsAOpa[NOpa](each fixed=false) "Product of area times absorptivity of opaque surfaces"; - final parameter Modelica.SIunits.Area epsAGla[NWin](each fixed=false) + final parameter Modelica.Units.SI.Area epsAGla[NWin](each fixed=false) "Product of area times absorptivity of window surfaces"; - final parameter Modelica.SIunits.Area epsASha[NWin](each fixed=false) + final parameter Modelica.Units.SI.Area epsASha[NWin](each fixed=false) "Product of area times absorptivity of window shade"; - final parameter Modelica.SIunits.Area epsTauASha[NWin](each fixed=false) + final parameter Modelica.Units.SI.Area epsTauASha[NWin](each fixed=false) "Product of area times glass absorptivity times shade transmittance"; - Modelica.SIunits.Temperature TOpa[NOpa](each start=293.15, each nominal=293.15) + Modelica.Units.SI.Temperature TOpa[NOpa](each start=293.15, each nominal=293.15) "Temperature of opaque surfaces"; - Modelica.SIunits.Temperature TGlaUns[NWin](each start=293.15, each nominal=293.15) + Modelica.Units.SI.Temperature TGlaUns[NWin](each start=293.15, each nominal=293.15) "Temperature of unshaded part of glass"; - Modelica.SIunits.Temperature TGlaSha[NWin](each start=293.15, each nominal=293.15) + Modelica.Units.SI.Temperature TGlaSha[NWin](each start=293.15, each nominal=293.15) "Temperature of shaded part of glass"; - Modelica.SIunits.Temperature TSha[NWin](each start=293.15, each nominal=293.15) + Modelica.Units.SI.Temperature TSha[NWin](each start=293.15, each nominal=293.15) "Temperature of shade"; // Internal connectors, used because of the conditionally removed connectors Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a glaUns_internal[NConExtWin] diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/RoomHeatMassBalance.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/RoomHeatMassBalance.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/RoomHeatMassBalance.mo" 2021-09-16 11:15:38.958778746 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/RoomHeatMassBalance.mo" 2021-09-16 11:17:56.070322999 +0200 @@ -23,10 +23,10 @@ extent={{-40,-10},{40,10}}, rotation=90, origin={-150,-100}))); - parameter Modelica.SIunits.Angle lat "Latitude"; - final parameter Modelica.SIunits.Volume V=AFlo*hRoo "Volume"; - parameter Modelica.SIunits.Area AFlo "Floor area"; - parameter Modelica.SIunits.Length hRoo "Average room height"; + parameter Modelica.Units.SI.Angle lat "Latitude"; + final parameter Modelica.Units.SI.Volume V=AFlo*hRoo "Volume"; + parameter Modelica.Units.SI.Area AFlo "Floor area"; + parameter Modelica.Units.SI.Length hRoo "Average room height"; Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a heaPorAir "Heat port to air volume" annotation (Placement(transformation(extent={{-270,30}, @@ -100,18 +100,18 @@ parameter Buildings.HeatTransfer.Types.InteriorConvection intConMod=Buildings.HeatTransfer.Types.InteriorConvection.Temperature "Convective heat transfer model for room-facing surfaces of opaque constructions" annotation (Dialog(group="Convective heat transfer")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer hIntFixed=3.0 + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hIntFixed=3.0 "Constant convection coefficient for room-facing surfaces of opaque constructions" annotation (Dialog(group="Convective heat transfer", enable=(intConMod == Buildings.HeatTransfer.Types.InteriorConvection.Fixed))); parameter Buildings.HeatTransfer.Types.ExteriorConvection extConMod=Buildings.HeatTransfer.Types.ExteriorConvection.TemperatureWind "Convective heat transfer model for exterior facing surfaces of opaque constructions" annotation (Dialog(group="Convective heat transfer")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer hExtFixed=10.0 + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hExtFixed=10.0 "Constant convection coefficient for exterior facing surfaces of opaque constructions" annotation (Dialog(group="Convective heat transfer", enable=(extConMod == Buildings.HeatTransfer.Types.ExteriorConvection.Fixed))); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal(min=0) = V*1.2/3600 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal(min=0) = V*1.2/3600 "Nominal mass flow rate" annotation (Dialog(group="Nominal condition")); parameter Boolean sampleModel = false "Set to true to time-sample the model, which can give shorter simulation time if there is already time sampling in the system model" @@ -284,11 +284,11 @@ annotation (Placement(transformation(extent={{-60,90},{-40,110}}))); protected - final parameter Modelica.SIunits.TransmissionCoefficient tauIRSha_air[NConExtWin]= + final parameter Modelica.Units.SI.TransmissionCoefficient tauIRSha_air[NConExtWin]= datConExtWin.glaSys.shade.tauIR_a "Infrared transmissivity of shade for radiation coming from the exterior or the room" annotation (Dialog(group="Shading")); - final parameter Modelica.SIunits.TransmissionCoefficient tauIRSha_glass[NConExtWin]= + final parameter Modelica.Units.SI.TransmissionCoefficient tauIRSha_glass[NConExtWin]= datConExtWin.glaSys.shade.tauIR_b "Infrared transmissivity of shade for radiation coming from the glass" annotation (Dialog(group="Shading")); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/SideFins.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/SideFins.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/SideFins.mo" 2021-09-16 11:15:38.958778746 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/SideFins.mo" 2021-09-16 11:17:55.302325571 +0200 @@ -1,13 +1,13 @@ within Buildings.ThermalZones.Detailed.BaseClasses; record SideFins "Record for window side fins" extends Modelica.Icons.Record; - parameter Modelica.SIunits.Length h(min=0) + parameter Modelica.Units.SI.Length h(min=0) "Height of side fin that extends above window, measured from top of window" annotation(Dialog(tab="General",group="Side fin")); - parameter Modelica.SIunits.Length dep(min=0) + parameter Modelica.Units.SI.Length dep(min=0) "Side fin depth (measured perpendicular to the wall plane)" annotation(Dialog(tab="General",group="Side fin")); - parameter Modelica.SIunits.Length gap(min=0) + parameter Modelica.Units.SI.Length gap(min=0) "Distance between side fin and window edge" annotation(Dialog(tab="General",group="Side fin")); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/SkyRadiationExchange.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/SkyRadiationExchange.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/SkyRadiationExchange.mo" 2021-09-16 11:15:38.958778746 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/SkyRadiationExchange.mo" 2021-09-16 11:17:55.290325611 +0200 @@ -3,11 +3,11 @@ "Radiative heat exchange with the sky and the ambient" extends Buildings.BaseClasses.BaseIcon; parameter Integer n(min=1) "Number of constructions"; - parameter Modelica.SIunits.Area A[n] "Area of exterior constructions"; + parameter Modelica.Units.SI.Area A[n] "Area of exterior constructions"; parameter Real vieFacSky[n]( each min=0, each max=1) "View factor to sky (=1 for roofs)"; - parameter Modelica.SIunits.Emissivity absIR[n] + parameter Modelica.Units.SI.Emissivity absIR[n] "Infrared absorptivity of building surface"; Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port[n] "Heat port" annotation (Placement(transformation(extent={{90,-10},{110,10}}))); @@ -26,12 +26,12 @@ parameter Real k[n]( each unit="W/K4") = {4*A[i]*Modelica.Constants.sigma*absIR[i] for i in 1:n} "Constant for radiative heat exchange"; - Modelica.SIunits.Temperature TEnv[n] "Environment temperature"; + Modelica.Units.SI.Temperature TEnv[n] "Environment temperature"; Real TBlaSky4(unit="K4") "Auxiliary variable for radiative heat exchange"; Real TOut4(unit="K4") "Auxiliary variable for radiative heat exchange"; - Modelica.SIunits.CoefficientOfHeatTransfer h[n] - "Radiative heat transfer coefficient"; + Modelica.Units.SI.CoefficientOfHeatTransfer h[n] + "Radiative heat transfer coefficient"; equation TBlaSky4 = TBlaSky^4; TOut4 = TOut^4; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/SolarRadiationExchange.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/SolarRadiationExchange.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/SolarRadiationExchange.mo" 2021-09-16 11:15:38.958778746 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/SolarRadiationExchange.mo" 2021-09-16 11:17:55.270325678 +0200 @@ -35,7 +35,7 @@ parameter Boolean isFloorSurBou[NSurBou] "Flag to indicate if floor for constructions that are modeled outside of this room"; - parameter Modelica.SIunits.Emissivity tauGla[NConExtWin] + parameter Modelica.Units.SI.Emissivity tauGla[NConExtWin] "Transmissivity of window"; Modelica.Blocks.Interfaces.RealInput JInDifConExtWin[NConExtWin](each unit="W") @@ -49,7 +49,7 @@ "Outgoing solar radiation that strikes window per unit area" annotation (Placement(transformation(extent={{240,110},{260,130}}))); - Modelica.SIunits.HeatFlowRate JOutConExtWin[NConExtWin] + Modelica.Units.SI.HeatFlowRate JOutConExtWin[NConExtWin] "Outgoing solar radiation that strikes the window"; protected @@ -57,7 +57,7 @@ "Intermediate variable for gain for direct solar radiation distribution"; final parameter Real kDir2(fixed=false) "Intermediate variable for gain for solar radiation distribution"; - Modelica.SIunits.HeatFlowRate Q_flow[NTot] + Modelica.Units.SI.HeatFlowRate Q_flow[NTot] "Total solar radiation that is absorbed by the surfaces (or transmitted back through the glass)"; final parameter Integer NOpa = NConExt+2*NConExtWin+2*NConPar+NConBou+NSurBou "Number of opaque surfaces, including the window frame"; @@ -69,8 +69,8 @@ "Solar absorptivity"; final parameter Real tau[NTot](each min=0, each max=1, each fixed=false) "Solar transmissivity"; - final parameter Modelica.SIunits.Area AFlo(fixed=false) "Total floor area"; - final parameter Modelica.SIunits.Area A[NTot](each fixed=false) "Surface areas"; + final parameter Modelica.Units.SI.Area AFlo(fixed=false) "Total floor area"; + final parameter Modelica.Units.SI.Area A[NTot](each fixed=false) "Surface areas"; final parameter Real kDif[NTot]( each unit="1", each fixed=false) diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/cfdExchangeData.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/cfdExchangeData.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/cfdExchangeData.mo" 2021-09-16 11:15:38.958778746 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/cfdExchangeData.mo" 2021-09-16 11:17:55.226325826 +0200 @@ -1,13 +1,13 @@ within Buildings.ThermalZones.Detailed.BaseClasses; function cfdExchangeData "Exchange data between CFD and Modelica" input Integer flag "Communication flag to CFD"; - input Modelica.SIunits.Time t "Current Modelica simulation time to CFD"; - input Modelica.SIunits.Time dt(min=100*Modelica.Constants.eps) + input Modelica.Units.SI.Time t "Current Modelica simulation time to CFD"; + input Modelica.Units.SI.Time dt(min=100*Modelica.Constants.eps) "Requested synchronization time step size"; input Real[nU] u "Input to CFD"; input Integer nU "Number of inputs to CFD"; input Integer nY "Number of outputs from CFD"; - output Modelica.SIunits.Time modTimRea "Current model time from CFD"; + output Modelica.Units.SI.Time modTimRea "Current model time from CFD"; output Real[nY] y "Output computed by CFD"; output Integer retVal "Return value for CFD simulation status"; external"C" retVal = cfdExchangeData( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/cfdStartCosimulation.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/cfdStartCosimulation.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/cfdStartCosimulation.mo" 2021-09-16 11:15:38.958778746 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/BaseClasses/cfdStartCosimulation.mo" 2021-09-16 11:17:55.218325852 +0200 @@ -2,8 +2,8 @@ function cfdStartCosimulation "Start the coupled simulation with CFD" input String cfdFilNam "CFD input file name"; input String[nSur] name "Surface names"; - input Modelica.SIunits.Area[nSur] A "Surface areas"; - input Modelica.SIunits.Angle[nSur] til "Surface tilt"; + input Modelica.Units.SI.Area[nSur] A "Surface areas"; + input Modelica.Units.SI.Angle[nSur] til "Surface tilt"; input Buildings.ThermalZones.Detailed.Types.CFDBoundaryConditions[nSur] bouCon "Type of boundary condition"; input Integer nPorts(min=0) @@ -20,7 +20,7 @@ input Integer nConExtWin(min=0) "number of exterior construction with window"; input Integer nXi(min=0) "Number of independent species"; input Integer nC(min=0) "Number of trace substances"; - input Modelica.SIunits.Density rho_start "Density at initial state"; + input Modelica.Units.SI.Density rho_start "Density at initial state"; output Integer retVal "Return value of the function (0 indicates CFD successfully started.)"; external"C" retVal = cfdStartCosimulation( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/CFD.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/CFD.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/CFD.mo" 2021-09-16 11:15:38.958778746 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/CFD.mo" 2021-09-16 11:17:55.198325919 +0200 @@ -26,7 +26,7 @@ parameter Boolean useCFD = true "Set to false to deactivate the CFD computation and use instead yFixed as output" annotation(Dialog(group = "CFD"), Evaluate = true); - parameter Modelica.SIunits.Time samplePeriod(min=100*Modelica.Constants.eps) + parameter Modelica.Units.SI.Time samplePeriod(min=100*Modelica.Constants.eps) "Sample period of component" annotation(Dialog(group = "Sampling")); parameter Real uSha_fixed[nConExtWin] = zeros(nConExtWin) diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Constructions/BaseClasses/PartialConstruction.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Constructions/BaseClasses/PartialConstruction.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Constructions/BaseClasses/PartialConstruction.mo" 2021-09-16 11:15:38.958778746 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Constructions/BaseClasses/PartialConstruction.mo" 2021-09-16 11:17:55.158326053 +0200 @@ -2,8 +2,8 @@ partial model PartialConstruction "Partial model for exterior construction that has no window" - parameter Modelica.SIunits.Area A "Heat transfer area"; - parameter Modelica.SIunits.Area AOpa + parameter Modelica.Units.SI.Area A "Heat transfer area"; + parameter Modelica.Units.SI.Area AOpa "Heat transfer area of opaque construction" annotation (Dialog(group="Opaque construction")); @@ -13,7 +13,7 @@ choicesAllMatching=true, Placement(transformation(extent={{146,258}, {166,278}}))); - parameter Modelica.SIunits.Angle til "Surface tilt"; + parameter Modelica.Units.SI.Angle til "Surface tilt"; final parameter Boolean isFloor=til > 2.74889125 and til < 3.53428875 "Flag, true if construction is a floor" annotation (Evaluate=true); @@ -35,10 +35,10 @@ parameter Boolean steadyStateInitial=false "=true initializes dT(0)/dt=0, false initializes T(0) at fixed temperature using T_a_start and T_b_start" annotation (Dialog(group="Initialization"), Evaluate=true); - parameter Modelica.SIunits.Temperature T_a_start=293.15 + parameter Modelica.Units.SI.Temperature T_a_start=293.15 "Initial temperature at port_a, used if steadyStateInitial = false" annotation (Dialog(group="Initialization", enable=not steadyStateInitial)); - parameter Modelica.SIunits.Temperature T_b_start=293.15 + parameter Modelica.Units.SI.Temperature T_b_start=293.15 "Initial temperature at port_b, used if steadyStateInitial = false" annotation (Dialog(group="Initialization", enable=not steadyStateInitial)); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Constructions/ConstructionWithWindow.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Constructions/ConstructionWithWindow.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Constructions/ConstructionWithWindow.mo" 2021-09-16 11:15:38.958778746 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Constructions/ConstructionWithWindow.mo" 2021-09-16 11:17:55.122326173 +0200 @@ -7,15 +7,15 @@ constant Boolean homotopyInitialization = true "= true, use homotopy method" annotation(HideResult=true); - parameter Modelica.SIunits.Area AWin "Heat transfer area of window" + parameter Modelica.Units.SI.Area AWin "Heat transfer area of window" annotation (Dialog(group="Glazing system")); parameter Real fFra( min=0, max=1) = 0.1 "Fraction of window frame divided by total window area" annotation (Dialog(group="Glazing system")); - final parameter Modelica.SIunits.Area AFra = fFra*AWin "Frame area" + final parameter Modelica.Units.SI.Area AFra = fFra*AWin "Frame area" annotation (Dialog(group="Glazing system")); - final parameter Modelica.SIunits.Area AGla=AWin - AFra "Glass area" + final parameter Modelica.Units.SI.Area AGla=AWin - AFra "Glass area" annotation (Dialog(group="Glazing system")); parameter Boolean linearizeRadiation = true "Set to true to linearize emissive power" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Constructions/Examples/ExteriorWallTwoWindows.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Constructions/Examples/ExteriorWallTwoWindows.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Constructions/Examples/ExteriorWallTwoWindows.mo" 2021-09-16 11:15:38.958778746 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Constructions/Examples/ExteriorWallTwoWindows.mo" 2021-09-16 11:17:55.030326482 +0200 @@ -3,16 +3,16 @@ "Test model for an exterior wall with two windows, one having a shade, the other not" extends Modelica.Icons.Example; parameter Integer nCon = 2 "Number of constructions"; - parameter Modelica.SIunits.Area A[:]={3*10, 3*10} + parameter Modelica.Units.SI.Area A[:]={3*10, 3*10} "Heat transfer area of wall and window"; - parameter Modelica.SIunits.Length hWin[:] = {2, 1} "Window height"; - parameter Modelica.SIunits.Length wWin[:] = {3, 3} "Window width"; - parameter Modelica.SIunits.Area AWin[:]= hWin .* wWin + parameter Modelica.Units.SI.Length hWin[:] = {2, 1} "Window height"; + parameter Modelica.Units.SI.Length wWin[:] = {3, 3} "Window width"; + parameter Modelica.Units.SI.Area AWin[:]= hWin .* wWin "Heat transfer area of frame and window"; parameter Real fFra[:]={0.1, 0.1} "Fraction of window frame divided by total window area"; - final parameter Modelica.SIunits.Area AFra[:]= fFra .* AWin "Frame area"; - final parameter Modelica.SIunits.Area AGla[:] = AWin .- AFra "Glass area"; + final parameter Modelica.Units.SI.Area AFra[:]= fFra .* AWin "Frame area"; + final parameter Modelica.Units.SI.Area AGla[:] = AWin .- AFra "Glass area"; parameter Boolean linearizeRadiation = false "Set to true to linearize emissive power"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Constructions/Examples/ExteriorWallWithWindow.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Constructions/Examples/ExteriorWallWithWindow.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Constructions/Examples/ExteriorWallWithWindow.mo" 2021-09-16 11:15:38.958778746 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Constructions/Examples/ExteriorWallWithWindow.mo" 2021-09-16 11:17:54.966326696 +0200 @@ -1,16 +1,16 @@ within Buildings.ThermalZones.Detailed.Constructions.Examples; model ExteriorWallWithWindow "Test model for an exterior wall with a window" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Area A=3*10 + parameter Modelica.Units.SI.Area A=3*10 "Heat transfer area of wall and window"; - parameter Modelica.SIunits.Length hWin = 2 "Window height"; - parameter Modelica.SIunits.Length wWin = 3 "Window width"; - parameter Modelica.SIunits.Area AWin=hWin*wWin + parameter Modelica.Units.SI.Length hWin = 2 "Window height"; + parameter Modelica.Units.SI.Length wWin = 3 "Window width"; + parameter Modelica.Units.SI.Area AWin=hWin*wWin "Heat transfer area of frame and window"; parameter Real fFra=0.1 "Fraction of window frame divided by total window area"; - final parameter Modelica.SIunits.Area AFra = fFra * AWin "Frame area"; - final parameter Modelica.SIunits.Area AGla = AWin-AFra "Glass area"; + final parameter Modelica.Units.SI.Area AFra = fFra * AWin "Frame area"; + final parameter Modelica.Units.SI.Area AGla = AWin-AFra "Glass area"; parameter Boolean linearizeRadiation = false "Set to true to linearize emissive power"; parameter HeatTransfer.Data.GlazingSystems.DoubleClearAir13Clear glaSys( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Examples/Controls/ElectrochromicWindow.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Examples/Controls/ElectrochromicWindow.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Examples/Controls/ElectrochromicWindow.mo" 2021-09-16 11:15:38.958778746 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Examples/Controls/ElectrochromicWindow.mo" 2021-09-16 11:17:54.886326963 +0200 @@ -1,13 +1,13 @@ within Buildings.ThermalZones.Detailed.Examples.Controls; block ElectrochromicWindow "Controller for electrochromic windows" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Irradiance HClear = 250 + parameter Modelica.Units.SI.Irradiance HClear = 250 "Solar irradiation below which the window will be in clear state regardless of temperature"; - parameter Modelica.SIunits.Irradiance HDark = HClear+100 + parameter Modelica.Units.SI.Irradiance HDark = HClear+100 "Solar irradiation at which the window will be in dark state if T > TDark"; - parameter Modelica.SIunits.Temperature TClear = 273.15+22 + parameter Modelica.Units.SI.Temperature TClear = 273.15+22 "Measured temperature below which the window will be in clear state for any irradiation"; - parameter Modelica.SIunits.Temperature TDark = TClear+2 + parameter Modelica.Units.SI.Temperature TDark = TClear+2 "Measured temperature above which the window will be transitioned to completely dark state if H > HDark"; Modelica.Blocks.Interfaces.RealInput T( @@ -34,8 +34,7 @@ Modelica.Blocks.Nonlinear.Limiter limT( final uMax=1, final uMin=0, - final strict=true, - final limitsAtInit=true) "Limiter for temperature" + final strict=true) "Limiter for temperature" annotation (Placement(transformation(extent={{30,30},{50,50}}))); Modelica.Blocks.Math.Feedback feeT "Feedback for temperature" annotation (Placement(transformation(extent={{-50,30},{-30,50}}))); @@ -49,8 +48,7 @@ Modelica.Blocks.Nonlinear.Limiter limH( final uMax=1, final uMin=0, - final strict=true, - final limitsAtInit=true) "Limiter for irradiation" + final strict=true) "Limiter for irradiation" annotation (Placement(transformation(extent={{30,-50},{50,-30}}))); Modelica.Blocks.Math.Feedback feeH "Feedback for irradiation" annotation (Placement(transformation(extent={{-50,-50},{-30,-30}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Examples/ElectroChromicWindow.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Examples/ElectroChromicWindow.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Examples/ElectroChromicWindow.mo" 2021-09-16 11:15:38.958778746 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Examples/ElectroChromicWindow.mo" 2021-09-16 11:17:54.826327165 +0200 @@ -4,9 +4,9 @@ extends Modelica.Icons.Example; replaceable package MediumA = Buildings.Media.Air(T_default=T_start) "Medium model"; - constant Modelica.SIunits.Temperature T_start=273.15 + 20 "Initial value"; + constant Modelica.Units.SI.Temperature T_start=273.15 + 20 "Initial value"; - parameter Modelica.SIunits.Area AFlo=13.94 "Floor area"; + parameter Modelica.Units.SI.Area AFlo=13.94 "Floor area"; parameter Integer nConExtWin=1 "Number of constructions with a window"; parameter Integer nConExt=0 "Number of constructions without a window"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Examples/MixedAirCO2.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Examples/MixedAirCO2.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Examples/MixedAirCO2.mo" 2021-09-16 11:15:38.962778734 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Examples/MixedAirCO2.mo" 2021-09-16 11:17:54.410328558 +0200 @@ -12,7 +12,7 @@ amplitude=5, startTime=43200)); - parameter Modelica.SIunits.MassFlowRate mOut_flow = 47*2/3600*1.2 + parameter Modelica.Units.SI.MassFlowRate mOut_flow = 47*2/3600*1.2 "Typical outside air mass flow rate, unless increased by controller"; Modelica.Blocks.Math.Gain gaiCO2(k=8.18E-6) "CO2 emission per person" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Examples/MixedAirFreeResponse.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Examples/MixedAirFreeResponse.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Examples/MixedAirFreeResponse.mo" 2021-09-16 11:15:38.962778734 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Examples/MixedAirFreeResponse.mo" 2021-09-16 11:17:54.374328678 +0200 @@ -72,13 +72,13 @@ parameter String weaFil = Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos") "Weather data file"; - parameter Modelica.SIunits.Angle lat = Buildings.BoundaryConditions.WeatherData.BaseClasses.getLatitudeTMY3(weaFil) "Latitude"; - parameter Modelica.SIunits.Volume VRoo = 4555.7 "Room volum"; - parameter Modelica.SIunits.Height hRoo = 2.74 "Room height"; - parameter Modelica.SIunits.Length hWin = 1.5 "Height of windows"; + parameter Modelica.Units.SI.Angle lat = Buildings.BoundaryConditions.WeatherData.BaseClasses.getLatitudeTMY3(weaFil) "Latitude"; + parameter Modelica.Units.SI.Volume VRoo = 4555.7 "Room volum"; + parameter Modelica.Units.SI.Height hRoo = 2.74 "Room height"; + parameter Modelica.Units.SI.Length hWin = 1.5 "Height of windows"; parameter Real winWalRat(min=0.01,max=0.99) = 0.33 "Window to wall ratio for exterior walls"; - parameter Modelica.SIunits.Area AFlo = VRoo/hRoo "Floor area"; + parameter Modelica.Units.SI.Area AFlo = VRoo/hRoo "Floor area"; Buildings.ThermalZones.Detailed.MixedAir roo( redeclare package Medium = Medium, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Validation/BESTEST/Cases6xx/Case600FF.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Validation/BESTEST/Cases6xx/Case600FF.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Validation/BESTEST/Cases6xx/Case600FF.mo" 2021-09-16 11:15:38.962778734 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Validation/BESTEST/Cases6xx/Case600FF.mo" 2021-09-16 11:17:53.102332936 +0200 @@ -4,19 +4,19 @@ extends Modelica.Icons.Example; package MediumA = Buildings.Media.Air "Medium model"; - parameter Modelica.SIunits.Angle S_= + parameter Modelica.Units.SI.Angle S_= Buildings.Types.Azimuth.S "Azimuth for south walls"; - parameter Modelica.SIunits.Angle E_= + parameter Modelica.Units.SI.Angle E_= Buildings.Types.Azimuth.E "Azimuth for east walls"; - parameter Modelica.SIunits.Angle W_= + parameter Modelica.Units.SI.Angle W_= Buildings.Types.Azimuth.W "Azimuth for west walls"; - parameter Modelica.SIunits.Angle N_= + parameter Modelica.Units.SI.Angle N_= Buildings.Types.Azimuth.N "Azimuth for north walls"; - parameter Modelica.SIunits.Angle C_= + parameter Modelica.Units.SI.Angle C_= Buildings.Types.Tilt.Ceiling "Tilt for ceiling"; - parameter Modelica.SIunits.Angle F_= + parameter Modelica.Units.SI.Angle F_= Buildings.Types.Tilt.Floor "Tilt for floor"; - parameter Modelica.SIunits.Angle Z_= + parameter Modelica.Units.SI.Angle Z_= Buildings.Types.Tilt.Wall "Tilt for wall"; parameter Integer nConExtWin = 1 "Number of constructions with a window"; parameter Integer nConBou = 1 diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Validation/BaseClasses/SingleZoneFloor.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Validation/BaseClasses/SingleZoneFloor.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Validation/BaseClasses/SingleZoneFloor.mo" 2021-09-16 11:15:38.962778734 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Validation/BaseClasses/SingleZoneFloor.mo" 2021-09-16 11:17:52.718334222 +0200 @@ -2,10 +2,10 @@ model SingleZoneFloor "Model of a building floor as a single zone" replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model for air" annotation (choicesAllMatching=true); - parameter Modelica.SIunits.Angle lat "Latitude"; - parameter Modelica.SIunits.Volume VRoo = 4555.7 "Room volum"; - parameter Modelica.SIunits.Height hRoo = 2.74 "Room height"; - parameter Modelica.SIunits.Length hWin = 1.5 "Height of windows"; + parameter Modelica.Units.SI.Angle lat "Latitude"; + parameter Modelica.Units.SI.Volume VRoo = 4555.7 "Room volum"; + parameter Modelica.Units.SI.Height hRoo = 2.74 "Room height"; + parameter Modelica.Units.SI.Length hWin = 1.5 "Height of windows"; parameter Real winWalRat(min=0.01,max=0.99) = 0.33 "Window to wall ratio for exterior walls"; @@ -186,20 +186,20 @@ annotation (Placement(transformation(extent={{-120,-100},{-100,-80}}))); protected - parameter Modelica.SIunits.Angle S_= Buildings.Types.Azimuth.S + + parameter Modelica.Units.SI.Angle S_= Buildings.Types.Azimuth.S "Azimuth for south walls"; - parameter Modelica.SIunits.Angle E_= Buildings.Types.Azimuth.E + parameter Modelica.Units.SI.Angle E_= Buildings.Types.Azimuth.E "Azimuth for east walls"; - parameter Modelica.SIunits.Angle W_= Buildings.Types.Azimuth.W + parameter Modelica.Units.SI.Angle W_= Buildings.Types.Azimuth.W "Azimuth for west walls"; - parameter Modelica.SIunits.Angle N_= Buildings.Types.Azimuth.N + parameter Modelica.Units.SI.Angle N_= Buildings.Types.Azimuth.N "Azimuth for north walls"; - parameter Modelica.SIunits.Angle F_= Buildings.Types.Tilt.Floor + parameter Modelica.Units.SI.Angle F_= Buildings.Types.Tilt.Floor "Tilt for floor"; - parameter Modelica.SIunits.Angle Z_= Buildings.Types.Tilt.Wall + parameter Modelica.Units.SI.Angle Z_= Buildings.Types.Tilt.Wall "Tilt for wall"; - parameter Modelica.SIunits.Area AFlo = VRoo/hRoo "Floor area"; - + parameter Modelica.Units.SI.Area AFlo = VRoo/hRoo "Floor area"; equation connect(flo.weaBus, weaBus) annotation (Line( points={{21.9,-18.1},{21.9,184},{-166,184},{-166,86}}, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Validation/BaseClasses/SingleZoneFloorHeater.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Validation/BaseClasses/SingleZoneFloorHeater.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Validation/BaseClasses/SingleZoneFloorHeater.mo" 2021-09-16 11:15:38.966778720 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Validation/BaseClasses/SingleZoneFloorHeater.mo" 2021-09-16 11:17:52.450335119 +0200 @@ -5,9 +5,9 @@ replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model for air" annotation (choicesAllMatching=true); - parameter Modelica.SIunits.Volume VRoo + parameter Modelica.Units.SI.Volume VRoo "Room air volume"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flowrate"; Buildings.Controls.OBC.CDL.Interfaces.RealInput TSetRoo( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Validation/Initialization/MixedAir.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Validation/Initialization/MixedAir.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Validation/Initialization/MixedAir.mo" 2021-09-16 11:15:38.966778720 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Validation/Initialization/MixedAir.mo" 2021-09-16 11:17:52.418335226 +0200 @@ -4,7 +4,7 @@ extends Modelica.Icons.Example; package MediumA = Buildings.Media.Air "Medium model"; - parameter Modelica.SIunits.Temperature T_start=273.15-15 "Initial value"; + parameter Modelica.Units.SI.Temperature T_start=273.15-15 "Initial value"; parameter Buildings.HeatTransfer.Data.OpaqueConstructions.Insulation100Concrete200 diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Validation/LBNL_71T/RoomB/ElectroChromicWindow.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Validation/LBNL_71T/RoomB/ElectroChromicWindow.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Validation/LBNL_71T/RoomB/ElectroChromicWindow.mo" 2021-09-16 11:15:38.966778720 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Validation/LBNL_71T/RoomB/ElectroChromicWindow.mo" 2021-09-16 11:17:52.362335414 +0200 @@ -4,7 +4,7 @@ extends Modelica.Icons.Example; package MediumA = Buildings.Media.Air "Medium model"; - parameter Modelica.SIunits.Temperature T_start=273.15 + 24 "Initial value"; + parameter Modelica.Units.SI.Temperature T_start=273.15 + 24 "Initial value"; parameter Integer nConExtWin=1 "Number of constructions with a window"; parameter Integer nConExt=0 "Number of constructions without a window"; @@ -199,7 +199,7 @@ annotation (Placement(transformation(extent={{36,-102},{60,-78}}))); Controls.Continuous.LimPID conHea( Td=60, - initType=Modelica.Blocks.Types.InitPID.InitialState, + initType=Modelica.Blocks.Types.Init.InitialState, controllerType=Modelica.Blocks.Types.SimpleController.PI, yMin=-1, k=5, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Validation/SingleZoneFloorWithHeating.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Validation/SingleZoneFloorWithHeating.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Validation/SingleZoneFloorWithHeating.mo" 2021-09-16 11:15:38.966778720 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/Detailed/Validation/SingleZoneFloorWithHeating.mo" 2021-09-16 11:17:52.282335682 +0200 @@ -3,26 +3,26 @@ "Validation model for SingleZoneFloor with heating and control" extends Modelica.Icons.Example; package Medium = Buildings.Media.Air "Buildings library air media package"; - parameter Modelica.SIunits.Angle lat=41.98*3.14159/180 + parameter Modelica.Units.SI.Angle lat=41.98*3.14159/180 "Latitude of site location"; - parameter Modelica.SIunits.Area AFloCor=flo.cor.AFlo "Floor area corridor"; - parameter Modelica.SIunits.Area AFloSou=flo.sou.AFlo "Floor area south"; - parameter Modelica.SIunits.Area AFloNor=flo.nor.AFlo "Floor area north"; - parameter Modelica.SIunits.Area AFloEas=flo.eas.AFlo "Floor area east"; - parameter Modelica.SIunits.Area AFloWes=flo.wes.AFlo "Floor area west"; + parameter Modelica.Units.SI.Area AFloCor=flo.cor.AFlo "Floor area corridor"; + parameter Modelica.Units.SI.Area AFloSou=flo.sou.AFlo "Floor area south"; + parameter Modelica.Units.SI.Area AFloNor=flo.nor.AFlo "Floor area north"; + parameter Modelica.Units.SI.Area AFloEas=flo.eas.AFlo "Floor area east"; + parameter Modelica.Units.SI.Area AFloWes=flo.wes.AFlo "Floor area west"; - parameter Modelica.SIunits.Volume VRooCor=AFloCor*flo.hRoo + parameter Modelica.Units.SI.Volume VRooCor=AFloCor*flo.hRoo "Room volume corridor"; - parameter Modelica.SIunits.Volume VRooSou=AFloSou*flo.hRoo + parameter Modelica.Units.SI.Volume VRooSou=AFloSou*flo.hRoo "Room volume south"; - parameter Modelica.SIunits.Volume VRooNor=AFloNor*flo.hRoo + parameter Modelica.Units.SI.Volume VRooNor=AFloNor*flo.hRoo "Room volume north"; - parameter Modelica.SIunits.Volume VRooEas=AFloEas*flo.hRoo + parameter Modelica.Units.SI.Volume VRooEas=AFloEas*flo.hRoo "Room volume east"; - parameter Modelica.SIunits.Volume VRooWes=AFloWes*flo.hRoo + parameter Modelica.Units.SI.Volume VRooWes=AFloWes*flo.hRoo "Room volume west"; - parameter Modelica.SIunits.Volume VRoo=VRooSou+VRooEas+VRooNor+VRooWes+VRooCor + parameter Modelica.Units.SI.Volume VRoo=VRooSou+VRooEas+VRooNor+VRooWes+VRooCor "Total floor volume"; Buildings.Examples.VAVReheat.ThermalZones.Floor flo( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/EquivalentAirTemperature/BaseClasses/PartialVDI6007.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/EquivalentAirTemperature/BaseClasses/PartialVDI6007.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/EquivalentAirTemperature/BaseClasses/PartialVDI6007.mo" 2021-09-16 11:15:38.966778720 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/EquivalentAirTemperature/BaseClasses/PartialVDI6007.mo" 2021-09-16 11:17:52.018336565 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/EquivalentAirTemperature/VDI6007WithWindow.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/EquivalentAirTemperature/VDI6007WithWindow.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/EquivalentAirTemperature/VDI6007WithWindow.mo" 2021-09-16 11:15:38.966778720 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/EquivalentAirTemperature/VDI6007WithWindow.mo" 2021-09-16 11:17:51.970336726 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElementsTraceSubstance.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElementsTraceSubstance.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElementsTraceSubstance.mo" 2021-09-16 11:15:38.966778720 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElementsTraceSubstance.mo" 2021-09-16 11:17:51.762337422 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/RC/BaseClasses/ExteriorWall.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/RC/BaseClasses/ExteriorWall.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/RC/BaseClasses/ExteriorWall.mo" 2021-09-16 11:15:38.966778720 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/RC/BaseClasses/ExteriorWall.mo" 2021-09-16 11:17:51.598337971 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/RC/BaseClasses/InteriorWall.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/RC/BaseClasses/InteriorWall.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/RC/BaseClasses/InteriorWall.mo" 2021-09-16 11:15:38.966778720 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/RC/BaseClasses/InteriorWall.mo" 2021-09-16 11:17:51.566338078 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/RC/BaseClasses/splitFacVal.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/RC/BaseClasses/splitFacVal.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/RC/BaseClasses/splitFacVal.mo" 2021-09-16 11:15:38.966778720 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/RC/BaseClasses/splitFacVal.mo" 2021-09-16 11:17:51.522338225 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/RC/FourElements.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/RC/FourElements.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/RC/FourElements.mo" 2021-09-16 11:15:38.966778720 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/RC/FourElements.mo" 2021-09-16 11:17:51.510338266 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/RC/OneElement.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/RC/OneElement.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/RC/OneElement.mo" 2021-09-16 11:15:38.966778720 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/RC/OneElement.mo" 2021-09-16 11:17:51.466338413 +0200 @@ -2,9 +2,9 @@ model OneElement "Thermal Zone with one element for exterior walls" extends Buildings.Fluid.Interfaces.LumpedVolumeDeclarations; - parameter Modelica.SIunits.Volume VAir "Air volume of the zone" + parameter Modelica.Units.SI.Volume VAir "Air volume of the zone" annotation(Dialog(group="Thermal zone")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer hRad + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hRad "Coefficient of heat transfer for linearized radiation exchange between walls" annotation(Dialog(group="Thermal zone")); parameter Integer nOrientations(min=1) "Number of orientations" @@ -12,18 +12,18 @@ parameter Integer nPorts=0 "Number of fluid ports" annotation(Evaluate=true, Dialog(connectorSizing=true, tab="General",group="Ports")); - parameter Modelica.SIunits.Area AWin[nOrientations] + parameter Modelica.Units.SI.Area AWin[nOrientations] "Vector of areas of windows by orientations" annotation(Dialog(group="Windows")); - parameter Modelica.SIunits.Area ATransparent[nOrientations] "Vector of areas of transparent (solar radiation transmittend) elements by + parameter Modelica.Units.SI.Area ATransparent[nOrientations] "Vector of areas of transparent (solar radiation transmittend) elements by orientations" annotation(Dialog(group="Windows")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConWin + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConWin "Convective coefficient of heat transfer of windows (indoor)" annotation(Dialog(group="Windows")); - parameter Modelica.SIunits.ThermalResistance RWin "Resistor for windows" + parameter Modelica.Units.SI.ThermalResistance RWin "Resistor for windows" annotation(Dialog(group="Windows")); - parameter Modelica.SIunits.TransmissionCoefficient gWin + parameter Modelica.Units.SI.TransmissionCoefficient gWin "Total energy transmittance of windows" annotation(Dialog(group="Windows")); parameter Real ratioWinConRad @@ -32,23 +32,23 @@ parameter Boolean indoorPortWin = false "Additional heat port at indoor surface of windows" annotation(Dialog(group="Windows"),choices(checkBox = true)); - parameter Modelica.SIunits.Area AExt[nOrientations] + parameter Modelica.Units.SI.Area AExt[nOrientations] "Vector of areas of exterior walls by orientations" annotation(Dialog(group="Exterior walls")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConExt + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConExt "Convective coefficient of heat transfer of exterior walls (indoor)" annotation(Dialog(group="Exterior walls")); parameter Integer nExt(min = 1) "Number of RC-elements of exterior walls" annotation(Dialog(group="Exterior walls")); - parameter Modelica.SIunits.ThermalResistance RExt[nExt]( + parameter Modelica.Units.SI.ThermalResistance RExt[nExt]( each min=Modelica.Constants.small) "Vector of resistances of exterior walls, from inside to outside" annotation(Dialog(group="Exterior walls")); - parameter Modelica.SIunits.ThermalResistance RExtRem( + parameter Modelica.Units.SI.ThermalResistance RExtRem( min=Modelica.Constants.small) "Resistance of remaining resistor RExtRem between capacity n and outside" annotation(Dialog(group="Exterior walls")); - parameter Modelica.SIunits.HeatCapacity CExt[nExt]( + parameter Modelica.Units.SI.HeatCapacity CExt[nExt]( each min=Modelica.Constants.small) "Vector of heat capacities of exterior walls, from inside to outside" annotation(Dialog(group="Exterior walls")); @@ -201,14 +201,14 @@ annotation (Placement(transformation(extent={{-280,70},{-240,110}}), iconTransformation(extent={{-260,90},{-240,110}}))); protected - constant Modelica.SIunits.SpecificEnergy h_fg= + constant Modelica.Units.SI.SpecificEnergy h_fg= Buildings.Media.Air.enthalpyOfCondensingGas(273.15+37) "Latent heat of water vapor"; - parameter Modelica.SIunits.Area ATot=sum(AArray) "Sum of wall surface areas"; - parameter Modelica.SIunits.Area ATotExt=sum(AExt) + parameter Modelica.Units.SI.Area ATot=sum(AArray) "Sum of wall surface areas"; + parameter Modelica.Units.SI.Area ATotExt=sum(AExt) "Sum of exterior wall surface areas"; - parameter Modelica.SIunits.Area ATotWin=sum(AWin) + parameter Modelica.Units.SI.Area ATotWin=sum(AWin) "Sum of window surface areas"; - parameter Modelica.SIunits.Area[:] AArray = {ATotExt, ATotWin} + parameter Modelica.Units.SI.Area[:] AArray = {ATotExt, ATotWin} "List of all wall surface areas"; parameter Integer dimension = sum({if A>0 then 1 else 0 for A in AArray}) "Number of non-zero wall surface areas"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/RC/ThreeElements.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/RC/ThreeElements.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/RC/ThreeElements.mo" 2021-09-16 11:15:38.966778720 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/RC/ThreeElements.mo" 2021-09-16 11:17:51.326338882 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/RC/TwoElements.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/RC/TwoElements.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/RC/TwoElements.mo" 2021-09-16 11:15:38.966778720 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/RC/TwoElements.mo" 2021-09-16 11:17:51.282339029 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/SolarGain/BaseClasses/PartialCorrectionG.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/SolarGain/BaseClasses/PartialCorrectionG.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/SolarGain/BaseClasses/PartialCorrectionG.mo" 2021-09-16 11:15:38.966778720 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/SolarGain/BaseClasses/PartialCorrectionG.mo" 2021-09-16 11:17:51.214339256 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/SolarGain/CorrectionGDoublePane.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/SolarGain/CorrectionGDoublePane.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/SolarGain/CorrectionGDoublePane.mo" 2021-09-16 11:15:38.966778720 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/SolarGain/CorrectionGDoublePane.mo" 2021-09-16 11:17:51.198339310 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/Validation/VDI6007/BaseClasses/VerifyDifferenceThreePeriods.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/Validation/VDI6007/BaseClasses/VerifyDifferenceThreePeriods.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/Validation/VDI6007/BaseClasses/VerifyDifferenceThreePeriods.mo" 2021-09-16 11:15:38.966778720 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/ThermalZones/ReducedOrder/Validation/VDI6007/BaseClasses/VerifyDifferenceThreePeriods.mo" 2021-09-16 11:17:50.922340234 +0200 @@ -2,15 +2,15 @@ block VerifyDifferenceThreePeriods "Assert when condition is violated" extends Buildings.Utilities.Diagnostics.BaseClasses.PartialInputCheck( message="Inputs differ by more than threShold.\n Check output 'satisfied' for when violation(s) happened."); - parameter Modelica.SIunits.Time endTime = 0 + parameter Modelica.Units.SI.Time endTime = 0 "Start time for deactivating the assert (period one)"; - parameter Modelica.SIunits.Time startTime2 = 0 + parameter Modelica.Units.SI.Time startTime2 = 0 "Start time for activating the assert (period two)"; - parameter Modelica.SIunits.Time endTime2 = 0 + parameter Modelica.Units.SI.Time endTime2 = 0 "Start time for deactivating the assert (period two)"; - parameter Modelica.SIunits.Time startTime3 = 0 + parameter Modelica.Units.SI.Time startTime3 = 0 "Start time for activating the assert (period three)"; - parameter Modelica.SIunits.Time endTime3 = 0 + parameter Modelica.Units.SI.Time endTime3 = 0 "Start time for deactivating the assert (period three)"; 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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Types/Azimuth/package.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Types/Azimuth/package.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Types/Azimuth/package.mo" 2021-09-16 11:15:38.966778720 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Types/Azimuth/package.mo" 2021-09-16 11:17:50.442341840 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Types/Tilt/package.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Types/Tilt/package.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Types/Tilt/package.mo" 2021-09-16 11:15:38.970778706 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Types/Tilt/package.mo" 2021-09-16 11:17:50.414341934 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Comfort/Fanger.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Comfort/Fanger.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Comfort/Fanger.mo" 2021-09-16 11:15:38.970778706 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Comfort/Fanger.mo" 2021-09-16 11:17:49.842343848 +0200 @@ -7,9 +7,9 @@ Modelica.Blocks.Interfaces.RealOutput PPD "PPD [0.05...1]" annotation (Placement(transformation(extent={{100,-50},{120,-30}}))); - parameter Modelica.SIunits.HeatFlux W(max=0)=0 + parameter Modelica.Units.SI.HeatFlux W(max=0)=0 "Rate of mechanical work accomplished (must be non-positive, typically equal to 0)"; - parameter Modelica.SIunits.CoefficientOfHeatTransfer hRad( + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hRad( min=0, max=10)=0.8*4.7 "Radiative heat transfer coefficient"; @@ -30,14 +30,14 @@ annotation(Evaluate=true, HideResult=true, Dialog(group="Conditional inputs")); - parameter Modelica.SIunits.Velocity vAir= 0.05 "Fixed value for air velocity" + parameter Modelica.Units.SI.Velocity vAir= 0.05 "Fixed value for air velocity" annotation (Dialog(enable = not use_vAir_in, group="Conditional inputs")); - parameter Modelica.SIunits.HeatFlux M = 60 "Fixed value for metabolic rate" + parameter Modelica.Units.SI.HeatFlux M = 60 "Fixed value for metabolic rate" annotation (Dialog(enable = not use_M_in, group="Conditional inputs")); parameter Real ICl = 0.7 "Fixed value for clothing insulation in units of clo (summer=0.5; winter=0.9)" annotation (Dialog(enable = not use_ICl_in, group="Conditional inputs")); - parameter Modelica.SIunits.Pressure pAir = 101325 + parameter Modelica.Units.SI.Pressure pAir = 101325 "Fixed value for air pressure" annotation (Dialog(enable = not use_pAir_in, group="Conditional inputs")); @@ -53,9 +53,9 @@ Placement(transformation(extent={{-120,50},{-100,70}}), iconTransformation(extent={{-120,50},{-100,70}}))); - Modelica.SIunits.Temperature TOpe "Operative temperature"; - Modelica.SIunits.Temperature TClo(start=273.15+40) "Surface temperature of clothing"; - Modelica.SIunits.Temperature TSki( + Modelica.Units.SI.Temperature TOpe "Operative temperature"; + Modelica.Units.SI.Temperature TClo(start=273.15+40) "Surface temperature of clothing"; + Modelica.Units.SI.Temperature TSki( min=273.15+10, max=273.15+42) "Skin temperature"; @@ -87,21 +87,21 @@ Placement(transformation(extent={{-120,-50},{-100,-30}}), iconTransformation(extent={{-120,-50},{-100,-30}}))); - Modelica.SIunits.CoefficientOfHeatTransfer hCom( + Modelica.Units.SI.CoefficientOfHeatTransfer hCom( min=0, max=10) "Combined heat transfer coefficient"; - Modelica.SIunits.CoefficientOfHeatTransfer hCon( + Modelica.Units.SI.CoefficientOfHeatTransfer hCon( min=0, max=10) "Convective heat transfer coefficient"; - Modelica.SIunits.Pressure pSte( + Modelica.Units.SI.Pressure pSte( min=0, max=3000) "Partial pressure of water vapor in ambient air"; - Modelica.SIunits.HeatFlux L "Thermal load of the body"; + Modelica.Units.SI.HeatFlux L "Thermal load of the body"; Real fCl(min=0) "Clothing area factor (61)"; - Modelica.SIunits.ThermalInsulance RCl "Thermal resistance of clothing (10)"; + Modelica.Units.SI.ThermalInsulance RCl "Thermal resistance of clothing (10)"; protected Buildings.Utilities.Psychrometrics.X_pTphi steRat diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Diagnostics/BaseClasses/PartialInputCheck.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Diagnostics/BaseClasses/PartialInputCheck.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Diagnostics/BaseClasses/PartialInputCheck.mo" 2021-09-16 11:15:38.970778706 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Diagnostics/BaseClasses/PartialInputCheck.mo" 2021-09-16 11:17:49.650344490 +0200 @@ -1,7 +1,7 @@ within Buildings.Utilities.Diagnostics.BaseClasses; block PartialInputCheck "Assert when condition is violated" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Time startTime = 0 + parameter Modelica.Units.SI.Time startTime = 0 "Start time for activating the assert"; parameter Real threShold(min=0)=1E-2 "Threshold for equality comparison"; parameter String message = "Inputs differ by more than threShold"; @@ -10,7 +10,7 @@ Modelica.Blocks.Interfaces.RealInput u2 "Value to check" annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}))); protected - parameter Modelica.SIunits.Time t0( fixed=false) "Simulation start time"; + parameter Modelica.Units.SI.Time t0( fixed=false) "Simulation start time"; initial equation t0 = time + startTime; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Diagnostics/Validation/CheckEquality.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Diagnostics/Validation/CheckEquality.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Diagnostics/Validation/CheckEquality.mo" 2021-09-16 11:15:38.970778706 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Diagnostics/Validation/CheckEquality.mo" 2021-09-16 11:17:49.618344598 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/BCVTB/BCVTB.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/BCVTB/BCVTB.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/BCVTB/BCVTB.mo" 2021-09-16 11:15:38.970778706 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/BCVTB/BCVTB.mo" 2021-09-16 11:17:49.594344678 +0200 @@ -6,7 +6,7 @@ parameter Boolean activateInterface = true "Set to false to deactivate interface and use instead yFixed as output" annotation(Evaluate = true); - parameter Modelica.SIunits.Time timeStep + parameter Modelica.Units.SI.Time timeStep "Time step used for the synchronization" annotation(Dialog(enable = activateInterface)); parameter String xmlFileName = "socket.cfg" @@ -32,7 +32,7 @@ annotation (Placement(transformation(extent={{100,-10},{120,10}}))); Integer flaRea "Flag received from BCVTB"; - Modelica.SIunits.Time simTimRea + Modelica.Units.SI.Time simTimRea "Current simulation time received from the BCVTB"; Integer retVal "Return value from the BSD socket data exchange"; protected diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/BCVTB/BaseClasses/FluidInterface.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/BCVTB/BaseClasses/FluidInterface.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/BCVTB/BaseClasses/FluidInterface.mo" 2021-09-16 11:15:38.970778706 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/BCVTB/BaseClasses/FluidInterface.mo" 2021-09-16 11:17:49.542344852 +0200 @@ -17,14 +17,14 @@ parameter Boolean use_m_flow_in = false "Get the mass flow rate from the input connector" annotation(Evaluate=true, HideResult=true); - parameter Modelica.SIunits.MassFlowRate m_flow = 0 + parameter Modelica.Units.SI.MassFlowRate m_flow = 0 "Fixed mass flow rate going out of the fluid port" annotation (Dialog(enable = not use_m_flow_in)); - parameter Modelica.SIunits.MassFlowRate m_flow_nominal(min=0) + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal(min=0) "Nominal mass flow rate, used for regularization near zero flow" annotation(Dialog(group = "Nominal condition")); - parameter Modelica.SIunits.MassFlowRate m_flow_small(min=0) = 1E-4*m_flow_nominal + parameter Modelica.Units.SI.MassFlowRate m_flow_small(min=0) = 1E-4*m_flow_nominal "For bi-directional flow, temperature is regularized in the region |m_flow| < m_flow_small (m_flow_small > 0 required)" annotation(Dialog(group="Advanced")); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/BCVTB/BaseClasses/exchangeReals.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/BCVTB/BaseClasses/exchangeReals.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/BCVTB/BaseClasses/exchangeReals.mo" 2021-09-16 11:15:38.970778706 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/BCVTB/BaseClasses/exchangeReals.mo" 2021-09-16 11:17:49.314345615 +0200 @@ -3,13 +3,13 @@ input Integer socketFD(min=1) "Socket file descripter"; input Integer flaWri "Communication flag to write to the socket stream"; - input Modelica.SIunits.Time simTimWri + input Modelica.Units.SI.Time simTimWri "Current simulation time in seconds to write"; input Real[nDblWri] dblValWri "Double values to write"; input Integer nDblWri "Number of double values to write"; input Integer nDblRea "Number of double values to read"; output Integer flaRea "Communication flag read from the socket stream"; - output Modelica.SIunits.Time simTimRea + output Modelica.Units.SI.Time simTimRea "Current simulation time in seconds read from socket"; output Real[nDblRea] dblValRea "Double values read from socket"; output Integer retVal "The exit value, which is negative if an error occurred"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/BCVTB/Examples/MoistAir.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/BCVTB/Examples/MoistAir.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/BCVTB/Examples/MoistAir.mo" 2021-09-16 11:15:38.970778706 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/BCVTB/Examples/MoistAir.mo" 2021-09-16 11:17:49.294345682 +0200 @@ -3,7 +3,7 @@ "Model with interfaces for media with moist air that will be linked to the BCVTB which models the response of the room" extends Modelica.Icons.Example; package Medium = Buildings.Media.Air; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 259.2*6/1.2/3600 "Nominal mass flow rate"; Buildings.Fluid.FixedResistances.PressureDrop dp1( redeclare package Medium = Medium, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/BCVTB/Examples/TwoRooms.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/BCVTB/Examples/TwoRooms.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/BCVTB/Examples/TwoRooms.mo" 2021-09-16 11:15:38.970778706 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/BCVTB/Examples/TwoRooms.mo" 2021-09-16 11:17:49.234345883 +0200 @@ -2,11 +2,11 @@ model TwoRooms "Thermal model of two rooms that will be linked to the BCVTB which models the controls" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Time tau = 2*3600 "Room time constant"; - parameter Modelica.SIunits.HeatFlowRate Q_flow_nom = 100 "Nominal heat flow"; - parameter Modelica.SIunits.ThermalConductance UA = Q_flow_nom / 20 + parameter Modelica.Units.SI.Time tau = 2*3600 "Room time constant"; + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nom = 100 "Nominal heat flow"; + parameter Modelica.Units.SI.ThermalConductance UA = Q_flow_nom / 20 "Thermal conductance of room"; - parameter Modelica.SIunits.Temperature TStart = 283.15 "Start temperature"; + parameter Modelica.Units.SI.Temperature TStart = 283.15 "Start temperature"; Modelica.Thermal.HeatTransfer.Components.HeatCapacitor C1(C=tau*UA, T(start= TStart, fixed=true)) "Heat capacity of room" annotation (Placement(transformation(extent={{70,70},{90,90}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/BCVTB/From_degC.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/BCVTB/From_degC.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/BCVTB/From_degC.mo" 2021-09-16 11:15:38.970778706 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/BCVTB/From_degC.mo" 2021-09-16 11:17:49.202345990 +0200 @@ -13,7 +13,8 @@ annotation (Placement(transformation(extent={{100,-12},{120,8}}), iconTransformation(extent={{100,-12},{120,8}}))); equation - Celsius = Modelica.SIunits.Conversions.to_degC(Kelvin); + Celsius = Modelica.Units.Conversions.to_degC(Kelvin); + annotation ( defaultComponentName="froDegC", Documentation(info=" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/BCVTB/To_degC.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/BCVTB/To_degC.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/BCVTB/To_degC.mo" 2021-09-16 11:15:38.970778706 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/BCVTB/To_degC.mo" 2021-09-16 11:17:49.174346084 +0200 @@ -13,7 +13,8 @@ annotation (Placement(transformation(extent={{100,-10},{120,10}}), iconTransformation(extent={{100,-10},{120,10}}))); equation - Kelvin = Modelica.SIunits.Conversions.from_degC(Celsius); + Kelvin = Modelica.Units.Conversions.from_degC(Celsius); + annotation ( defaultComponentName="toDegC", Documentation(info=" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/FLEXLAB/CalBayComm.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/FLEXLAB/CalBayComm.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/FLEXLAB/CalBayComm.mo" 2021-09-16 11:15:38.970778706 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/FLEXLAB/CalBayComm.mo" 2021-09-16 11:17:49.142346191 +0200 @@ -3,7 +3,7 @@ "Model calling a Python script to communicate with the CalBay adapter" extends Modelica.Icons.Example; extends Modelica.Icons.UnderConstruction; - parameter Modelica.SIunits.Time samplePeriod = 30 + parameter Modelica.Units.SI.Time samplePeriod = 30 "Sample period for communication"; Modelica.Blocks.Sources.CombiTimeTable setPoint( @@ -32,7 +32,7 @@ annotation (Placement(transformation(extent={{0,-10},{20,10}}))); block lightingController "Block for control law" extends Modelica.Blocks.Interfaces.SISO; - parameter Modelica.SIunits.Time samplePeriod "Sample period of component"; + parameter Modelica.Units.SI.Time samplePeriod "Sample period of component"; Modelica.Blocks.Math.Gain gain(k=10) annotation (Placement(transformation(extent={{-68,-10},{-48,10}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/Files/BaseClasses/FileWriter.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/Files/BaseClasses/FileWriter.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/Files/BaseClasses/FileWriter.mo" 2021-09-16 11:15:38.970778706 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/Files/BaseClasses/FileWriter.mo" 2021-09-16 11:17:49.098346338 +0200 @@ -7,7 +7,7 @@ annotation(Evaluate=true, Dialog(connectorSizing=true)); parameter String fileName = getInstanceName() + ".csv" "File name, including extension"; - parameter Modelica.SIunits.Time samplePeriod + parameter Modelica.Units.SI.Time samplePeriod "Sample period: equidistant interval for which the inputs are saved"; parameter String delimiter = "\t" "Delimiter for csv file" @@ -29,7 +29,7 @@ parameter Boolean isCombiTimeTable = false "=true, if CombiTimeTable header should be prepended upon destruction" annotation(Evaluate=true); - parameter Modelica.SIunits.Time t0(fixed=false) + parameter Modelica.Units.SI.Time t0(fixed=false) "First sample time instant"; parameter String insNam = getInstanceName() "Instance name"; Buildings.Utilities.IO.Files.BaseClasses.FileWriterObject filWri= diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/Files/Examples/BaseClasses/PartialCSV.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/Files/Examples/BaseClasses/PartialCSV.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/Files/Examples/BaseClasses/PartialCSV.mo" 2021-09-16 11:15:38.970778706 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/Files/Examples/BaseClasses/PartialCSV.mo" 2021-09-16 11:17:48.958346806 +0200 @@ -1,7 +1,7 @@ within Buildings.Utilities.IO.Files.Examples.BaseClasses; model PartialCSV "Base model for CSV reader and writer example" extends Modelica.Icons.Example; - Modelica.Blocks.Sources.Cosine cos(freqHz=0.345) "Cosine" + Modelica.Blocks.Sources.Cosine cos(f =0.345) "Cosine" annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); Modelica.Blocks.Sources.Step step(startTime=5) "Step function" annotation (Placement(transformation(extent={{-80,-40},{-60,-20}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/Files/Examples/JSONWriter.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/Files/Examples/JSONWriter.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/Files/Examples/JSONWriter.mo" 2021-09-16 11:15:38.970778706 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/Files/Examples/JSONWriter.mo" 2021-09-16 11:17:48.926346913 +0200 @@ -25,7 +25,7 @@ offset=1) "Ramp signal" annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); Modelica.Blocks.Sources.Constant const(k=2) "Constant signal" annotation (Placement(transformation(extent={{-80,-10},{-60,10}}))); - Modelica.Blocks.Sources.Cosine cosine(amplitude=1, freqHz=12) "Cosine signal" + Modelica.Blocks.Sources.Cosine cosine(amplitude=1, f =12) "Cosine signal" annotation (Placement(transformation(extent={{-80,-40},{-60,-20}}))); Buildings.Utilities.IO.Files.JSONWriter jsonWriterOneVar(nin=1, fileName="TerminalOutput.json") "Single variable output" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/Files/Examples/Printer.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/Files/Examples/Printer.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/Files/Examples/Printer.mo" 2021-09-16 11:15:38.970778706 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/Files/Examples/Printer.mo" 2021-09-16 11:17:48.906346980 +0200 @@ -6,7 +6,7 @@ nin=2, samplePeriod=0.1) annotation (Placement(transformation(extent={{-20,40}, {0,60}}))); - Modelica.Blocks.Sources.Clock clo annotation (Placement(transformation(extent= + Modelica.Blocks.Sources.ContinuousClock clo annotation (Placement(transformation(extent= {{-80,40},{-60,60}}))); Modelica.Blocks.Sources.Ramp ram(duration=2) annotation (Placement(transformation(extent= diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/Files/JSONWriter.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/Files/JSONWriter.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/Files/JSONWriter.mo" 2021-09-16 11:15:38.970778706 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/Files/JSONWriter.mo" 2021-09-16 11:17:48.886347048 +0200 @@ -12,7 +12,7 @@ Buildings.Utilities.IO.Files.BaseClasses.OutputTime.Terminal "Time when results are written to file" annotation(Evaluate=true); - parameter Modelica.SIunits.Time customTime = 0 + parameter Modelica.Units.SI.Time customTime = 0 "Custom time when results are stored, used if outputTime=Custom only" annotation(Dialog(enable=outputTime==Buildings.Utilities.IO.Files.BaseClasses.OutputTime.Custom)); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/Python36/Examples/KalmanFilter.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/Python36/Examples/KalmanFilter.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/Python36/Examples/KalmanFilter.mo" 2021-09-16 11:15:38.970778706 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/Python36/Examples/KalmanFilter.mo" 2021-09-16 11:17:48.834347222 +0200 @@ -9,7 +9,7 @@ moduleName="KalmanFilter", samplePeriod=samplePeriod) "Generate a random number in Python" annotation (Placement(transformation(extent={{-40,0},{-20,20}}))); - Modelica.Blocks.Sources.Clock clock + Modelica.Blocks.Sources.ContinuousClock clock annotation (Placement(transformation(extent={{-80,0},{-60,20}}))); Real_Real kalFil( moduleName="KalmanFilter", @@ -19,9 +19,9 @@ samplePeriod=samplePeriod) "Kalman filter in Python" annotation (Placement(transformation(extent={{60,20},{80,40}}))); - parameter Modelica.SIunits.Time samplePeriod=0.001 + parameter Modelica.Units.SI.Time samplePeriod=0.001 "Sample period of component"; - Modelica.Blocks.Sources.Sine sine(freqHz=1) "Sine wave" + Modelica.Blocks.Sources.Sine sine(f =1) "Sine wave" annotation (Placement(transformation(extent={{-40,40},{-20,60}}))); Modelica.Blocks.Math.Add add "Addition of signals before sending it to the Kalman filter" diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/Python36/Examples/SimpleRoom.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/Python36/Examples/SimpleRoom.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/Python36/Examples/SimpleRoom.mo" 2021-09-16 11:15:38.970778706 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/IO/Python36/Examples/SimpleRoom.mo" 2021-09-16 11:17:48.814347288 +0200 @@ -28,7 +28,7 @@ amplitude=5, offset=283.15, y(unit="K", displayUnit="degC"), - freqHz=1/86400, +f =1/86400, phase=-1.5707963267949) "Ambient temperature" annotation (Placement(transformation(extent={{-80,30},{-60,50}}))); equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Math/Examples/SmoothBlocks.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Math/Examples/SmoothBlocks.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Math/Examples/SmoothBlocks.mo" 2021-09-16 11:15:38.974778693 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Math/Examples/SmoothBlocks.mo" 2021-09-16 11:17:47.898350353 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Math/Examples/SmoothLimit.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Math/Examples/SmoothLimit.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Math/Examples/SmoothLimit.mo" 2021-09-16 11:15:38.974778693 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Math/Examples/SmoothLimit.mo" 2021-09-16 11:17:47.834350567 +0200 @@ -1,7 +1,7 @@ within Buildings.Utilities.Math.Examples; model SmoothLimit "Test model for smooth limit" extends Modelica.Icons.Example; - Modelica.Blocks.Sources.Sine sine(freqHz=8) + Modelica.Blocks.Sources.Sine sine(f =8) annotation (Placement(transformation(extent={{-40,0},{-20,20}}))); Buildings.Utilities.Math.SmoothLimit smoLim( deltaX=0.001, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Math/Examples/Splice.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Math/Examples/Splice.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Math/Examples/Splice.mo" 2021-09-16 11:15:38.974778693 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Math/Examples/Splice.mo" 2021-09-16 11:17:47.782350742 +0200 @@ -3,7 +3,7 @@ extends Modelica.Icons.Example; Buildings.Utilities.Math.Splice splice(deltax=0.2) annotation (Placement(transformation(extent={{0,0},{20,20}}))); - Modelica.Blocks.Sources.Sine sine(freqHz=0.5) + Modelica.Blocks.Sources.Sine sine(f =0.5) annotation (Placement(transformation(extent={{-60,0},{-40,20}}))); Modelica.Blocks.Sources.Constant const1(k=-0.5) annotation (Placement(transformation(extent={{-60,-40},{-40,-20}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Math/Examples/VectorFunctions.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Math/Examples/VectorFunctions.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Math/Examples/VectorFunctions.mo" 2021-09-16 11:15:38.974778693 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Math/Examples/VectorFunctions.mo" 2021-09-16 11:17:47.766350795 +0200 @@ -5,12 +5,12 @@ Buildings.Utilities.Math.Min minVec( nin=3) annotation (Placement(transformation(extent={{-20,20},{0,40}}))); - Modelica.Blocks.Sources.Sine sine(freqHz=6) + Modelica.Blocks.Sources.Sine sine(f =6) annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); Modelica.Blocks.Sources.Sine sine1( - freqHz=8) + f =8) annotation (Placement(transformation(extent={{-80,-20},{-60,0}}))); - Modelica.Blocks.Sources.Sine sine2(freqHz=10) + Modelica.Blocks.Sources.Sine sine2(f =10) annotation (Placement(transformation(extent={{-80,-60},{-60,-40}}))); Buildings.Utilities.Math.Max maxVec( nin=3) diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Plotters/BaseClasses/PartialPlotter.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Plotters/BaseClasses/PartialPlotter.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Plotters/BaseClasses/PartialPlotter.mo" 2021-09-16 11:15:38.974778693 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Plotters/BaseClasses/PartialPlotter.mo" 2021-09-16 11:17:46.326355613 +0200 @@ -7,7 +7,7 @@ parameter String fileName = plotConfiguration.fileName "Name of html file"; - parameter Modelica.SIunits.Time samplePeriod(min=1E-3) = plotConfiguration.samplePeriod + parameter Modelica.Units.SI.Time samplePeriod(min=1E-3) = plotConfiguration.samplePeriod "Sample period of component" annotation(Dialog(group="Activation")); @@ -27,7 +27,7 @@ "Set to true to enable an input that allows activating and deactivating the plotting" annotation(Dialog(group="Activation")); - parameter Modelica.SIunits.Time activationDelay(min=0)=plotConfiguration.activationDelay + parameter Modelica.Units.SI.Time activationDelay(min=0)=plotConfiguration.activationDelay "Time that needs to elapse to enable plotting after activate becomes true" annotation(Dialog(group="Activation")); @@ -42,7 +42,7 @@ iconTransformation(extent={{-140,60},{-100,100}}))); Boolean active "Flag, true if plots record data"; protected - parameter Modelica.SIunits.Time t0(fixed=false) + parameter Modelica.Units.SI.Time t0(fixed=false) "First sample time instant"; parameter String insNam = Modelica.Utilities.Strings.replace( getInstanceName(), ".", "_") @@ -59,7 +59,7 @@ Modelica.Blocks.Interfaces.BooleanInput activate_internal "Internal connector to activate plots"; - discrete Modelica.SIunits.Time tActivateLast "Time when plotter was the last time activated"; + discrete Modelica.Units.SI.Time tActivateLast "Time when plotter was the last time activated"; output Boolean sampleTrigger "True, if sample time instant"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Plotters/Configuration.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Plotters/Configuration.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Plotters/Configuration.mo" 2021-09-16 11:15:38.974778693 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Plotters/Configuration.mo" 2021-09-16 11:17:46.270355800 +0200 @@ -1,7 +1,7 @@ within Buildings.Utilities.Plotters; model Configuration "Configuration for plotters" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Time samplePeriod(min=1E-3) + parameter Modelica.Units.SI.Time samplePeriod(min=1E-3) "Sample period of component"; parameter String fileName = Modelica.Utilities.Files.fullPathName("plots.html") "Name of html file"; @@ -14,7 +14,7 @@ "Set to true to enable an input that allows activating and deactivating the plotting" annotation(Dialog(group="Activation")); - parameter Modelica.SIunits.Time activationDelay(min=0)=0 + parameter Modelica.Units.SI.Time activationDelay(min=0)=0 "Time that needs to elapse to enable plotting after activate becomes true" annotation(Dialog( group="Activation", @@ -29,7 +29,7 @@ protected Modelica.Blocks.Interfaces.BooleanInput activate_internal "Internal connector to activate plots"; - discrete Modelica.SIunits.Time tActivateLast "Time when plotter was the last time activated"; + discrete Modelica.Units.SI.Time tActivateLast "Time when plotter was the last time activated"; initial equation tActivateLast = time-2*activationDelay; equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Plotters/Examples/BaseClasses/CoolingCoilValve.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Plotters/Examples/BaseClasses/CoolingCoilValve.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Plotters/Examples/BaseClasses/CoolingCoilValve.mo" 2021-09-16 11:15:38.974778693 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Plotters/Examples/BaseClasses/CoolingCoilValve.mo" 2021-09-16 11:17:46.198356041 +0200 @@ -13,11 +13,11 @@ "Unit converter for controller gains from the ALC control logic" annotation(Evaluate=true, Dialog(tab="Advanced", group="Parameters")); - parameter Modelica.SIunits.Temperature TOutCooCut = 50 * (5/9) - 32 * (5/9) + 273.15 + parameter Modelica.Units.SI.Temperature TOutCooCut = 50 * (5/9) - 32 * (5/9) + 273.15 "Recorded outdoor air temperature cooling threshold" annotation(Evaluate=true, Dialog(group="Enable")); - parameter Modelica.SIunits.Temperature TOutDelta = 2 * (5/9) - 32 * (5/9) + 273.15 + parameter Modelica.Units.SI.Temperature TOutDelta = 2 * (5/9) - 32 * (5/9) + 273.15 "Recorded outdoor air temperature cooling threshold hysteresis delta" annotation(Evaluate=true, Dialog(group="Enable")); @@ -29,15 +29,15 @@ "Recorded fan feedback threshold hysteresis delta" annotation(Evaluate=true, Dialog(group="Enable")); - parameter Modelica.SIunits.Temperature TSupHighLim = 50 * (5/9) - 32 * (5/9) + 273.15 + parameter Modelica.Units.SI.Temperature TSupHighLim = 50 * (5/9) - 32 * (5/9) + 273.15 "Recorded minimum supply air temperature for defining the upper limit of the valve position" annotation(Evaluate=true, Dialog(group="Controller")); - parameter Modelica.SIunits.Temperature TSupHigLim = 42 * (5/9) - 32 * (5/9) + 273.15 + parameter Modelica.Units.SI.Temperature TSupHigLim = 42 * (5/9) - 32 * (5/9) + 273.15 "Recorded maximum supply air temperature for defining the upper limit of the valve position" annotation(Evaluate=true, Dialog(group="Controller")); - parameter Modelica.SIunits.Time interval(min = 1) = 15 + parameter Modelica.Units.SI.Time interval(min = 1) = 15 "Recorded interval at which integration part of the output gets updated" annotation(Evaluate=true, Dialog(group="Controller")); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/BaseClasses/HumidityRatioVaporPressure.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/BaseClasses/HumidityRatioVaporPressure.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/BaseClasses/HumidityRatioVaporPressure.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/BaseClasses/HumidityRatioVaporPressure.mo" 2021-09-16 11:17:45.634357928 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Constants.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Constants.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Constants.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Constants.mo" 2021-09-16 11:17:45.618357981 +0200 @@ -1,15 +1,15 @@ within Buildings.Utilities.Psychrometrics; package Constants "Library of constants for psychometric functions" extends Modelica.Icons.Package; - constant Modelica.SIunits.Temperature T_ref = 273.15 + constant Modelica.Units.SI.Temperature T_ref = 273.15 "Reference temperature for psychrometric calculations"; - constant Modelica.SIunits.SpecificHeatCapacity cpAir=1006 + constant Modelica.Units.SI.SpecificHeatCapacity cpAir=1006 "Specific heat capacity of air"; - constant Modelica.SIunits.SpecificHeatCapacity cpSte=1860 + constant Modelica.Units.SI.SpecificHeatCapacity cpSte=1860 "Specific heat capacity of water vapor"; - constant Modelica.SIunits.SpecificHeatCapacity cpWatLiq = 4184 + constant Modelica.Units.SI.SpecificHeatCapacity cpWatLiq = 4184 "Specific heat capacity of liquid water"; - constant Modelica.SIunits.SpecificEnthalpy h_fg = 2501014.5 + constant Modelica.Units.SI.SpecificEnthalpy h_fg = 2501014.5 "Enthalpy of evaporation of water at the reference temperature"; constant Real k_mair = 0.6219647130774989 "Ratio of molar weights"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Examples/TWetBul_TDryBulPhi.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Examples/TWetBul_TDryBulPhi.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Examples/TWetBul_TDryBulPhi.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Examples/TWetBul_TDryBulPhi.mo" 2021-09-16 11:17:45.494358396 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck.mo" 2021-09-16 11:17:45.230359279 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck_amb.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck_amb.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck_amb.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck_amb.mo" 2021-09-16 11:17:45.222359306 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/Examples/InverseDewPointTemperatureDerivativeCheck_amb.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/Examples/InverseDewPointTemperatureDerivativeCheck_amb.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/Examples/InverseDewPointTemperatureDerivativeCheck_amb.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/Examples/InverseDewPointTemperatureDerivativeCheck_amb.mo" 2021-09-16 11:17:45.210359346 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/Examples/SaturationPressureDerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/Examples/SaturationPressureDerivativeCheck.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/Examples/SaturationPressureDerivativeCheck.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/Examples/SaturationPressureDerivativeCheck.mo" 2021-09-16 11:17:45.198359386 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/Examples/WaterVaporPressureDerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/Examples/WaterVaporPressureDerivativeCheck.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/Examples/WaterVaporPressureDerivativeCheck.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/Examples/WaterVaporPressureDerivativeCheck.mo" 2021-09-16 11:17:45.186359426 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/der_TDewPoi_pW_amb.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/der_TDewPoi_pW_amb.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/der_TDewPoi_pW_amb.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/der_TDewPoi_pW_amb.mo" 2021-09-16 11:17:45.174359466 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi.mo" 2021-09-16 11:17:45.162359506 +0200 @@ -1,7 +1,7 @@ within Buildings.Utilities.Psychrometrics.Functions.BaseClasses; function der_pW_TDewPoi "Derivative of function pW_TDewPoi" extends Modelica.Icons.Function; - input Modelica.SIunits.Temperature T "Dew point temperature"; + input Modelica.Units.SI.Temperature T "Dew point temperature"; input Real dT "Temperature differential"; output Real dp_w "Differential of water vapor partial pressure"; protected diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi_amb.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi_amb.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi_amb.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi_amb.mo" 2021-09-16 11:17:45.150359547 +0200 @@ -1,14 +1,14 @@ within Buildings.Utilities.Psychrometrics.Functions.BaseClasses; function der_pW_TDewPoi_amb "Derivative of function pW_TDewPoi_amb" extends Modelica.Icons.Function; - input Modelica.SIunits.Temperature T "Dew point temperature"; + input Modelica.Units.SI.Temperature T "Dew point temperature"; input Real dT; output Real dp_w "Differential of water vapor partial pressure"; protected - constant Modelica.SIunits.Temperature T1=283.15 "First support point"; - constant Modelica.SIunits.Temperature T2=293.15 "Second support point"; - constant Modelica.SIunits.Pressure p1=1227.97 "First support point"; - constant Modelica.SIunits.Pressure p2=2338.76 "Second support point"; + constant Modelica.Units.SI.Temperature T1=283.15 "First support point"; + constant Modelica.Units.SI.Temperature T2=293.15 "Second support point"; + constant Modelica.Units.SI.Pressure p1=1227.97 "First support point"; + constant Modelica.Units.SI.Pressure p2=2338.76 "Second support point"; constant Real a1=(Modelica.Math.log(p2) - Modelica.Math.log(p1)*T2/T1)/(1 - T2/T1); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_X.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_X.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_X.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_X.mo" 2021-09-16 11:17:45.138359587 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/der_saturationPressureLiquid.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/der_saturationPressureLiquid.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/der_saturationPressureLiquid.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/der_saturationPressureLiquid.mo" 2021-09-16 11:17:45.130359614 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/der_sublimationPressureIce.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/der_sublimationPressureIce.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/der_sublimationPressureIce.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/BaseClasses/der_sublimationPressureIce.mo" 2021-09-16 11:17:45.118359654 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/Examples/Density_pTX.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/Examples/Density_pTX.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/Examples/Density_pTX.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/Examples/Density_pTX.mo" 2021-09-16 11:17:45.094359734 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/Examples/SaturationPressure.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/Examples/SaturationPressure.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/Examples/SaturationPressure.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/Examples/SaturationPressure.mo" 2021-09-16 11:17:45.066359828 +0200 @@ -1,10 +1,10 @@ within Buildings.Utilities.Psychrometrics.Functions.Examples; model SaturationPressure "Model to test the saturationPressure function" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Temperature TMin = 190 "Temperature"; - parameter Modelica.SIunits.Temperature TMax = 373.16 "Temperature"; - Modelica.SIunits.Temperature T "Temperature"; - Modelica.SIunits.AbsolutePressure pSat "Saturation pressure"; + parameter Modelica.Units.SI.Temperature TMin = 190 "Temperature"; + parameter Modelica.Units.SI.Temperature TMax = 373.16 "Temperature"; + Modelica.Units.SI.Temperature T "Temperature"; + Modelica.Units.SI.AbsolutePressure pSat "Saturation pressure"; constant Real conv(unit="1/s") = 1 "Conversion factor"; equation T = TMin + conv*time * (TMax-TMin); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/Examples/X_pSatpphi.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/Examples/X_pSatpphi.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/Examples/X_pSatpphi.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/Examples/X_pSatpphi.mo" 2021-09-16 11:17:45.054359868 +0200 @@ -3,12 +3,12 @@ extends Modelica.Icons.Example; package Medium = Buildings.Media.Air "Medium model" annotation (choicesAllMatching = true); - parameter Modelica.SIunits.Temperature T = 293.15 "Temperature"; - parameter Modelica.SIunits.Pressure p = 101325 "Pressure of the fluid"; + parameter Modelica.Units.SI.Temperature T = 293.15 "Temperature"; + parameter Modelica.Units.SI.Pressure p = 101325 "Pressure of the fluid"; - Modelica.SIunits.AbsolutePressure pSat "Saturation pressure"; + Modelica.Units.SI.AbsolutePressure pSat "Saturation pressure"; Real phi(min=0, max=1) "Relative humidity"; - Modelica.SIunits.MassFraction X_w( + Modelica.Units.SI.MassFraction X_w( min=0, max=1, nominal=0.01) "Water vapor concentration per total mass of air"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi.mo" 2021-09-16 11:17:45.034359935 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi_comparison.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi_comparison.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi_comparison.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi_comparison.mo" 2021-09-16 11:17:45.010360015 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/Examples/pW_X.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/Examples/pW_X.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/Examples/pW_X.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/Examples/pW_X.mo" 2021-09-16 11:17:44.986360095 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/Examples/phi_pTX.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/Examples/phi_pTX.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/Examples/phi_pTX.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/Examples/phi_pTX.mo" 2021-09-16 11:17:44.974360136 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/TDewPoi_pW.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/TDewPoi_pW.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/TDewPoi_pW.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/TDewPoi_pW.mo" 2021-09-16 11:17:44.958360189 +0200 @@ -3,22 +3,22 @@ "Function to compute the water vapor partial pressure for a given dew point temperature of moist air" extends Modelica.Icons.Function; - input Modelica.SIunits.Pressure p_w(displayUnit="Pa", min=200) + input Modelica.Units.SI.Pressure p_w(displayUnit="Pa", min=200) "Water vapor partial pressure"; - output Modelica.SIunits.Temperature T "Dew point temperature"; + output Modelica.Units.SI.Temperature T "Dew point temperature"; protected + function pW_TDewPoi_inversion "Internal function to solve eps=f(NTU, Z) for NTU for cross flow unmixed" extends Modelica.Math.Nonlinear.Interfaces.partialScalarFunction; - input Modelica.SIunits.Pressure p_w(displayUnit="Pa", min=200) + input Modelica.Units.SI.Pressure p_w(displayUnit="Pa", min=200) "Water vapor partial pressure"; algorithm y :=Buildings.Utilities.Psychrometrics.Functions.pW_TDewPoi(T=u) - p_w; end pW_TDewPoi_inversion; - algorithm T := Modelica.Math.Nonlinear.solveOneNonlinearEquation( f=function pW_TDewPoi_inversion(p_w=p_w), diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/TDewPoi_pW_amb.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/TDewPoi_pW_amb.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/TDewPoi_pW_amb.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/TDewPoi_pW_amb.mo" 2021-09-16 11:17:44.898360390 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/X_pSatpphi.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/X_pSatpphi.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/X_pSatpphi.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/X_pSatpphi.mo" 2021-09-16 11:17:44.878360457 +0200 @@ -1,14 +1,14 @@ within Buildings.Utilities.Psychrometrics.Functions; function X_pSatpphi "Humidity ratio for given water vapor pressure" extends Modelica.Icons.Function; - input Modelica.SIunits.AbsolutePressure pSat "Saturation pressure"; - input Modelica.SIunits.Pressure p "Pressure of the fluid"; + input Modelica.Units.SI.AbsolutePressure pSat "Saturation pressure"; + input Modelica.Units.SI.Pressure p "Pressure of the fluid"; input Real phi(min=0, max=1) "Relative humidity"; - output Modelica.SIunits.MassFraction X_w( + + output Modelica.Units.SI.MassFraction X_w( min=0, max=1, nominal=0.01) "Water vapor concentration per total mass of air"; - protected constant Real k = 0.621964713077499 "Ratio of molar masses"; algorithm diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/X_pTphi.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/X_pTphi.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/X_pTphi.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/X_pTphi.mo" 2021-09-16 11:17:44.862360510 +0200 @@ -2,12 +2,12 @@ function X_pTphi "Absolute humidity for given pressure, dry bulb temperature and relative humidity" extends Modelica.Icons.Function; - input Modelica.SIunits.Pressure p "Absolute pressure of the medium"; - input Modelica.SIunits.Temperature T "Dry bulb temperature"; + input Modelica.Units.SI.Pressure p "Absolute pressure of the medium"; + input Modelica.Units.SI.Temperature T "Dry bulb temperature"; input Real phi(unit="1") "Relative humidity"; - output Modelica.SIunits.MassFraction X_w - "Water vapor mass fraction per unit mass total air"; + output Modelica.Units.SI.MassFraction X_w + "Water vapor mass fraction per unit mass total air"; algorithm X_w:=phi/((p/saturationPressure(T)-phi) / Buildings.Utilities.Psychrometrics.Constants.k_mair + phi); annotation ( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/X_pW.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/X_pW.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/X_pW.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/X_pW.mo" 2021-09-16 11:17:44.850360550 +0200 @@ -1,17 +1,17 @@ within Buildings.Utilities.Psychrometrics.Functions; function X_pW "Humidity ratio for given water vapor pressure" extends Modelica.Icons.Function; - input Modelica.SIunits.Pressure p_w(displayUnit="Pa", + input Modelica.Units.SI.Pressure p_w(displayUnit="Pa", min=0.003, nominal=1000) "Water vapor pressure"; - input Modelica.SIunits.Pressure p=101325 "Total pressure"; - output Modelica.SIunits.MassFraction X_w( + input Modelica.Units.SI.Pressure p=101325 "Total pressure"; + output Modelica.Units.SI.MassFraction X_w( min=0, max=1, nominal=0.01) "Species concentration at dry bulb temperature"; protected - Modelica.SIunits.MassFraction x_w(nominal=0.01) + Modelica.Units.SI.MassFraction x_w(nominal=0.01) "Water mass fraction per mass of dry air"; algorithm x_w := 0.62198*p_w/(p - p_w); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/density_pTX.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/density_pTX.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/density_pTX.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/density_pTX.mo" 2021-09-16 11:17:44.842360577 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/pW_TDewPoi.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/pW_TDewPoi.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/pW_TDewPoi.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/pW_TDewPoi.mo" 2021-09-16 11:17:44.830360617 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/pW_TDewPoi_amb.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/pW_TDewPoi_amb.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/pW_TDewPoi_amb.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/pW_TDewPoi_amb.mo" 2021-09-16 11:17:44.818360657 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/pW_X.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/pW_X.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/pW_X.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/pW_X.mo" 2021-09-16 11:17:44.806360697 +0200 @@ -1,15 +1,15 @@ within Buildings.Utilities.Psychrometrics.Functions; function pW_X "Water vapor pressure for given humidity ratio" extends Modelica.Icons.Function; - input Modelica.SIunits.MassFraction X_w( + input Modelica.Units.SI.MassFraction X_w( min=0, max=0.99999, nominal=0.01) "Species concentration at dry bulb temperature"; - input Modelica.SIunits.Pressure p=101325 "Total pressure"; - output Modelica.SIunits.Pressure p_w(displayUnit="Pa") "Water vapor pressure"; + input Modelica.Units.SI.Pressure p=101325 "Total pressure"; + output Modelica.Units.SI.Pressure p_w(displayUnit="Pa") "Water vapor pressure"; protected - Modelica.SIunits.MassFraction x_w(nominal=0.01) + Modelica.Units.SI.MassFraction x_w(nominal=0.01) "Water mass fraction per mass of dry air"; algorithm x_w := X_w/(1 - X_w); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/phi_pTX.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/phi_pTX.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/phi_pTX.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/phi_pTX.mo" 2021-09-16 11:17:44.794360738 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/saturationPressure.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/saturationPressure.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/saturationPressure.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/saturationPressure.mo" 2021-09-16 11:17:44.782360778 +0200 @@ -2,12 +2,12 @@ function saturationPressure "Saturation curve valid for 223.16 <= T <= 373.16 (and slightly outside with less accuracy)" extends Modelica.Icons.Function; - input Modelica.SIunits.Temperature TSat(displayUnit="degC", + + input Modelica.Units.SI.Temperature TSat(displayUnit="degC", nominal=300) "Saturation temperature"; - output Modelica.SIunits.AbsolutePressure pSat( + output Modelica.Units.SI.AbsolutePressure pSat( displayUnit="Pa", nominal=1000) "Saturation pressure"; - algorithm pSat := Buildings.Utilities.Math.Functions.regStep( y1=Buildings.Utilities.Psychrometrics.Functions.saturationPressureLiquid(TSat), diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/saturationPressureLiquid.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/saturationPressureLiquid.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/saturationPressureLiquid.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/saturationPressureLiquid.mo" 2021-09-16 11:17:44.774360805 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/sublimationPressureIce.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/sublimationPressureIce.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/sublimationPressureIce.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/Functions/sublimationPressureIce.mo" 2021-09-16 11:17:44.762360845 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo" 2021-09-16 11:17:44.670361152 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/TWetBul_TDryBulXi.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/TWetBul_TDryBulXi.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/TWetBul_TDryBulXi.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/TWetBul_TDryBulXi.mo" 2021-09-16 11:17:44.466361835 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/X_pTphi.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/X_pTphi.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/X_pTphi.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/X_pTphi.mo" 2021-09-16 11:17:44.418361996 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/X_pW.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/X_pW.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/X_pW.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/X_pW.mo" 2021-09-16 11:17:44.406362036 +0200 @@ -12,7 +12,7 @@ start=2000, nominal=1000) "Water vapor pressure" annotation (Placement(transformation(extent={{-120,-10},{-100,10}}))); - output Modelica.SIunits.MassFraction x_w(min=0, max=1, nominal=0.01, start=0.001) + output Modelica.Units.SI.MassFraction x_w(min=0, max=1, nominal=0.01, start=0.001) "Water mass fraction per mass of dry air"; equation X_w = Buildings.Utilities.Psychrometrics.Functions.X_pW(p_w=p_w, p=p_in_internal); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/pW_X.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/pW_X.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/pW_X.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Psychrometrics/pW_X.mo" 2021-09-16 11:17:44.378362129 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Time/CalendarTime.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Time/CalendarTime.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Time/CalendarTime.mo" 2021-09-16 11:15:38.978778680 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/Utilities/Time/CalendarTime.mo" 2021-09-16 11:17:44.354362209 +0200 @@ -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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/openmodelica.metadata.json" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/openmodelica.metadata.json" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/openmodelica.metadata.json" 2021-09-16 11:15:38.982778667 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/openmodelica.metadata.json" 2021-09-16 11:19:13.870061523 +0200 @@ -1 +1 @@ -{"convertFromVersion":["6.0.0"], "path":"Buildings", "provides":["7.0.0"], "sha":"1b09d847bd3d1de9fa5e433867dccc04f7a1e2df", "support":"noSupport", "uses":{"Modelica":"3.2.3"}, "version":"7.0.1-maint.7.0.x", "zipfile":"https://github.com/lbl-srg/modelica-buildings/archive/1b09d847bd3d1de9fa5e433867dccc04f7a1e2df.zip"} +{"convertFromVersion": ["6.0.0"], "path": "Buildings", "provides": ["7.0.0"], "sha": "1b09d847bd3d1de9fa5e433867dccc04f7a1e2df", "support": "noSupport", "uses": {"Modelica": "4.0.0"}, "version": "7.0.1-maint.7.0.x", "zipfile": "https://github.com/lbl-srg/modelica-buildings/archive/1b09d847bd3d1de9fa5e433867dccc04f7a1e2df.zip", "extraInfo": "Conversion script /var/lib/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 "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/package.mo" "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/package.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/package.mo" 2021-09-16 11:15:38.982778667 +0200 +++ "converted-libraries/.openmodelica/libraries/Buildings 7.0.1-maint.7.0.x/package.mo" 2021-09-16 11:17:50.398341987 +0200 @@ -8581,7 +8581,7 @@ version="7.0.1", versionDate="2020-05-28", dateModified="2021-06-04", -uses(Modelica(version="3.2.3")), +uses(Modelica(version= "4.0.0")), conversion( noneFromVersion="7.0.0", from(version={"6.0.0"},