Skip to content

Commit 2b9327d

Browse files
thoytthoyt
authored
Merge pull request #6 from tobycheung0000/Toby_cbe_amend
Update CBE tool with new feature (Toby 1st attempt)
2 parents 5b11772 + 06cb10a commit 2b9327d

15 files changed

+719
-92
lines changed

‎static/css/common.css

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,15 @@
3131
margin-top: 5px;
3232
margin-left: 5px;}
3333

34+
.leftlabel-loc-dialog-1 { position: relative;
35+
float: left;
36+
clear: both;
37+
width: 450px;
38+
color: #636363;
39+
margin-top: 5px;
40+
margin-bottom: 10px;
41+
margin-left: 5px;}
42+
3443
.leftlabel-dialog { position: relative;
3544
float: left;
3645
clear: both;

‎static/css/psychchart.css

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,11 @@ path.comfortzone{
4949
path.comfortzone-temphum{
5050
fill: rgb(0,0,100);
5151
fill-opacity: 0.5;
52-
}
52+
}
53+
path.comfortzone-veltop{
54+
fill: rgb(0,0,100);
55+
fill-opacity: 0.5;
56+
}
5357
path.comfortzoneover{
5458
-webkit-transition-property: fill;
5559
-webkit-transition-duration: .5s;
@@ -69,6 +73,10 @@ path.psyregion {
6973
fill-opacity: 0.0;
7074
}
7175

76+
path.whiteregion {
77+
fill: White;
78+
}
79+
7280
.tick {
7381
fill:none;
7482
stroke: black;

‎static/html/help-EN.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2599,7 +2599,7 @@ <h3>Local thermal discomfort<a name="local"></a></h3>
25992599
with measurements of air temperature in particular zones surrounding the
26002600
occupant, you can see whether the discomfort effect in the space is likely to
26012601
exceed the ISO-7730 acceptability limits.</p>
2602-
<p class=MsoNormal>Change the values in the input boxes according to your measurements, and click on &quot;Calculate&quot; to see the results. A checkmark will appear next to each section, while a general compliance message will be shown at the bottom of the dialog.</p>
2602+
<p class=MsoNormal>Change the values in the input boxes according to your measurements. A checkmark will appear next to each section, while a general compliance message will be shown at the bottom of the dialog.</p>
26032603
<p class=MsoNormal>Remember that to comply with the Standard all the sections must respect the limits.</p>
26042604

26052605
<p class=MsoNormal style='margin-left:18.0pt'><o:p>&nbsp;</o:p></p>

‎static/html/help-compare.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2382,7 +2382,7 @@ <h1><!--[if supportFields]><span style='font-size:12.0pt;line-height:115%;
23822382
<h1>Introduction<a name="Introduction"></a></h1>
23832383

23842384
<p class=MsoNormal>
2385-
This web-based tool for thermal comfort calculations according to ASHRAE Standard 55-2013
2385+
This web-based tool for thermal comfort calculations according to ASHRAE Standard 55-2017
23862386
is developed at The University of California at Berkeley. Its aim is to provide a free, cross-platform
23872387
tool that allows designers and other practitioners to perform thermal comfort calculations.
23882388
</p>

‎static/html/help-ranges.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2375,7 +2375,7 @@ <h1><!--[if supportFields]><span style='font-size:12.0pt;line-height:115%;
23752375
<h1>Introduction<a name="Introduction"></a></h1>
23762376

23772377
<p class=MsoNormal>
2378-
This web-based tool for thermal comfort calculations according to ASHRAE Standard 55-2013
2378+
This web-based tool for thermal comfort calculations according to ASHRAE Standard 55-2017
23792379
is developed at The University of California at Berkeley. Its aim is to provide a free, cross-platform
23802380
tool that allows designers and other practitioners to perform thermal comfort calculations.
23812381
</p>

‎static/html/help.html

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2305,7 +2305,7 @@ <h1><!--[if supportFields]><span style='font-size:12.0pt;line-height:115%;
23052305
<h1>Introduction<a name="Introduction"></a></h1>
23062306

23072307
<p class=MsoNormal>
2308-
This web-based tool for thermal comfort calculations according to ASHRAE Standard 55-2013
2308+
This web-based tool for thermal comfort calculations according to ASHRAE Standard 55-2017
23092309
is developed at The University of California at Berkeley. Its aim is to provide a free, cross-platform
23102310
tool that allows designers and other practitioners to perform thermal comfort calculations.
23112311
</p>
@@ -2664,9 +2664,15 @@ <h3>Local thermal discomfort<a name="local"></a></h3>
26642664
with measurements of air temperature in particular zones surrounding the
26652665
occupant, you can see whether the discomfort effect in the space is likely to
26662666
exceed the ASHRAE-55 acceptability limits.</p>
2667-
<p class=MsoNormal>Change the values in the input boxes according to your measurements, and click on &quot;Calculate&quot; to see the results. A checkmark will appear next to each section, while a general compliance message will be shown at the bottom of the dialog.</p>
2667+
<p class=MsoNormal> Draft at the lower leg region may occur in the buildings conditioned by thermally stratified systems, such as displacement ventilation and underfloor air distribution, or with cold-dropping airflow along external walls and/or windows.
2668+
An ankle draft risk model, based on the work of by <a href='http://onlinelibrary.wiley.com/doi/10.1111/ina.12364/abstract' target="_blank">Liu et al. (2017)</a> <a href='http://escholarship.org/uc/item/9076254n' target="_blank">- free pdf -</a> and
2669+
<a href='http://www.sciencedirect.com/science/article/pii/S0360132315301724?via%3Dihub' target="_blank">Schiavon et al. (2016)</a> <a href='http://escholarship.org/uc/item/4p692575' target="_blank">- free pdf -</a>,
2670+
has been implemented in the tool. This model can evaluate the predicted percentage dissatisfied on draft at ankle level (PPD <sub>AD</sub>) as a function of PMV and air speed at ankle.
2671+
</p>
2672+
<p class=MsoNormal>Change the values in the input boxes according to your measurements. A checkmark will appear next to each section, while a general compliance message will be shown at the bottom of the dialog.</p>
26682673
<p class=MsoNormal>Remember that to comply with the Standard all the sections must respect the limits.</p>
26692674

2675+
26702676
<p class=MsoNormal style='margin-left:18.0pt'><o:p>&nbsp;</o:p></p>
26712677

26722678
</div>

‎static/html/leed.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -512,11 +512,11 @@
512512
</tr>
513513
<tr height=16 style='height:16.0pt'>
514514
<td colspan=13 height=16 class=xl85 style='border-right:1.0pt solid black;
515-
height:16.0pt'>Based on ASHRAE Standard 55-2013 and CBE Thermal Comfort Tool for ASHRAE-55</td>
515+
height:16.0pt'>Based on ASHRAE Standard 55-2017 and CBE Thermal Comfort Tool for ASHRAE-55</td>
516516
</tr>
517517
<tr height=15 style='height:15.0pt'></tr>
518518
<tr height=15 style='height:15.0pt'>
519-
<td height=15 class=xl65 colspan=14 style='height:15.0pt;mso-ignore:colspan'>Design compliance in accordance with section 6.2 of ASHRAE Standard 55-2013, Thermal Comfort Conditions for Human Occupancy. </td>
519+
<td height=15 class=xl65 colspan=14 style='height:15.0pt;mso-ignore:colspan'>Design compliance in accordance with section 6.2 of ASHRAE Standard 55-2017, Thermal Comfort Conditions for Human Occupancy. </td>
520520
</tr>
521521
<tr height=19 style='height:15.0pt'>
522522
<tr height=15 style='height:15.0pt'>

‎static/html/localdisc.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ <h1 style="font-size: 14px; text-align: center;" class="local">
3333
<br class="clear">
3434

3535
<hr class='local-rule'>
36-
36+
3737
<h1 style="font-size: 14px; text-align: center;" class="local">
3838
<a href="http://en.wikipedia.org/wiki/Thermal_comfort#Local_Thermal_Discomfort" target="_new">Vertical air temperature difference</a>
3939
</h1>
@@ -52,13 +52,13 @@ <h1 style="font-size: 14px; text-align: center;" class="local">
5252
<div class='ppd-right' id='vert-disc'></div>
5353

5454
<br class="clear">
55-
55+
5656
<hr class="local-rule">
5757

5858
<h1 style="font-size: 14px; text-align: center" class="local">
5959
<a href="http://en.wikipedia.org/wiki/Thermal_comfort#Local_Thermal_Discomfort" target="_new">Floor surface temperature</a>
6060
</h1>
61-
61+
6262
<div class='leftlabel-loc-dialog'>Floor temperature</div>
6363
<div class='inputfield-dialog'>
6464
<input class='input-dialog-local' id='T_floor' value='25'/>
@@ -73,7 +73,7 @@ <h1 style="font-size: 14px; text-align: center" class="local">
7373
<h1 style="font-size: 14px; text-align: center;" class="local">
7474
<a href="http://en.wikipedia.org/wiki/Thermal_comfort#Local_Thermal_Discomfort" target="_new">Draft</a>
7575
</h1>
76-
76+
7777
<div class='leftlabel-loc-dialog'>Operative temperature</div>
7878
<div class='inputfield-dialog'>
7979
<input class='input-dialog-local' id='T_op' value='25'/>
@@ -87,9 +87,9 @@ <h1 style="font-size: 14px; text-align: center;" class="local">
8787
</div>
8888
<div class='ppd-right' id='draft-disc'></div>
8989
<br class="clear"/>
90-
90+
9191
<hr class="local-rule">
92-
92+
9393
<div style="margin-top: 5px;" class='local-disc-result' id='all-disc'></div>
9494

9595
</form>

‎static/html/localdiscASH55.html

Lines changed: 157 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,157 @@
1+
<form style="font-size:80%">
2+
<h1 style="font-size: 14px; text-align: center;" class="local">
3+
<a href="http://en.wikipedia.org/wiki/Thermal_comfort#Local_Thermal_Discomfort" target="_new">Radiant temperature asymmetry</a>
4+
</h1>
5+
6+
<div class='leftlabel-loc-dialog'>Warm ceiling asymmetry</div>
7+
<div class='inputfield-dialog'>
8+
<input class='input-dialog-local' id='rad_DT_warmC' value='0'/>
9+
<span class='tempunit'> &deg;C</span>
10+
</div>
11+
<div class='ppd-right' id='rad-warmC-res'></div>
12+
13+
<div class='leftlabel-loc-dialog'>Cool ceiling asymmetry</div>
14+
<div class='inputfield-dialog'>
15+
<input class='input-dialog-local' id='rad_DT_coolC' value='0'/>
16+
<span class='tempunit'> &deg;C</span>
17+
</div>
18+
<div class='ppd-right' id='rad-coolC-res'></div>
19+
20+
<div class='leftlabel-loc-dialog'>Warm wall asymmetry</div>
21+
<div class='inputfield-dialog'>
22+
<input class='input-dialog-local' id='rad_DT_warmW' value='0'/>
23+
<span class='tempunit'> &deg;C</span>
24+
</div>
25+
<div class='ppd-right' id='rad-warmW-res'></div>
26+
27+
<div class='leftlabel-loc-dialog'>Cool wall asymmetry</div>
28+
<div class='inputfield-dialog'>
29+
<input class='input-dialog-local' id='rad_DT_coolW' value='0'/>
30+
<span class='tempunit'> &deg;C</span>
31+
</div>
32+
<div class='ppd-right' id='rad-coolW-res'></div>
33+
<br class="clear">
34+
35+
<hr class='local-rule'>
36+
37+
<h1 style="font-size: 14px; text-align: center;" class="local">
38+
<a href="http://en.wikipedia.org/wiki/Thermal_comfort#Local_Thermal_Discomfort" target="_new">Draft</a>
39+
</h1>
40+
41+
<div class='leftlabel-loc-dialog'>Operative temperature</div>
42+
<div class='inputfield-dialog'>
43+
<input class='input-dialog-local' id='T_op' value='25'/>
44+
<span class='tempunit'> &deg;C</span>
45+
</div><br />
46+
47+
<div class='leftlabel-loc-dialog'>Air speed</div>
48+
<div class='inputfield-dialog'>
49+
<input class='input-dialog-local' id='local_vel' value='0.1'/>
50+
<span class='velunit'> m/s</span>
51+
</div>
52+
<div class='ppd-right' id='draft-disc'></div>
53+
54+
<!--<br class="clear">-->
55+
<br class="clear">
56+
<!--<hr class="local-rule">-->
57+
58+
<h1 style="font-size: 14px; text-align: center;" class="local">
59+
<a href="http://en.wikipedia.org/wiki/Thermal_comfort#Local_Thermal_Discomfort" target="_new">Ankle draft</a>
60+
</h1>
61+
62+
<div class='leftlabel-loc-dialog'>Air temperature <sup> * </sup> </div>
63+
<div class='inputfield-dialog'>
64+
<input class='input-dialog-local' id='local_Ta' value='25'/>
65+
<span class='tempunit'> &deg;C</span>
66+
</div><br />
67+
68+
<div class='leftlabel-loc-dialog'>Mean radiant temperature</div>
69+
<div class='inputfield-dialog'>
70+
<input class='input-dialog-local' id='local_Tr' value='25'/>
71+
<span class='tempunit'> &deg;C</span>
72+
</div><br />
73+
74+
<div class='leftlabel-loc-dialog'>Ankle level air speed</div>
75+
<div class='inputfield-dialog'>
76+
<input class='input-dialog-local' id='local_ank_vel' min='0.06' value='0.1'/>
77+
<span class='velunit'> m/s</span>
78+
</div><br />
79+
80+
<div class='leftlabel-loc-dialog'>Humidity</div>
81+
<div class='inputfield-dialog'>
82+
<input class='input-dialog-local' id='local_rh' value='50'/>
83+
<span class='rhunit'> %</span>
84+
</div><br />
85+
86+
<div class='leftlabel-loc-dialog'>Metabolic rate</div>
87+
<div class='inputfield-dialog'>
88+
<input class='input-dialog-local' id='local_met' value='1.2'/>
89+
<span class='metunit'> met</span>
90+
</div><br />
91+
92+
<div class='leftlabel-loc-dialog'>Clothing level</div>
93+
<div class='inputfield-dialog'>
94+
<input class='input-dialog-local' id='local_clo' value='0.5'/>
95+
<span class='clounit'> clo</span>
96+
</div><br />
97+
98+
<!--<span class='result' id='test_data'></span>-->
99+
<div class='leftlabel-loc-dialog'> PMV </div>
100+
<div class="inputfield-dialog">
101+
<input class='input-dialog' readonly="readonly" id='draft_pmv_res' />
102+
</div><br />
103+
<div class='leftlabel-loc-dialog'> PPD <sub>AD</sub> </div>
104+
<div class="inputfield-dialog">
105+
<input class='input-dialog' readonly="readonly" id='ankle-draft-disc' />
106+
<span class='unit'> %</span>
107+
</div><br />
108+
109+
<div class='ppd-right' id='ank-draft-sign'></div>
110+
111+
<br class="clear"/>
112+
113+
<hr class="local-rule">
114+
115+
116+
<h1 style="font-size: 14px; text-align: center;" class="local">
117+
<a href="http://en.wikipedia.org/wiki/Thermal_comfort#Local_Thermal_Discomfort" target="_new">Vertical air temperature difference</a>
118+
</h1>
119+
120+
<div class='leftlabel-loc-dialog'>Head level temperature</div>
121+
<div class='inputfield-dialog'>
122+
<input class='input-dialog-local' id='T_head' value='25'/>
123+
<span class='tempunit'> &deg;C</span>
124+
</div><br />
125+
126+
<div class='leftlabel-loc-dialog'>Ankle level temperature</div>
127+
<div class='inputfield-dialog'>
128+
<input class='input-dialog-local' id='T_ankle' value='25'/>
129+
<span class='tempunit'> &deg;C</span>
130+
</div>
131+
<div class='ppd-right' id='vert-disc'></div>
132+
133+
<br class="clear">
134+
135+
<hr class="local-rule">
136+
137+
<h1 style="font-size: 14px; text-align: center" class="local">
138+
<a href="http://en.wikipedia.org/wiki/Thermal_comfort#Local_Thermal_Discomfort" target="_new">Floor surface temperature</a>
139+
</h1>
140+
141+
<div class='leftlabel-loc-dialog'>Floor temperature</div>
142+
<div class='inputfield-dialog'>
143+
<input class='input-dialog-local' id='T_floor' value='25'/>
144+
<span class='tempunit'> &deg;C</span>
145+
</div>
146+
<div class='ppd-right' id='floor-disc'></div>
147+
148+
149+
<br class="clear"/>
150+
151+
<hr class="local-rule">
152+
153+
<div class='leftlabel-loc-dialog-1'> The air temperature* is average of the air temperature at 0.6 and 1.1 m above the floor level</div>
154+
155+
<div style="margin-top: 5px;" class='local-disc-result' id='all-disc'></div>
156+
157+
</form>

0 commit comments

Comments
 (0)