Skip to content

Commit e46aaac

Browse files
KodsgrKodsgr
committed
new version of BSP
1 parent ba53f7e commit e46aaac

File tree

850 files changed

+29162
-3531
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

850 files changed

+29162
-3531
lines changed

‎BuildSysPro/BaseClasses/HeatTransfer/Components/ASHRAE_vert.mo‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ model ASHRAE_vert
33
"Generic non linear convective heat exchange coefficient from ASHRAE for a vertical wall"
44
extends BaseClasses.HeatTransfer.Interfaces.Element1D;
55

6-
parameter Modelica.SIunits.Area S;
6+
parameter Modelica.Units.SI.Area S;
77

88
equation
99
Q_flow = S*(1.24*dT^(1/3));
@@ -38,8 +38,8 @@ Q_flow = S*(1.24*dT^(1/3));
3838
<p>Validated model</p>
3939
<p><b>--------------------------------------------------------------<br>
4040
Licensed by EDF under a 3-clause BSD-license<br>
41-
Copyright &copy; EDF 2009 - 2020<br>
42-
BuildSysPro version 3.4.0<br>
41+
Copyright &copy; EDF 2009 - 2021<br>
42+
BuildSysPro version 3.5.0<br>
4343
Author : EDF<br>
4444
--------------------------------------------------------------</b></p>
4545
</html>"));

‎BuildSysPro/BaseClasses/HeatTransfer/Components/BodyRadiation.mo‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ equation
115115
<p>none</p>
116116
<p><b>--------------------------------------------------------------<br>
117117
Licensed by EDF under a 3-clause BSD-license<br>
118-
Copyright &copy; EDF 2009 - 2020<br>
119-
BuildSysPro version 3.4.0<br>
118+
Copyright &copy; EDF 2009 - 2021<br>
119+
BuildSysPro version 3.5.0<br>
120120
Initial model : <a href=\"Modelica.Thermal.HeatTransfer.Components.BodyRadiation\">BodyRadiation</a>, Anton Haumer, Copyright © Modelica Association, Michael Tiller and DLR.<br>
121121
--------------------------------------------------------------</b></p>
122122
</html>", revisions="<html>

‎BuildSysPro/BaseClasses/HeatTransfer/Components/ControlledThermalConductor.mo‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ equation
6161
<p>none</p>
6262
<p><b>--------------------------------------------------------------<br>
6363
Licensed by EDF under a 3-clause BSD-license<br>
64-
Copyright &copy; EDF 2009 - 2020<br>
65-
BuildSysPro version 3.4.0<br>
64+
Copyright &copy; EDF 2009 - 2021<br>
65+
BuildSysPro version 3.5.0<br>
6666
Author : EDF<br>
6767
Initial model : <a href=\"Modelica.Thermal.HeatTransfer.Components.ThermalConductor\">ThermalConductor</a>, Anton Haumer, Copyright © Modelica Association, Michael Tiller and DLR.<br>
6868
--------------------------------------------------------------</b></p>

‎BuildSysPro/BaseClasses/HeatTransfer/Components/ConvectiveBoundaryLayer.mo‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ model ConvectiveBoundaryLayer
33
"Convective boundary layer with variable exponent (TF75 C2K)"
44
extends BaseClasses.HeatTransfer.Interfaces.Element1D;
55

6-
parameter Modelica.SIunits.CoefficientOfHeatTransfer h=5
6+
parameter Modelica.Units.SI.CoefficientOfHeatTransfer h=5
77
"Heat exchange coefficient";
8-
parameter Modelica.SIunits.Area S=1 "Exchange surface";
8+
parameter Modelica.Units.SI.Area S=1 "Exchange surface";
99
parameter Real alpha=0.5 "Exponent of the exchange law";
1010

