Skip to content

Commit 8c4bc70

Browse files
authored
Merge pull request #4 from thorade/issue3_HTML_lowercase
Issue3 html lowercase
2 parents 8e2c5a6 + a207071 commit 8c4bc70

31 files changed

+83
-83
lines changed

BuildSysPro/BaseClasses/HeatTransfer/Sources/FixedHeatFlow.mo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ equation
4545
-100},{100,100}}), graphics),
4646
Documentation(info="<html>
4747
<p><u><b>Hypothesis and equations</b></u></p>
48-
<p>This model allows a specified amount of heat flow rate to be &QUOT;injected&QUOT; into a thermal system at a given port. The constant amount of heat flow rate Q_flow is given as a parameter. The heat flows into the component to which the component FixedHeatFlow is connected, if parameter Q_flow is positive.</p>
49-
<p>If parameter alpha is &GT; 0, the heat flow is mulitplied by (1 + alpha*(port.T - T_ref)) in order to simulate temperature dependent losses (which are given an reference temperature T_ref).</p>
48+
<p>This model allows a specified amount of heat flow rate to be &quot;injected&quot; into a thermal system at a given port. The constant amount of heat flow rate Q_flow is given as a parameter. The heat flows into the component to which the component FixedHeatFlow is connected, if parameter Q_flow is positive.</p>
49+
<p>If parameter alpha is &gt; 0, the heat flow is mulitplied by (1 + alpha*(port.T - T_ref)) in order to simulate temperature dependent losses (which are given an reference temperature T_ref).</p>
5050
<p><u><b>Bibliography</b></u></p>
5151
<p>none</p>
5252
<p><u><b>Instructions for use</b></u></p>

BuildSysPro/BaseClasses/HeatTransfer/Sources/PrescribedHeatFlow.mo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ equation
4848
Text(extent={{-124,106},{142,46}}, textString="%name")}),
4949
Documentation(info="<html>
5050
<p><u><b>Hypothesis and equations</b></u></p>
51-
<p>This model allows a specified amount of heat flow rate to be &QUOT;injected&QUOT; into a thermal system at a given port. The amount of heat is given by the input signal Q_flow into the model. The heat flows into the component to which the component PrescribedHeatFlow is connected, if the input signal is positive.</p>
52-
<p>If parameter alpha is &GT; 0, the heat flow is mulitplied by (1 + alpha*(port.T - T_ref)) in order to simulate temperature dependent losses (which are given an reference temperature T_ref).</p>
51+
<p>This model allows a specified amount of heat flow rate to be &quot;injected&quot; into a thermal system at a given port. The amount of heat is given by the input signal Q_flow into the model. The heat flows into the component to which the component PrescribedHeatFlow is connected, if the input signal is positive.</p>
52+
<p>If parameter alpha is &gt; 0, the heat flow is mulitplied by (1 + alpha*(port.T - T_ref)) in order to simulate temperature dependent losses (which are given an reference temperature T_ref).</p>
5353
<p><u><b>Bibliography</b></u></p>
5454
<p>none</p>
5555
<p><u><b>Instructions for use</b></u></p>

BuildSysPro/BoundaryConditions/Scenarios/CombiTimeTable.mo

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ initial equation
117117
<span style=\"font-family: Courier New,courier;\"> = 1: smooth interpolation with Akima Splines such</span>
118118
<span style=\"font-family: Courier New,courier;\"> that der(y) is continuous.</span></pre>
119119
<li>If the table has only <b>one row</b>, no interpolation is performed and the table values of this row are just returned.</li>
120-
<li>Via parameters <b>startTime</b> and <b>offset</b> the curve defined by the table can be shifted both in time and in the ordinate value. The time instants stored in the table are therefore <b>relative</b> to <b>startTime</b>. If time &LT; startTime, no interpolation is performed and the offset is used as ordinate value for all outputs. </li>
120+
<li>Via parameters <b>startTime</b> and <b>offset</b> the curve defined by the table can be shifted both in time and in the ordinate value. The time instants stored in the table are therefore <b>relative</b> to <b>startTime</b>. If time &lt; startTime, no interpolation is performed and the offset is used as ordinate value for all outputs. </li>
121121
<li>The table is implemented in a numerically sound way by generating <b>time events</b> at interval boundaries, in order to not integrate over a discontinuous or not differentiable points. </li>
122122
<li>For special applications it is sometimes needed to know the minimum and maximum time instant defined in the table as a parameter. For this reason parameters <b>t_min</b> and <b>t_max</b> are provided and can be access from the outside of the table object. </li>
123123
</ul>
@@ -134,16 +134,16 @@ initial equation
134134
<span style=\"font-family: Courier New,courier;\"> e.g., time = 5.0, the output y = 23.0 (i.e. extrapolation via last 2 points).</span></pre>
135135
<p>The table matrix can be defined in the following ways: </p>
136136
<ol>
137-
<li>Explicitly supplied as <b>parameter matrix</b> &QUOT;table&QUOT;, and the other parameters have the following values: </li>
138-
<pre><span style=\"font-family: Courier New,courier;\"> tableName is &QUOT;NoName&QUOT; or has only blanks,</span>
139-
<span style=\"font-family: Courier New,courier;\"> fileName is &QUOT;NoName&QUOT; or has only blanks.</span></pre>
140-
<li><b>Read</b> from a <b>file</b> &QUOT;fileName&QUOT; where the matrix is stored as &QUOT;tableName&QUOT;. Both ASCII and binary file format is possible. (the ASCII format is described below). It is most convenient to generate the binary file from Matlab (Matlab 4 storage format), e.g., by command </li>
137+
<li>Explicitly supplied as <b>parameter matrix</b> &quot;table&quot;, and the other parameters have the following values: </li>
138+
<pre><span style=\"font-family: Courier New,courier;\"> tableName is &quot;NoName&quot; or has only blanks,</span>
139+
<span style=\"font-family: Courier New,courier;\"> fileName is &quot;NoName&quot; or has only blanks.</span></pre>
140+
<li><b>Read</b> from a <b>file</b> &quot;fileName&quot; where the matrix is stored as &quot;tableName&quot;. Both ASCII and binary file format is possible. (the ASCII format is described below). It is most convenient to generate the binary file from Matlab (Matlab 4 storage format), e.g., by command </li>
141141
<pre><span style=\"font-family: Courier New,courier;\"> save tables.mat tab1 tab2 tab3 -V4</span></pre>
142142
<p>when the three tables tab1, tab2, tab3 should be used from the model.</p>
143-
<li>Statically stored in function &QUOT;usertab&QUOT; in file &QUOT;usertab.c&QUOT;. The matrix is identified by &QUOT;tableName&QUOT;. Parameter fileName = &QUOT;NoName&QUOT; or has only blanks.</li>
143+
<li>Statically stored in function &quot;usertab&quot; in file &quot;usertab.c&quot;. The matrix is identified by &quot;tableName&quot;. Parameter fileName = &quot;NoName&quot; or has only blanks.</li>
144144
</ol>
145-
<p>Table definition methods (1) and (3) do <b>not</b> allocate dynamic memory, and do not access files, whereas method (2) does. Therefore (1) and (3) are suited for hardware-in-the-loop simulation (e.g. with dSpace hardware). When the constant &QUOT;NO_FILE&QUOT; is defined in &QUOT;usertab.c&QUOT;, all parts of the source code of method (2) are removed by the C-preprocessor, such that no dynamic memory allocation and no access to files takes place. </p>
146-
<p>If tables are read from an ASCII-file, the file need to have the following structure (&QUOT;-----&QUOT; is not part of the file content): </p>
145+
<p>Table definition methods (1) and (3) do <b>not</b> allocate dynamic memory, and do not access files, whereas method (2) does. Therefore (1) and (3) are suited for hardware-in-the-loop simulation (e.g. with dSpace hardware). When the constant &quot;NO_FILE&quot; is defined in &quot;usertab.c&quot;, all parts of the source code of method (2) are removed by the C-preprocessor, such that no dynamic memory allocation and no access to files takes place. </p>
146+
<p>If tables are read from an ASCII-file, the file need to have the following structure (&quot;-----&quot; is not part of the file content): </p>
147147
<pre><span style=\"font-family: Courier New,courier;\">-----------------------------------------------------</span>
148148
<span style=\"font-family: Courier New,courier;\">#1</span>
149149
<span style=\"font-family: Courier New,courier;\">double tab1(6,2) # comment line</span>
@@ -161,7 +161,7 @@ initial equation
161161
<span style=\"font-family: Courier New,courier;\"> 6 18</span>
162162
<span style=\"font-family: Courier New,courier;\"> 8 32</span>
163163
<span style=\"font-family: Courier New,courier;\">-----------------------------------------------------</span></pre>
164-
<p>Note, that the first two characters in the file need to be &QUOT;#1&QUOT;. Afterwards, the corresponding matrix has to be declared with type, name and actual dimensions. Finally, in successive rows of the file, the elements of the matrix have to be given. Several matrices may be defined one after another. </p>
164+
<p>Note, that the first two characters in the file need to be &quot;#1&quot;. Afterwards, the corresponding matrix has to be declared with type, name and actual dimensions. Finally, in successive rows of the file, the elements of the matrix have to be given. Several matrices may be defined one after another. </p>
165165
166166
<p><b>--------------------------------------------------------------<br>
167167
Licensed by EDF under the Modelica License 2<br>

BuildSysPro/BoundaryConditions/Scenarios/ScenarioDHW.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Author : Hassan BOUIA, EDF (2011)<br>
115115
<p>Aurélie Kaemmerlen 06/2012 :</p>
116116
<p><ul>
117117
<li>Blocage des paramètres propres aux scénarios perso lorsque les scénarios pré-établis sont sélectionnés (AICVF et M324)</li>
118-
<li>Remplacement du modèle CombiStep1Ds par le nouveau scénario &QUOT;FctEscalierMat&QUOT;</li>
118+
<li>Remplacement du modèle CombiStep1Ds par le nouveau scénario &quot;FctEscalierMat&quot;</li>
119119
</ul></p>
120120
<p><br>Aurélie Kaemmerlen 10/2013 : Suppression des paramètres en protected avec les équations conditionnelles définissant les chemins vers les fichiers AICVF et M324 - Donnait une erreur lors de l'exécution après chiffrement du modèle !</p>
121121
</html>"));

BuildSysPro/BoundaryConditions/Scenarios/ScenarioRT.mo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -534,11 +534,11 @@ Regulation 2012"),
534534
<td><p>Water vapour generation out of occupancy and lighting</p><p>1 = presence</p><p>0 = absence</p><p>Possible modulation between 0 and 1</p></td>
535535
</tr>
536536
</table></p>
537-
<p>Scenarios describing the occupancy and specific uses provide &QUOT;physical&QUOT; information (superior ports of the model). The heat loads can be directly connected to an air node, and vapors inputs are in [kg steam/sec]. These are expressed through a RealOutput connector (causal modelling) and will then be adapted to the connectors selected for the multi-physics modelling.</p>
537+
<p>Scenarios describing the occupancy and specific uses provide &quot;physical&quot; information (superior ports of the model). The heat loads can be directly connected to an air node, and vapors inputs are in [kg steam/sec]. These are expressed through a RealOutput connector (causal modelling) and will then be adapted to the connectors selected for the multi-physics modelling.</p>
538538
<p>The use of thermal ports is conditioned by the Booleans (<code>UtilApportThOcc, UtilApportThUsageSpe, UtilApportThEclairage</code>). In situations where these ports are not used but the Booleans are set to TRUE, the following error occurs:</p>
539539
<p><i><span style=\"color: #ff0000;\">Error: Singular inconsistent scalar system for scenarioRT.ApportsThOccupants.T = (scenarioRT.prescribedHeatFlow.Q_flow*(1-scenarioRT.prescribedHeatFlow.alpha*scenarioRT.prescribedHeatFlow.T_ref))/( -scenarioRT.prescribedHeatFlow.Q_flow*scenarioRT.prescribedHeatFlow.alpha) = .../-0</span></i></p>
540540
<p>To fix the problem change the value of concerned booleans.</p>
541-
<p>Right ports of the model correspond to &QUOT;controls&QUOT;. They can be connected to models such as ventilation, hot water, lighting, heating and cooling or comfort analysis.</p>
541+
<p>Right ports of the model correspond to &quot;controls&quot;. They can be connected to models such as ventilation, hot water, lighting, heating and cooling or comfort analysis.</p>
542542
<p><u><b>Known limits / Use precautions</b></u></p>
543543
<p>None</p>
544544
<p><u><b>Validations</b></u></p>

BuildSysPro/BoundaryConditions/Scenarios/StepFunctionMat.mo

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -189,15 +189,15 @@ with n rows and two columns and a second table <code>table2 [i, j]</code> n rows
189189
<ul>
190190
<li>the interpolation is effcient because the search for a new interpolation starts from the last interval used for the previous interpolation</li>
191191
<li>if the table has only one row, its values are returned regardless of the input signal value</li>
192-
<li>if the value of the input signal <code>u</code> is outside the range defined by the first column of the table, for example, u&GT; table [size (table, 1), 1] or u &LT;table [1, 1], the corresponding value is determined by linear extrapolation from the first or last two points of the table</li>
192+
<li>if the value of the input signal <code>u</code> is outside the range defined by the first column of the table, for example, u&gt; table [size (table, 1), 1] or u &lt;table [1, 1], the corresponding value is determined by linear extrapolation from the first or last two points of the table</li>
193193
<li>the first column must be strictly monotonic</li>
194194
</ul>
195195
<p>A table can be defined as follows:</p>
196196
<ol>
197-
<li>By explicit entry of parameter &QUOT;table&QUOT;, and other parameters must be set as follows:</li>
198-
<pre> tableName = &QUOT;NoName&QUOT; or with blanks,
199-
fileName = &QUOT;NoName&QUOT; or with blanks.</pre>
200-
<li>By reading a file &QUOT;fileName&QUOT; where the matrix is stored with the name specified in the parameter &QUOT;tableName&QUOT;. Both ASCII and binary formats are possible. See details and additional information in the <a href=\"Modelica.Blocks.Tables.CombiTable1Ds\"><code>Modelica.Blocks.Tables.CombiTable1Ds</code></a> documentation</li>
197+
<li>By explicit entry of parameter &quot;table&quot;, and other parameters must be set as follows:</li>
198+
<pre> tableName = &quot;NoName&quot; or with blanks,
199+
fileName = &quot;NoName&quot; or with blanks.</pre>
200+
<li>By reading a file &quot;fileName&quot; where the matrix is stored with the name specified in the parameter &quot;tableName&quot;. Both ASCII and binary formats are possible. See details and additional information in the <a href=\"Modelica.Blocks.Tables.CombiTable1Ds\"><code>Modelica.Blocks.Tables.CombiTable1Ds</code></a> documentation</li>
201201
</ol>
202202
203203

BuildSysPro/BoundaryConditions/Scenarios/StepFunctionMatPeriodic.mo

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,15 +190,15 @@ with n rows and two columns and a second table <code>table2 [i, j]</code> n rows
190190
<ul>
191191
<li>the interpolation is effcient because the search for a new interpolation starts from the last interval used for the previous interpolation</li>
192192
<li>if the table has only one row, its values are returned regardless of the input signal value</li>
193-
<li>if the value of the input signal <code>u</code> is outside the range defined by the first column of the table, for example, u&GT; table [size (table, 1), 1] or u &LT;table [1, 1], the corresponding value is determined by linear extrapolation from the first or last two points of the table</li>
193+
<li>if the value of the input signal <code>u</code> is outside the range defined by the first column of the table, for example, u&gt; table [size (table, 1), 1] or u &lt;table [1, 1], the corresponding value is determined by linear extrapolation from the first or last two points of the table</li>
194194
<li>the first column must be strictly monotonic</li>
195195
</ul>
196196
<p>A table can be defined as follows:</p>
197197
<ol>
198-
<li>By explicit entry of parameter &QUOT;table&QUOT;, and other parameters must be set as follows:</li>
199-
<pre> tableName = &QUOT;NoName&QUOT; or with blanks,
200-
fileName = &QUOT;NoName&QUOT; or with blanks.</pre>
201-
<li>By reading a file &QUOT;fileName&QUOT; where the matrix is stored with the name specified in the parameter &QUOT;tableName&QUOT;. Both ASCII and binary formats are possible. See details and additional information in the <a href=\"Modelica.Blocks.Tables.CombiTable1Ds\"><code>Modelica.Blocks.Tables.CombiTable1Ds</code></a> documentation</li>
198+
<li>By explicit entry of parameter &quot;table&quot;, and other parameters must be set as follows:</li>
199+
<pre> tableName = &quot;NoName&quot; or with blanks,
200+
fileName = &quot;NoName&quot; or with blanks.</pre>
201+
<li>By reading a file &quot;fileName&quot; where the matrix is stored with the name specified in the parameter &quot;tableName&quot;. Both ASCII and binary formats are possible. See details and additional information in the <a href=\"Modelica.Blocks.Tables.CombiTable1Ds\"><code>Modelica.Blocks.Tables.CombiTable1Ds</code></a> documentation</li>
202202
</ol>
203203
204204

BuildSysPro/BoundaryConditions/Scenarios/StepFunctionSimpleXY.mo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ protected
3838
<p><u><b>Instructions for use</b></u></p>
3939
<p>X vector (dependent variable) and Y vector (data to be interpolated) are 2 vectors having the same size: n elements each.</p>
4040
<p>For all i from 1 to n-1, for any x in [Xi, X (i + 1) [, calculation of y = Yi</p>
41-
<p>For all x &GT;= Xn : y = Yn</p>
42-
<p>For all x, calculation of xp = >if period &GT; 0 then mod(x,period) else x and calculation of y=y(xp)</p>
41+
<p>For all x &gt;= Xn : y = Yn</p>
42+
<p>For all x, calculation of xp = >if period &gt; 0 then mod(x,period) else x and calculation of y=y(xp)</p>
4343
<p><u><b>Validations</b></u></p>
4444
<p>Validated model - Hassan Bouia 07/2012 </p>
4545
<p><b>--------------------------------------------------------------<br>

BuildSysPro/BoundaryConditions/Solar/Irradiation/FLUXsurf.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ Author : Aurélie KAEMMERLEN, EDF (2011)<br>
159159
<p><ul>
160160
<li>Ajout de sorties : hauteur et azimut du soleil, Rayonnement incident diffus provenant du sol</li>
161161
<li>Vecteur Gh de dimension 9 (anciennement 6) pour ajouter les entrées CoupleFlux, MoyFlux et dt</li>
162-
<li>Ajout d'une sécurité pour éviter un flux direct infini : sinh&GT;0.01 au lieu de &GT;0 pour le calcul de FDIRN/FDIRH</li>
162+
<li>Ajout d'une sécurité pour éviter un flux direct infini : sinh&gt;0.01 au lieu de &gt;0 pour le calcul de FDIRN/FDIRH</li>
163163
</ul></p>
164164
<p><br>Hassan Bouia 03/2013 : Simplication du calcul solaire - attention nouvelle dimension du vecteur <b>Gh</b> renommé en <b>G</b></p>
165165
<p>Amy Lindsay 03/2013 : Ajout du paramètre diffus_isotrope pour choisir entre un modèle de diffus isotrope ou le modèle de diffus HDKR</p>

BuildSysPro/BoundaryConditions/Solar/Irradiation/SolarBC.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,6 @@ BuildSysPro version 2.0.0<br>
382382
Author : Gilles PLESSIS, EDF (2013)<br>
383383
--------------------------------------------------------------</b></p>
384384
</html>", revisions="<html>
385-
<p>Gilles Plessis 12/2013 : Mise à jour des noms des paramètres SurfaceVitree-&GT;SurfacesVitrees et SurfaceExterieures-&GT;SurfacesExterieures</p>
385+
<p>Gilles Plessis 12/2013 : Mise à jour des noms des paramètres SurfaceVitree-&gt;SurfacesVitrees et SurfaceExterieures-&gt;SurfacesExterieures</p>
386386
</html>"));
387387
end SolarBC;

0 commit comments

Comments
 (0)