Skip to content

Commit 4c605a5

Browse files
sfroidurotsfroidurot
committed
Commit to v3.3.0
1 parent 232d51c commit 4c605a5

File tree

1,366 files changed

+11975
-9482
lines changed

Some content is hidden

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

1,366 files changed

+11975
-9482
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ Q_flow = S*(1.24*dT^(1/3));
3737
<p><u><b>Validations</b></u></p>
3838
<p>Validated model</p>
3939
<p><b>--------------------------------------------------------------<br>
40-
Licensed by EDF under the Modelica License 2<br>
41-
Copyright &copy; EDF 2009 - 2018<br>
42-
BuildSysPro version 3.2.0<br>
40+
Licensed by EDF under a 3-clause BSD-license<br>
41+
Copyright &copy; EDF 2009 - 2019<br>
42+
BuildSysPro version 3.3.0<br>
4343
Author : EDF<br>
4444
--------------------------------------------------------------</b></p>
4545
</html>"));

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

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,33 @@
11
within BuildSysPro.BaseClasses.HeatTransfer.Components;
22
model BodyRadiation "Lumped thermal element for radiation heat transfer"
33
extends BaseClasses.HeatTransfer.Interfaces.Element1D;
4+
parameter Boolean Gr_as_input=false "Prescribed Net radiation conductance between two surface" annotation(Evaluate=true, HideResult=true, choices(choice=false "Fixed",
5+
choice=true "Prescribed (needed for tracking)", radioButtons=true));
46
parameter Real Gr(unit="m2")
5-
"Net radiation conductance between two surfaces (see docu)";
7+
"Net radiation conductance between two surfaces (see docu)" annotation(Dialog(enable=not Gr_as_input));
8+
9+
public
10+
Modelica.Blocks.Interfaces.RealInput Gr_in(unit="m2") if Gr_as_input
11+
"Net radiation conductance between two surfaces (see docu)" annotation (Placement(transformation(
12+
extent={{-16,-16},{16,16}},
13+
rotation=-90,
14+
origin={-20,96}), iconTransformation(
15+
extent={{-6,-6},{6,6}},
16+
rotation=-90,
17+
origin={-20,84})));
18+
19+
// Internal connector
20+
protected
21+
Modelica.Blocks.Interfaces.RealInput Gr_internal "internal connector for optional configuration";
22+
623
equation
7-
Q_flow = Gr*Modelica.Constants.sigma*(port_a.T^4 - port_b.T^4);
24+
connect(Gr_in, Gr_internal);
25+
if not Gr_as_input then Gr_internal=Gr;
26+
end if;
27+
28+
29+
Q_flow = Gr_internal*Modelica.Constants.sigma*(port_a.T^4 - port_b.T^4);
30+
831
annotation (
932
Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,
1033
-100},{100,100}}), graphics={
@@ -91,11 +114,13 @@ equation
91114
<p><u><b>Known limits / Use precautions</b></u></p>
92115
<p>none</p>
93116
<p><b>--------------------------------------------------------------<br>
94-
Licensed by EDF under the Modelica License 2<br>
95-
Copyright &copy; EDF 2009 - 2018<br>
96-
BuildSysPro version 3.2.0<br>
117+
Licensed by EDF under a 3-clause BSD-license<br>
118+
Copyright &copy; EDF 2009 - 2019<br>
119+
BuildSysPro version 3.3.0<br>
97120
Initial model : <a href=\"Modelica.Thermal.HeatTransfer.Components.BodyRadiation\">BodyRadiation</a>, Anton Haumer, Copyright © Modelica Association, Michael Tiller and DLR.<br>
98121
--------------------------------------------------------------</b></p>
122+
</html>", revisions="<html>
123+
<p>Stéphanie Froidurot 07/2019 : Ajout de la possibilité de choisir entre Gr paramètre ou input.</p>
99124
</html>"),
100125
Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,
101126
-100},{100,100}}), graphics={

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ equation
6060
<p><u><b>Known limits / Use precautions</b></u></p>
6161
<p>none</p>
6262
<p><b>--------------------------------------------------------------<br>
63-
Licensed by EDF under the Modelica License 2<br>
64-
Copyright &copy; EDF 2009 - 2018<br>
65-
BuildSysPro version 3.2.0<br>
63+
Licensed by EDF under a 3-clause BSD-license<br>
64+
Copyright &copy; EDF 2009 - 2019<br>
65+
BuildSysPro version 3.3.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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ Documentation(info="<html>
2525
<p><u><b>Validations</b></u></p>
2626
<p>Validated model - EAB 04/2010</p>
2727
<p><b>--------------------------------------------------------------<br>
28-
Licensed by EDF under the Modelica License 2<br>
29-
Copyright &copy; EDF 2009 - 2018<br>
30-
BuildSysPro version 3.2.0<br>
28+
Licensed by EDF under a 3-clause BSD-license<br>
29+
Copyright &copy; EDF 2009 - 2019<br>
30+
BuildSysPro version 3.3.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
@@ -35,9 +35,9 @@ equation
3535
<p><u><b>Validations</b></u></p>
3636
<p>Validated model - EAB 04/2010</p>
3737
<p><b>--------------------------------------------------------------<br>
38-
Licensed by EDF under the Modelica License 2<br>
39-
Copyright &copy; EDF 2009 - 2018<br>
40-
BuildSysPro version 3.2.0<br>
38+
Licensed by EDF under a 3-clause BSD-license<br>
39+
Copyright &copy; EDF 2009 - 2019<br>
40+
BuildSysPro version 3.3.0<br>
4141
Author : EDF<br>
4242
--------------------------------------------------------------</b></p>
4343
</html>"));

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

Lines changed: 59 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,18 @@
22
model ExtLWR
33
"Long wavelength radiation exchanges with the sky and the environment"
44

5+
parameter Boolean backLWR=false "Model used to calculate exchanges with the soil and the environnement?" annotation(Evaluate=true,HideResult=true,
6+
choices(choice=true "Exchanges with the soil", choice=false "Echanges with the sky (default)", radioButtons=true));
7+
8+
parameter Boolean use_incl_in=false "Prescribed or fixed tilt of the surface relative to the horizontal" annotation(Evaluate=true,HideResult=true,
9+
choices(choice=true "Prescribed", choice=false "Fixed", radioButtons=true));
10+
511
parameter Modelica.SIunits.Area S=1 "Surface";
6-
parameter Real eps=0.5 "Emissivity";
7-
parameter Modelica.SIunits.Conversions.NonSIunits.Angle_deg incl
8-
"Tilt of the surface relative to the horizontal - toward the ground=180°, toward the sky=0°, vertical=90°";
12+
parameter Real eps=0.5 "Emissivity";
13+
14+
parameter Real incl=30
15+
"Tilt of the surface relative to the horizontal - toward the ground=180°, toward the sky=0°, vertical=90°"
16+
annotation(Dialog(enable=not use_incl_in));
917
parameter Boolean GLO_env=true
1018
"Integration of long wavelength radiation (infrared) toward the environment";
1119
parameter Boolean GLO_ciel=true
@@ -15,12 +23,6 @@ parameter Boolean GLO_ciel=true
1523
"Sky temperature" annotation (Placement(transformation(extent={{-100,-50},{
1624
-80,-30}}, rotation=0), iconTransformation(extent={{-100,-50},{-80,
1725
-30}})));
18-
BuildSysPro.BaseClasses.HeatTransfer.Components.BodyRadiation GLOenv(Gr=GrEnv)
19-
"Long wavelength exchanges with the environment"
20-
annotation (Placement(transformation(extent={{-28,24},{4,56}})));
21-
BuildSysPro.BaseClasses.HeatTransfer.Components.BodyRadiation GLOciel(Gr=GrCiel)
22-
"Long wavelength exchanges with the sky"
23-
annotation (Placement(transformation(extent={{-32,-57},{2,-23}})));
2426
BuildSysPro.BaseClasses.HeatTransfer.Interfaces.HeatPort_a T_ext
2527
"Outside temperature (of the environment)" annotation (Placement(
2628
transformation(extent={{-100,30},{-80,50}}, rotation=0),
@@ -29,14 +31,50 @@ parameter Boolean GLO_ciel=true
2931
"Outside temperature at the wall surface" annotation (Placement(
3032
transformation(extent={{80,-10},{100,10}}, rotation=0),
3133
iconTransformation(extent={{80,-10},{100,10}})));
34+
BuildSysPro.BaseClasses.HeatTransfer.Components.BodyRadiation GLOenv(Gr_as_input=use_incl_in, Gr=GrEnv)
35+
"Long wavelength exchanges with the environment"
36+
annotation (Placement(transformation(extent={{-28,24},{4,56}})));
37+
BuildSysPro.BaseClasses.HeatTransfer.Components.BodyRadiation GLOciel(Gr_as_input=use_incl_in, Gr=GrCiel)
38+
"Long wavelength exchanges with the sky"
39+
annotation (Placement(transformation(extent={{-32,-57},{2,-23}})));
40+
Modelica.Blocks.Interfaces.RealInput incl_in if use_incl_in
41+
"Tilt of the surface relative to the horizontal - toward the ground=180°, toward the sky=0°, vertical=90°"
42+
annotation (Placement(transformation(extent={{-120,-10},{-100,10}}),
43+
iconTransformation(extent={{-100,64},{-80,84}})));
3244

3345
protected
34-
parameter Real GrEnv= if GLO_env then eps*S*(0.5*(1-cos(incl*Modelica.Constants.pi/180))) else 0
46+
parameter Real incl_gen = if backLWR and not use_incl_in then 180-incl else incl
47+
"Generic value of tilt for the calculations (either oriented toward the sky or the soil)";
48+
Modelica.Blocks.Sources.RealExpression incl_gen_in(y=if backLWR then 180-incl else incl) if use_incl_in;
49+
50+
51+
parameter Real GrEnv = if GLO_env and not use_incl_in then eps*S*(0.5*(1-cos(incl_gen*Modelica.Constants.pi/180))) else 0
3552
"Net radiation conductance between two surfaces (Env-Wall)";
36-
parameter Real GrCiel= if GLO_ciel then eps*S*(0.5*(1+cos(incl*Modelica.Constants.pi/180))) else 0
53+
parameter Real GrCiel= if GLO_ciel and not use_incl_in then eps*S*(0.5*(1+cos(incl_gen*Modelica.Constants.pi/180))) else 0
3754
"Net radiation conductance between two surfaces (Sky-Wall)";
3855

56+
Modelica.Blocks.Sources.RealExpression GrEnv_in(y=if GLO_env then
57+
eps*S*(0.5*(1 - cos(incl_gen_in.y*Modelica.Constants.pi/180))) else 0) if use_incl_in;
58+
Modelica.Blocks.Sources.RealExpression GrCiel_in(y=if GLO_ciel then
59+
eps*S*(0.5*(1+cos(incl_gen_in.y*Modelica.Constants.pi/180))) else 0) if use_incl_in;
60+
61+
62+
//Internal connector
63+
protected
64+
Modelica.Blocks.Interfaces.RealInput incl_in_internal "Internal connector for optional configuration";
65+
66+
67+
3968
equation
69+
connect(incl_gen_in.y, incl_in_internal);
70+
if not use_incl_in then incl_in_internal=incl_gen;
71+
end if;
72+
73+
if use_incl_in then
74+
connect(GLOenv.Gr_in, GrEnv_in.y);
75+
connect(GLOciel.Gr_in, GrCiel_in.y);
76+
end if;
77+
4078
connect(T_ext, GLOenv.port_a) annotation (Line(
4179
points={{-90,40},{-26.4,40}},
4280
color={191,0,0},
@@ -53,6 +91,7 @@ equation
5391
points={{0.3,-40},{50.5,-40},{50.5,0},{90,0}},
5492
color={255,0,0},
5593
smooth=Smooth.None));
94+
5695
connect(T_sky, T_sky) annotation (Line(
5796
points={{-90,-40},{-90,-40}},
5897
color={191,0,0},
@@ -123,17 +162,23 @@ annotation (
123162
rubber 0.95
124163
silver, polished 0.02
125164
wood 0.85..0.9</pre>
165+
166+
<p>It is possible to calculate the long wavelength exchanges with the soil using the boolean <code>backLWR = true</code>.</p>
126167
<p><u><b>Known limits / Use precautions</b></u></p>
127168
<p>As this model is used in a wall model with convective and radiatives exchanges on its surface, care must be taken to ensure that the outside superficial heat exchange coefficient is a real convective heat exchange coefficient instead of integrating the long wavelength radiation.</p>
128169
<p><u><b>Validations</b></u></p>
129170
<p>Validated model (analytical verification + verification of the coherence of the exchanged fluxes profile) - Aurélie Kaemmerlen 09/2011</p>
130171
<p><b>--------------------------------------------------------------<br>
131-
Licensed by EDF under the Modelica License 2<br>
132-
Copyright &copy; EDF 2009 - 2018<br>
133-
BuildSysPro version 3.2.0<br>
172+
Licensed by EDF under a 3-clause BSD-license<br>
173+
Copyright &copy; EDF 2009 - 2019<br>
174+
BuildSysPro version 3.3.0<br>
134175
Author : Aurélie KAEMMERLEN, EDF (2011)<br>
135176
Initial model : <a href=\"Modelica.Thermal.HeatTransfer.Components.BodyRadiation\">BodyRadiation</a>, Anton Haumer, Copyright © Modelica Association, Michael Tiller and DLR.<br>
136177
--------------------------------------------------------------</b></p>
178+
</html>", revisions="<html>
179+
<p>Stéphanie Froidurot 07/2019 : Adding the possibility to use fixed (parameter) or prescribed (input) tilt, controlled by a boolean (use_incl_in).
180+
Adding the possibility to calculate radiative exchanges with the soil (tilt = 180 - incl), controlled by a boolean (backLWR).
181+
</p>
137182
</html>"),
138183
Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{
139184
100,100}})));

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ equation
7272
<p><u><b>Validations</b></u></p>
7373
<p>Validated model</p>
7474
<p><b>--------------------------------------------------------------<br>
75-
Licensed by EDF under the Modelica License 2<br>
76-
Copyright &copy; EDF 2009 - 2018<br>
77-
BuildSysPro version 3.2.0<br>
75+
Licensed by EDF under a 3-clause BSD-license<br>
76+
Copyright &copy; EDF 2009 - 2019<br>
77+
BuildSysPro version 3.3.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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ equation
6464
<p><u><b>Validations</b></u></p>
6565
<p>Validated model - Emmanuel Amy de la Bretèque 06/2010</p>
6666
<p><b>--------------------------------------------------------------<br>
67-
Licensed by EDF under the Modelica License 2<br>
68-
Copyright &copy; EDF 2009 - 2018<br>
69-
BuildSysPro version 3.2.0<br>
67+
Licensed by EDF under a 3-clause BSD-license<br>
68+
Copyright &copy; EDF 2009 - 2019<br>
69+
BuildSysPro version 3.3.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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ extends BuildSysPro.BaseClasses.HeatTransfer.Components.Wall(
3939
<p><u><b>Validations</b></u></p>
4040
<p>Validated model - Hassan Bouia 10/2011</p>
4141
<p><b>--------------------------------------------------------------<br>
42-
Licensed by EDF under the Modelica License 2<br>
43-
Copyright &copy; EDF 2009 - 2018<br>
44-
BuildSysPro version 3.2.0<br>
42+
Licensed by EDF under a 3-clause BSD-license<br>
43+
Copyright &copy; EDF 2009 - 2019<br>
44+
BuildSysPro version 3.3.0<br>
4545
Author : Hassan BOUIA, EDF (2011)<br>
4646
--------------------------------------------------------------</b></p>
4747
</html>",

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,9 @@ annotation (
142142
<p><u><b>Validations</b></u></p>
143143
<p>Modèle validé - Gilles PLESSIS 12/2012</p>
144144
<p><b>--------------------------------------------------------------<br>
145-
Licensed by EDF under the Modelica License 2<br>
146-
Copyright &copy; EDF 2009 - 2018<br>
147-
BuildSysPro version 3.2.0<br>
145+
Licensed by EDF under a 3-clause BSD-license<br>
146+
Copyright &copy; EDF 2009 - 2019<br>
147+
BuildSysPro version 3.3.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)