1111
equation
@@ -26,8 +26,8 @@ Documentation(info="<html>
2626
<p>Validated model - EAB 04/2010</p>
2727
<p><b>--------------------------------------------------------------<br>
2828
Licensed by EDF under a 3-clause BSD-license<br>
29-
Copyright &copy; EDF 2009 - 2020<br>
30-
BuildSysPro version 3.4.0<br>
29+
Copyright &copy; EDF 2009 - 2021<br>
30+
BuildSysPro version 3.5.0<br>
3131
Author : EDF<br>
3232
--------------------------------------------------------------</b></p>
3333
</html>"),

‎BuildSysPro/BaseClasses/HeatTransfer/Components/ExtConvection.mo‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ model ExtConvection
55
parameter Real a;
66
parameter Real n;
77
parameter Real b;
8-
parameter Modelica.SIunits.Area S;
8+
parameter Modelica.Units.SI.Area S;
99

1010
Modelica.Blocks.Interfaces.RealInput v "Wind speed [m/s]"
1111
annotation (Placement(transformation(
@@ -36,8 +36,8 @@ equation
3636
<p>Validated model - EAB 04/2010</p>
3737
<p><b>--------------------------------------------------------------<br>
3838
Licensed by EDF under a 3-clause BSD-license<br>
39-
Copyright &copy; EDF 2009 - 2020<br>
40-
BuildSysPro version 3.4.0<br>
39+
Copyright &copy; EDF 2009 - 2021<br>
40+
BuildSysPro version 3.5.0<br>
4141
Author : EDF<br>
4242
--------------------------------------------------------------</b></p>
4343
</html>"));

‎BuildSysPro/BaseClasses/HeatTransfer/Components/ExtLWR.mo‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ parameter Boolean backLWR=false "Model used to calculate exchanges with the soil
88
parameter Boolean use_incl_in=false "Prescribed or fixed tilt of the surface relative to the horizontal" annotation(Evaluate=true,HideResult=true,
99
choices(choice=true "Prescribed", choice=false "Fixed", radioButtons=true));
1010

11-
parameter Modelica.SIunits.Area S=1 "Surface";
11+
parameter Modelica.Units.SI.Area S=1 "Surface";
1212
parameter Real eps=0.5 "Emissivity";
1313

1414
parameter Real incl=30
@@ -170,8 +170,8 @@ annotation (
170170
<p>Validated model (analytical verification + verification of the coherence of the exchanged fluxes profile) - Aurélie Kaemmerlen 09/2011</p>
171171
<p><b>--------------------------------------------------------------<br>
172172
Licensed by EDF under a 3-clause BSD-license<br>
173-
Copyright &copy; EDF 2009 - 2020<br>
174-
BuildSysPro version 3.4.0<br>
173+
Copyright &copy; EDF 2009 - 2021<br>
174+
BuildSysPro version 3.5.0<br>
175175
Author : Aurélie KAEMMERLEN, EDF (2011)<br>
176176
Initial model : <a href=\"Modelica.Thermal.HeatTransfer.Components.BodyRadiation\">BodyRadiation</a>, Anton Haumer, Copyright © Modelica Association, Michael Tiller and DLR.<br>
177177
--------------------------------------------------------------</b></p>

‎BuildSysPro/BaseClasses/HeatTransfer/Components/HeatCapacitor.mo‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
within BuildSysPro.BaseClasses.HeatTransfer.Components;
22
model HeatCapacitor "Heat capacitor"
3-
parameter Modelica.SIunits.HeatCapacity C
3+
parameter Modelica.Units.SI.HeatCapacity C
44
"Heat capacity of the element (= cp*m)";
55

6-
Modelica.SIunits.Temperature T( displayUnit="degC")
6+
Modelica.Units.SI.Temperature T(displayUnit="degC")
77
"Temperature of the element";
8-
Modelica.SIunits.TemperatureSlope der_T(start=0)
8+
Modelica.Units.SI.TemperatureSlope der_T(start=0)
99
"Time derivative of the temperature (= der(T))";
1010

1111
BaseClasses.HeatTransfer.Interfaces.HeatPort_a port annotation (Placement(
@@ -73,8 +73,8 @@ equation
7373
<p>Validated model</p>
7474
<p><b>--------------------------------------------------------------<br>
7575
Licensed by EDF under a 3-clause BSD-license<br>
76-
Copyright &copy; EDF 2009 - 2020<br>
77-
BuildSysPro version 3.4.0<br>
76+
Copyright &copy; EDF 2009 - 2021<br>
77+
BuildSysPro version 3.5.0<br>
7878
Initial model : <a href=\"Modelica.Thermal.HeatTransfer.Components.HeatCapacitor\">HeatCapacitor</a>, Anton Haumer, Copyright © Modelica Association, Michael Tiller and DLR.<br>
7979
--------------------------------------------------------------</b></p>
8080
</html>"));

‎BuildSysPro/BaseClasses/HeatTransfer/Components/HomogeneousConduction.mo‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
model HomogeneousConduction "1-D thermal conduction for homogeneous medium"
33

44
parameter Integer n=1 "Number of states";
5-
parameter Modelica.SIunits.Area S=1 "Surface of the element";
5+
parameter Modelica.Units.SI.Area S=1 "Surface of the element";
66
parameter BuildSysPro.Utilities.Records.GenericSolid mat
77
"material of the element"
88
annotation (choicesAllMatching=true);
9-
parameter Modelica.SIunits.Length e=0.2
9+
parameter Modelica.Units.SI.Length e=0.2
1010
"Thickness of the element (in the direction of the T gradient)";
1111

1212
parameter BuildSysPro.Utilities.Types.InitCond InitType=BuildSysPro.Utilities.Types.InitCond.SteadyState;
1313

14-
final parameter Modelica.SIunits.Density rho=mat.rho;
15-
final parameter Modelica.SIunits.SpecificHeatCapacity Cp=mat.c;
16-
final parameter Modelica.SIunits.ThermalConductivity lambda=mat.lambda;
14+
final parameter Modelica.Units.SI.Density rho=mat.rho;
15+
final parameter Modelica.Units.SI.SpecificHeatCapacity Cp=mat.c;
16+
final parameter Modelica.Units.SI.ThermalConductivity lambda=mat.lambda;
1717
final parameter Real[2*n] r1=(fill(1, 2*n)*S*lambda*2*n)/e;
1818
final parameter Real[n] r2=(rho*Cp*e*S)/n*fill(1, n);
1919

@@ -65,8 +65,8 @@ equation
6565
<p>Validated model - Emmanuel Amy de la Bretèque 06/2010</p>
6666
<p><b>--------------------------------------------------------------<br>
6767
Licensed by EDF under a 3-clause BSD-license<br>
68-
Copyright &copy; EDF 2009 - 2020<br>
69-
BuildSysPro version 3.4.0<br>
68+
Copyright &copy; EDF 2009 - 2021<br>
69+
BuildSysPro version 3.5.0<br>
7070
Author : Emmanuel AMY DE LA BRETEQUE, EDF (2010)<br>
7171
--------------------------------------------------------------</b></p>
7272
</html>",

‎BuildSysPro/BaseClasses/HeatTransfer/Components/HomogeneousNLayersWall.mo‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ model HomogeneousNLayersWall
44

55
parameter Integer n=2 "Number of distinct layers";
66
parameter Integer m[n]=3*fill(1, n) "Number of meshes by layer";
7-
parameter Modelica.SIunits.Area S=1;
8-
parameter Modelica.SIunits.Length[n] e=0.2*fill(1, n)
7+
parameter Modelica.Units.SI.Area S=1;
8+
parameter Modelica.Units.SI.Length[n] e=0.2*fill(1, n)
99
"Layers thickness (from outside to inside)";
1010

1111
parameter BuildSysPro.Utilities.Records.GenericSolid mat[n]
1212
"Constituting materials of the wall (from outside to inside)"
1313
annotation (choicesAllMatching=true);
1414

15-
parameter Modelica.SIunits.Temperature Tinit=293.15;
15+
parameter Modelica.Units.SI.Temperature Tinit=293.15;
1616
parameter BuildSysPro.Utilities.Types.InitCond InitType=BuildSysPro.Utilities.Types.InitCond.SteadyState;
1717

1818
//extends BuildSysPro.ModelesAvances.ParoiNCouchesHomogenesCrypte(
@@ -40,8 +40,8 @@ extends BuildSysPro.BaseClasses.HeatTransfer.Components.Wall(
4040
<p>Validated model - Hassan Bouia 10/2011</p>
4141
<p><b>--------------------------------------------------------------<br>
4242
Licensed by EDF under a 3-clause BSD-license<br>
43-
Copyright &copy; EDF 2009 - 2020<br>
44-
BuildSysPro version 3.4.0<br>
43+
Copyright &copy; EDF 2009 - 2021<br>
44+
BuildSysPro version 3.5.0<br>
4545
Author : Hassan BOUIA, EDF (2011)<br>
4646
--------------------------------------------------------------</b></p>
4747
</html>",

‎BuildSysPro/BaseClasses/HeatTransfer/Components/LinearExtLWR.mo‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ model LinearExtLWR
33
"Echanges thermique par rayonnement en grande longueur d'onde"
44

55
// Paramètres publics
6-
parameter Modelica.SIunits.Area S=1 "Surface";
6+
parameter Modelica.Units.SI.Area S=1 "Surface";
77
parameter Real eps=0.5 "Emissivité";
88
parameter Real skyViewFactor
99
"Facteur de forme moyen entre les parois et le ciel (exemple: skyViewFactor(toiture terrase)=1, skyViewfactor(paroi verticale en environnement dégagé)=0.5)";
@@ -22,11 +22,11 @@ parameter Real skyViewFactor
2222

2323
// Paramètres protégés
2424
protected
25-
parameter Modelica.SIunits.Temperature TcielConst=263.15
25+
parameter Modelica.Units.SI.Temperature TcielConst=263.15
2626
"Estimation de la température de Ciel";
27-
parameter Modelica.SIunits.Temperature TenvConst=283.15
27+
parameter Modelica.Units.SI.Temperature TenvConst=283.15
2828
"Estimation de la température d'environnement";
29-
parameter Modelica.SIunits.Temperature TsurfConst=288.15
29+
parameter Modelica.Units.SI.Temperature TsurfConst=288.15
3030
"Estimation de la température de surface des parois";
3131

3232
// Composants internes
@@ -143,8 +143,8 @@ annotation (
143143
<p>Modèle validé - Gilles PLESSIS 12/2012</p>
144144
<p><b>--------------------------------------------------------------<br>
145145
Licensed by EDF under a 3-clause BSD-license<br>
146-
Copyright &copy; EDF 2009 - 2020<br>
147-
BuildSysPro version 3.4.0<br>
146+
Copyright &copy; EDF 2009 - 2021<br>
147+
BuildSysPro version 3.5.0<br>
148148
Author : Gilles PLESSIS, EDF (2012)<br>
149149
Initial model : <a href=\"Modelica.Thermal.HeatTransfer.Components.BodyRadiation\">BodyRadiation</a>, Anton Haumer, Copyright © Modelica Association, Michael Tiller and DLR.<br>
150150
--------------------------------------------------------------</b></p>

0 commit comments

Comments
 (0)