diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/ASHRAE_vert.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/ASHRAE_vert.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/ASHRAE_vert.mo" 2021-11-24 08:09:25.815351969 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/ASHRAE_vert.mo" 2021-11-24 08:10:21.523184517 +0000
@@ -3,7 +3,7 @@
"Generic non linear convective heat exchange coefficient from ASHRAE for a vertical wall"
extends BaseClasses.HeatTransfer.Interfaces.Element1D;
-parameter Modelica.SIunits.Area S;
+parameter Modelica.Units.SI.Area S;
equation
Q_flow = S*(1.24*dT^(1/3));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/BodyRadiation.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/BodyRadiation.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/BodyRadiation.mo" 2021-11-24 08:09:25.815351969 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/BodyRadiation.mo" 2021-11-24 08:10:21.515184541 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.BaseClasses.HeatTransfer.Components;
+within BuildSysPro.BaseClasses.HeatTransfer.Components;
model BodyRadiation "Lumped thermal element for radiation heat transfer"
extends BaseClasses.HeatTransfer.Interfaces.Element1D;
parameter Boolean Gr_as_input=false "Prescribed Net radiation conductance between two surface" annotation(Evaluate=true, HideResult=true, choices(choice=false "Fixed",
@@ -16,7 +16,7 @@
rotation=-90,
origin={-20,84})));
-// Internal connector
+// Internal connector
protected
Modelica.Blocks.Interfaces.RealInput Gr_internal "internal connector for optional configuration";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/ControlledThermalConductor.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/ControlledThermalConductor.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/ControlledThermalConductor.mo" 2021-11-24 08:09:25.815351969 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/ControlledThermalConductor.mo" 2021-11-24 08:10:21.491184613 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.BaseClasses.HeatTransfer.Components;
+within BuildSysPro.BaseClasses.HeatTransfer.Components;
model ControlledThermalConductor
"Lumped thermal element transporting heat without storing it - with controlled conductance"
extends BaseClasses.HeatTransfer.Interfaces.Element1D;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/ConvectiveBoundaryLayer.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/ConvectiveBoundaryLayer.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/ConvectiveBoundaryLayer.mo" 2021-11-24 08:09:25.815351969 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/ConvectiveBoundaryLayer.mo" 2021-11-24 08:10:21.483184637 +0000
@@ -3,9 +3,9 @@
"Convective boundary layer with variable exponent (TF75 C2K)"
extends BaseClasses.HeatTransfer.Interfaces.Element1D;
-parameter Modelica.SIunits.CoefficientOfHeatTransfer h=5
+parameter Modelica.Units.SI.CoefficientOfHeatTransfer h=5
"Heat exchange coefficient";
- parameter Modelica.SIunits.Area S=1 "Exchange surface";
+ parameter Modelica.Units.SI.Area S=1 "Exchange surface";
parameter Real alpha=0.5 "Exponent of the exchange law";
equation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/ExtConvection.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/ExtConvection.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/ExtConvection.mo" 2021-11-24 08:09:25.815351969 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/ExtConvection.mo" 2021-11-24 08:10:21.475184661 +0000
@@ -5,7 +5,7 @@
parameter Real a;
parameter Real n;
parameter Real b;
-parameter Modelica.SIunits.Area S;
+parameter Modelica.Units.SI.Area S;
Modelica.Blocks.Interfaces.RealInput v "Wind speed [m/s]"
annotation (Placement(transformation(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/ExtLWR.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/ExtLWR.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/ExtLWR.mo" 2021-11-24 08:09:25.815351969 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/ExtLWR.mo" 2021-11-24 08:10:21.467184685 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.BaseClasses.HeatTransfer.Components;
+within BuildSysPro.BaseClasses.HeatTransfer.Components;
model ExtLWR
"Long wavelength radiation exchanges with the sky and the environment"
@@ -8,7 +8,7 @@
parameter Boolean use_incl_in=false "Prescribed or fixed tilt of the surface relative to the horizontal" annotation(Evaluate=true,HideResult=true,
choices(choice=true "Prescribed", choice=false "Fixed", radioButtons=true));
-parameter Modelica.SIunits.Area S=1 "Surface";
+parameter Modelica.Units.SI.Area S=1 "Surface";
parameter Real eps=0.5 "Emissivity";
parameter Real incl=30
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/HeatCapacitor.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/HeatCapacitor.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/HeatCapacitor.mo" 2021-11-24 08:09:25.815351969 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/HeatCapacitor.mo" 2021-11-24 08:10:21.447184745 +0000
@@ -1,11 +1,11 @@
-within BuildSysPro.BaseClasses.HeatTransfer.Components;
+within BuildSysPro.BaseClasses.HeatTransfer.Components;
model HeatCapacitor "Heat capacitor"
- parameter Modelica.SIunits.HeatCapacity C
+ parameter Modelica.Units.SI.HeatCapacity C
"Heat capacity of the element (= cp*m)";
- Modelica.SIunits.Temperature T( displayUnit="degC")
+ Modelica.Units.SI.Temperature T( displayUnit="degC")
"Temperature of the element";
- Modelica.SIunits.TemperatureSlope der_T(start=0)
+ Modelica.Units.SI.TemperatureSlope der_T(start=0)
"Time derivative of the temperature (= der(T))";
BaseClasses.HeatTransfer.Interfaces.HeatPort_a port annotation (Placement(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/HomogeneousConduction.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/HomogeneousConduction.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/HomogeneousConduction.mo" 2021-11-24 08:09:25.815351969 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/HomogeneousConduction.mo" 2021-11-24 08:10:21.435184782 +0000
@@ -1,19 +1,19 @@
-within BuildSysPro.BaseClasses.HeatTransfer.Components;
+within BuildSysPro.BaseClasses.HeatTransfer.Components;
model HomogeneousConduction "1-D thermal conduction for homogeneous medium"
parameter Integer n=1 "Number of states";
- parameter Modelica.SIunits.Area S=1 "Surface of the element";
+ parameter Modelica.Units.SI.Area S=1 "Surface of the element";
parameter BuildSysPro.Utilities.Records.GenericSolid mat
"material of the element"
annotation (choicesAllMatching=true);
- parameter Modelica.SIunits.Length e=0.2
+ parameter Modelica.Units.SI.Length e=0.2
"Thickness of the element (in the direction of the T gradient)";
parameter BuildSysPro.Utilities.Types.InitCond InitType=BuildSysPro.Utilities.Types.InitCond.SteadyState;
-final parameter Modelica.SIunits.Density rho=mat.rho;
- final parameter Modelica.SIunits.SpecificHeatCapacity Cp=mat.c;
- final parameter Modelica.SIunits.ThermalConductivity lambda=mat.lambda;
+final parameter Modelica.Units.SI.Density rho=mat.rho;
+ final parameter Modelica.Units.SI.SpecificHeatCapacity Cp=mat.c;
+ final parameter Modelica.Units.SI.ThermalConductivity lambda=mat.lambda;
final parameter Real[2*n] r1=(fill(1, 2*n)*S*lambda*2*n)/e;
final parameter Real[n] r2=(rho*Cp*e*S)/n*fill(1, n);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/HomogeneousNLayersWall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/HomogeneousNLayersWall.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/HomogeneousNLayersWall.mo" 2021-11-24 08:09:25.815351969 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/HomogeneousNLayersWall.mo" 2021-11-24 08:10:21.419184829 +0000
@@ -1,22 +1,23 @@
-within BuildSysPro.BaseClasses.HeatTransfer.Components;
+within BuildSysPro.BaseClasses.HeatTransfer.Components;
model HomogeneousNLayersWall
"Pure thermal conduction in an N homogeneous layers wall"
parameter Integer n=2 "Number of distinct layers";
parameter Integer m[n]=3*fill(1, n) "Number of meshes by layer";
- parameter Modelica.SIunits.Area S=1;
- parameter Modelica.SIunits.Length[n] e=0.2*fill(1, n)
+ parameter Modelica.Units.SI.Area S=1;
+ parameter Modelica.Units.SI.Length[n] e=0.2*fill(1, n)
"Layers thickness (from outside to inside)";
parameter BuildSysPro.Utilities.Records.GenericSolid mat[n]
"Constituting materials of the wall (from outside to inside)"
annotation (choicesAllMatching=true);
- parameter Modelica.SIunits.Temperature Tinit=293.15;
+ parameter Modelica.Units.SI.Temperature Tinit=293.15;
parameter BuildSysPro.Utilities.Types.InitCond InitType=BuildSysPro.Utilities.Types.InitCond.SteadyState;
-//extends BuildSysPro.ModelesAvances.ParoiNCouchesHomogenesCrypte(
-extends BuildSysPro.BaseClasses.HeatTransfer.Components.Wall(
+
+//extends BuildSysPro.ModelesAvances.ParoiNCouchesHomogenesCrypte(
+ extends BuildSysPro.BaseClasses.HeatTransfer.Components.Wall(
nc=n,
mc=m,
Sc=S,
@@ -24,7 +25,6 @@
matc=mat,
Tinitc=Tinit,
InitTypec=InitType);
-
annotation (Documentation(info="
Model of 1-D thermal conduction in an N layers material
Uses the Wall
component, which derives from the Material
and MaterialLayer
components.
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/LinearExtLWR.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/LinearExtLWR.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/LinearExtLWR.mo" 2021-11-24 08:09:25.815351969 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/LinearExtLWR.mo" 2021-11-24 08:10:21.407184866 +0000
@@ -1,14 +1,14 @@
-within BuildSysPro.BaseClasses.HeatTransfer.Components;
+within BuildSysPro.BaseClasses.HeatTransfer.Components;
model LinearExtLWR
"Echanges thermique par rayonnement en grande longueur d'onde"
// Paramètres publics
-parameter Modelica.SIunits.Area S=1 "Surface";
+parameter Modelica.Units.SI.Area S=1 "Surface";
parameter Real eps=0.5 "Emissivité";
parameter Real skyViewFactor
"Facteur de forme moyen entre les parois et le ciel (exemple: skyViewFactor(toiture terrase)=1, skyViewfactor(paroi verticale en environnement dégagé)=0.5)";
-// Composants publics
+// Composants publics
BuildSysPro.BaseClasses.HeatTransfer.Interfaces.HeatPort_a T_sky
"Température du ciel" annotation (Placement(transformation(extent={{-100,-50},
{-80,-30}}, rotation=0)));
@@ -20,16 +20,16 @@
extent={{80,-10},{100,10}}, rotation=0), iconTransformation(extent={{
80,-10},{100,10}})));
-// Paramètres protégés
+// Paramètres protégés
protected
- parameter Modelica.SIunits.Temperature TcielConst=263.15
+ parameter Modelica.Units.SI.Temperature TcielConst=263.15
"Estimation de la température de Ciel";
- parameter Modelica.SIunits.Temperature TenvConst=283.15
+ parameter Modelica.Units.SI.Temperature TenvConst=283.15
"Estimation de la température d'environnement";
- parameter Modelica.SIunits.Temperature TsurfConst=288.15
+ parameter Modelica.Units.SI.Temperature TsurfConst=288.15
"Estimation de la température de surface des parois";
-// Composants internes
+// Composants internes
BuildSysPro.BaseClasses.HeatTransfer.Components.ThermalConductor GLOenv(G=(1 -
skyViewFactor)*S*Modelica.Constants.sigma*eps*(TenvConst^2 + TsurfConst
^2)*(TenvConst + TsurfConst)) "Echange GLO avec l'environnement"
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/Material.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/Material.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/Material.mo" 2021-11-24 08:09:25.815351969 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/Material.mo" 2021-11-24 08:10:21.387184926 +0000
@@ -3,9 +3,9 @@
parameter BuildSysPro.Utilities.Records.GenericSolid mat "Material"
annotation (choicesAllMatching=true);
parameter Integer m=3 "Number of layers in the material";
- parameter Modelica.SIunits.Length e=0.20 "Thickness";
- parameter Modelica.SIunits.Area S=1 "Surface";
- parameter Modelica.SIunits.Temperature Tinit=293.15 "Initial temperature";
+ parameter Modelica.Units.SI.Length e=0.20 "Thickness";
+ parameter Modelica.Units.SI.Area S=1 "Surface";
+ parameter Modelica.Units.SI.Temperature Tinit=293.15 "Initial temperature";
parameter BuildSysPro.Utilities.Types.InitCond InitType=BuildSysPro.Utilities.Types.InitCond.SteadyState
"Initialization type";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/MaterialLayer.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/MaterialLayer.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/MaterialLayer.mo" 2021-11-24 08:09:25.815351969 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/MaterialLayer.mo" 2021-11-24 08:10:21.379184950 +0000
@@ -2,12 +2,12 @@
model MaterialLayer "Material layer"
parameter BuildSysPro.Utilities.Records.GenericSolid mat "Material"
annotation(choicesAllMatching=true,Dialog(enable=(not VariableMatProp)));
- parameter Modelica.SIunits.Length e=0.05 "Thickness";
- parameter Modelica.SIunits.Area S=1 "Surface";
- parameter Modelica.SIunits.Temperature Tinit=293.15 "Initial temperature";
+ parameter Modelica.Units.SI.Length e=0.05 "Thickness";
+ parameter Modelica.Units.SI.Area S=1 "Surface";
+ parameter Modelica.Units.SI.Temperature Tinit=293.15 "Initial temperature";
parameter BuildSysPro.Utilities.Types.InitCond InitType=BuildSysPro.Utilities.Types.InitCond.SteadyState
"Initialization type";
- Modelica.SIunits.Temperature T(start=Tinit,displayUnit="degC");
+ Modelica.Units.SI.Temperature T(start=Tinit,displayUnit="degC");
protected
parameter Real G=(2*mat.lambda*S)/e;
parameter Real C=mat.rho*mat.c*e*S;
@@ -23,8 +23,8 @@
initial equation
if InitType == BuildSysPro.Utilities.Types.InitCond.SteadyState then
der(T)=0;
-// elseif InitType ==BuildSysPro.Utilitaires.Types.InitCond.Value then
-// T=Tinit;
+// elseif InitType ==BuildSysPro.Utilitaires.Types.InitCond.Value then
+// T=Tinit;
end if;
equation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/NonLinearConvective.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/NonLinearConvective.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/NonLinearConvective.mo" 2021-11-24 08:09:25.815351969 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/NonLinearConvective.mo" 2021-11-24 08:10:21.367184986 +0000
@@ -1,11 +1,11 @@
-within BuildSysPro.BaseClasses.HeatTransfer.Components;
+within BuildSysPro.BaseClasses.HeatTransfer.Components;
model NonLinearConvective
"Generic non linear convective heat exchange coefficient"
extends BaseClasses.HeatTransfer.Interfaces.Element1D;
parameter Real a "Multiplicative factor of the temperature difference";
parameter Real n "Exponent of the exchange law";
parameter Real b "Additional term of the exchange law";
- parameter Modelica.SIunits.Area S "Exchange surface";
+ parameter Modelica.Units.SI.Area S "Exchange surface";
equation
Q_flow = if noEvent(abs(dT)>0) then S*(a*abs(dT)^n + b)*dT else 0;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/RadiationTemperature.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/RadiationTemperature.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/RadiationTemperature.mo" 2021-11-24 08:09:25.815351969 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/RadiationTemperature.mo" 2021-11-24 08:10:21.355185022 +0000
@@ -1,10 +1,10 @@
-within BuildSysPro.BaseClasses.HeatTransfer.Components;
+within BuildSysPro.BaseClasses.HeatTransfer.Components;
model RadiationTemperature "Radiative temperature of the room"
parameter Integer np=6 "Number of walles exposed to the radiative flux" annotation(Dialog(group="Opaque walls"));
-parameter Modelica.SIunits.Area Sp[np]
+parameter Modelica.Units.SI.Area Sp[np]
"Vector of wall surfaces, respecting the order of connexions" annotation(Dialog(group="Opaque walls"));
-parameter Modelica.SIunits.Emissivity Ep[np]
+parameter Modelica.Units.SI.Emissivity Ep[np]
"Vector of wall emissivities, respecting the order of connexions" annotation(Dialog(group="Opaque walls"));
Real SpEpTot=sum(Sp[i]*Ep[i] for i in 1:np);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/ThermalConductor.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/ThermalConductor.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/ThermalConductor.mo" 2021-11-24 08:09:25.815351969 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/ThermalConductor.mo" 2021-11-24 08:10:21.291185214 +0000
@@ -1,8 +1,8 @@
-within BuildSysPro.BaseClasses.HeatTransfer.Components;
+within BuildSysPro.BaseClasses.HeatTransfer.Components;
model ThermalConductor
"Lumped thermal element transporting heat without storing it"
extends BaseClasses.HeatTransfer.Interfaces.Element1D;
- parameter Modelica.SIunits.ThermalConductance G
+ parameter Modelica.Units.SI.ThermalConductance G
"Constant thermal conductance of material";
equation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/ThermalResistance.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/ThermalResistance.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/ThermalResistance.mo" 2021-11-24 08:09:25.815351969 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/ThermalResistance.mo" 2021-11-24 08:10:21.283185238 +0000
@@ -1,7 +1,7 @@
-within BuildSysPro.BaseClasses.HeatTransfer.Components;
+within BuildSysPro.BaseClasses.HeatTransfer.Components;
model ThermalResistance "Thermal resistance"
extends BaseClasses.HeatTransfer.Interfaces.Element1D;
- parameter Modelica.SIunits.ThermalResistance R
+ parameter Modelica.Units.SI.ThermalResistance R
"Constant thermal resistance of material";
equation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/Wall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/Wall.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/Wall.mo" 2021-11-24 08:09:25.815351969 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/Wall.mo" 2021-11-24 08:10:21.271185274 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.BaseClasses.HeatTransfer.Components;
+within BuildSysPro.BaseClasses.HeatTransfer.Components;
model Wall
"Model of wall composed of one or more materials described from outside to inside"
@@ -7,11 +7,11 @@
"Constituting materials of the wall (from outside to inside)"
annotation (choicesAllMatching=true);
parameter Integer mc[nc]=3*fill(1, nc) "Number of layers by material";
- parameter Modelica.SIunits.Length[nc] ec=0.2*fill(1, nc)
+ parameter Modelica.Units.SI.Length[nc] ec=0.2*fill(1, nc)
"Thickness of the layers (from outside to inside)";
- parameter Modelica.SIunits.Area Sc=1 "Surface of the wall";
+ parameter Modelica.Units.SI.Area Sc=1 "Surface of the wall";
- parameter Modelica.SIunits.Temperature Tinitc=293.15 "Initial temperature";
+ parameter Modelica.Units.SI.Temperature Tinitc=293.15 "Initial temperature";
parameter BuildSysPro.Utilities.Types.InitCond InitTypec=BuildSysPro.Utilities.Types.InitCond.SteadyState
"Initialization type";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/WindConvection.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/WindConvection.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/WindConvection.mo" 2021-11-24 08:09:25.815351969 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.4.0/BaseClasses/HeatTransfer/Components/WindConvection.mo" 2021-11-24 08:10:21.255185322 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.BaseClasses.HeatTransfer.Components;
+within BuildSysPro.BaseClasses.HeatTransfer.Components;
model WindConvection
"Convective heat exchange coefficient of a wall taking into account wind speed and direction"
extends BuildSysPro.BaseClasses.HeatTransfer.Interfaces.Element1D;
@@ -11,13 +11,13 @@
"Taking into account infrared radiation between the wall and the sky"
annotation(Dialog(compact=true),choices(choice=true "Yes", choice=false "No", radioButtons=true));
-parameter Modelica.SIunits.CoefficientOfHeatTransfer hs_ext=25
+parameter Modelica.Units.SI.CoefficientOfHeatTransfer hs_ext=25
"Convective surface heat exchange coefficient on the outside - depending on the settings (GLOext and VitesseVent), hs_ext can be purely convective or purely radiative";
-parameter Modelica.SIunits.Area S "Exchange surface";
-parameter Modelica.SIunits.Conversions.NonSIunits.Angle_deg azimut
+parameter Modelica.Units.SI.Area S "Exchange surface";
+parameter Modelica.Units.NonSI.Angle_deg azimut
"Azimut of the surface (relative to the south) - S=0°, E=-90°, W=90°, N=180°";
- parameter Modelica.SIunits.Conversions.NonSIunits.Angle_deg incl=90
+ parameter Modelica.Units.NonSI.Angle_deg incl=90
"Tilt of the surface relative to the horizontal - toward the ground=180°, toward the sky=0°, vertical=90°";
Modelica.Blocks.Interfaces.RealInput V[2] if VitesseVent
@@ -28,31 +28,32 @@
origin={0,74})));
protected
- parameter Modelica.SIunits.CoefficientOfHeatTransfer hrad_cst = if GLOext then 0 else hs_ext;
+ parameter Modelica.Units.SI.CoefficientOfHeatTransfer hrad_cst = if GLOext then 0 else hs_ext;
protected
Modelica.Blocks.Interfaces.RealInput V_in[2]
"Internal connector, needed if conditional connexion";
public
- Modelica.SIunits.CoefficientOfHeatTransfer h_vent
+ Modelica.Units.SI.CoefficientOfHeatTransfer h_vent
"Convective heat exchange coefficient on the outside";
public
+
function correlation
input Real V[2] "Wind speed and direction";
- input Modelica.SIunits.Conversions.NonSIunits.Angle_deg azimut
+ input Modelica.Units.NonSI.Angle_deg azimut
"Azimut of the surface (relative to the south) - S=0°, E=-90°, W=90°, N=180°";
- input Modelica.SIunits.Conversions.NonSIunits.Angle_deg incl=90
+ input Modelica.Units.NonSI.Angle_deg incl=90
"Tilt of the surface relative to the horizontal - toward the ground=180°, toward the sky=0°, vertical=90°";
- output Modelica.SIunits.CoefficientOfHeatTransfer h_vent
+ output Modelica.Units.SI.CoefficientOfHeatTransfer h_vent
"Convective surface heat exchange coefficient due to wind";
-//Coefficient a of the equation hcv = a*v^n+b
- //Windward façade (exposed to wind)
+//Coefficient a of the equation hcv = a*v^n+b
+ //Windward façade (exposed to wind)
protected
parameter Real a1=3.06;
parameter Real n1=1;
parameter Real b1=5.44;
- //Leeward façade
+ //Leeward façade
parameter Real a2=0.34;
parameter Real n2=1;
parameter Real b2=7.99;
@@ -89,9 +90,9 @@
BuildSysPro version 3.4.0
Author : Aurélie KAEMMERLEN, EDF (2013)
--------------------------------------------------------------
-"));
-end correlation;
+