Skip to content

Commit

Permalink
Corrected issue #304 (glass energy balance).
Browse files Browse the repository at this point in the history
  • Loading branch information
@mwetter
mwetter committed Dec 9, 2014
1 parent 8f00a89 commit b712f58
Show file tree
Hide file tree
Showing 23 changed files with 169 additions and 146 deletions.
11 changes: 10 additions & 1 deletion Buildings/HeatTransfer/Windows/BaseClasses/GlassLayer.mo
View file
Expand Up @@ -52,7 +52,7 @@ equation
// Heat balance of surface node
// These equations are from Window 6 Technical report, (2.1-14) to (2.1-17)
0 = port_a.Q_flow + port_b.Q_flow + QAbs_flow + JIn_a + JIn_b - JOut_a - JOut_b;
u * (port_b.T-port_a.T) = 2*R * (-port_a.Q_flow-QAbs_flow/2-JIn_a+JOut_a);
u * (port_b.T-port_a.T) = 2*R * (-port_a.Q_flow-QAbs_flow/2-JIn_a+JOut_a + tauIR * (JIn_a - JIn_b));
// Radiosity balance
if linearize then
T4_a = 4*T03*port_a.T - 3*T04;
Expand Down Expand Up @@ -113,6 +113,15 @@ Buildings.HeatTransfer.Radiosity.WindowPane</a>.
</html>", revisions="<html>
<ul>
<li>
December 8, 2014, by Michael Wetter:<br/>
Added term <code>tauIR * (JIn_a - JIn_b)</code>
to heat balance. This is to correct
issue
<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/304\">#304</a>
that led to an error in the glass temperatures if the glass conductance
is very small.
</li>
<li>
October 17, 2014, by Michael Wetter:<br/>
Removed nominal value for heat ports as the default is already
<i>300</i> Kelvin.
Expand Down
8 changes: 4 additions & 4 deletions ...ings/Resources/ReferenceResults/Dymola/Buildings_Controls_Predictors_Examples_BESTEST.txt
View file
@@ -1,5 +1,5 @@
last-generated=2014-10-29
preErr.u1=[0.00000000000000000000, 0.00000000000000000000, 0.00000000000000000000, 0.00000000000000000000, 2249.34863281250000000000, 0.00000000000000000000, 1036.26342773437500000000, 3015.48632812500000000000, 3698.77587890625000000000, 3284.25488281250000000000, 4208.03515625000000000000, 3817.57666015625000000000, 1900.70690917968750000000, 3500.84301757812500000000, 2385.28149414062500000000, 195.49012756347656250000, 1957.19201660156250000000, 2251.76928710937500000000, -38.44908905029296875000, 1439.19592285156250000000, 2652.48291015625000000000, 135.78686523437500000000, 581.61029052734375000000, 2508.73803710937500000000, 433.34344482421875000000, -22.30280494689941406250, 2195.90258789062500000000, 1308.12890625000000000000, -64.29897308349609375000, 1813.94067382812500000000, 1716.86206054687500000000, -131.64537048339843750000, 1966.81835937500000000000, 1701.16955566406250000000, -44.96736145019531250000, 580.27014160151975374902, 2003.17626953125000000000, 19.72822952270507812500, -204.49647521972656250000, 1832.19091796875000000000, 130.00230407714843750000, -217.82131958007812500000, 1272.57556152343750000000, 1684.35644531250000000000, 0.00000000000000000000, 2730.93408203125000000000, 2795.60205078125000000000, 0.00000000000000000000, 2342.11230468750000000000, 3056.31420898437500000000, 212.21241760253906250000, 76.23970794677734375000, 2058.70092773437500000000, 181.21104431152343750000, 90.97151184082031250000, 1452.93920898437500000000, 645.67785644531250000000, 1.11242818832307532873, 1498.98107910156250000000, 1977.98815917968750000000, 0.00000000000000000000, 2144.28002929687500000000, 2333.10546875000000000000, 400.86383056640625000000, 3371.91333007812500000000, 3421.78930664062500000000, 963.04315185546875000000, 1284.65917968750000000000, 2546.70776367187500000000, 475.79937744155654399947, 274.04608154297096689334, 2121.67944335937500000000, 2105.53564453125000000000, -68.54216766357421875000, 1454.12219238281250000000, 1990.09619140625000000000, -287.90551757812500000000, 1.66166019439697265625, 1551.63757324218750000000, -109.46260833740234375000, 308.03149414062500000000, 1877.23303222656250000000, 522.85888671875000000000, 506.85263061523437500000, 2480.57250976562500000000, 1219.10083007812500000000, 251.33970642089843750000, 2032.13146972656250000000, 1661.43200683593750000000, -21.99481010437011718750, 744.90863037109375000000, 2151.48291015625000000000, 456.19717407226562500000, 1316.20800781250000000000, 2826.26123046875000000000, 653.31762695312500000000, 571.32464599609375000000, 2460.56030273437500000000, 224.83770751953125000000, 0.00000000000000000000, 2774.38232421875000000000]
preErr.u2=[0.00000000000000000000, 1684.37927246093750000000, 0.00000000000000000000, 1600.42138671875000000000, 2910.58227539062500000000, 2909.59082031250000000000, 3656.14868164062500000000, 3725.88818359375045474735, 547.16717529296875000000, 3202.00561523437500000000, 4205.69726562500000000000, 671.52404785156250000000, 0.00000000000000000000, 3709.11352539062500000000, 1875.27697753902634758560, 0.00000000000000000000, 2048.52001953125000000000, 2168.88256835937545474735, 0.00000000000000000000, 1259.51074218750000000000, 2104.93139648437500000000, 0.00000000000000000000, 834.78393554687500000000, 2301.14355468750000000000, 0.00000000000000000000, 0.00000000000000000000, 2353.54541015625000000000, 0.00000000000000000000, 0.00000000000000000000, 1809.25793457031250000000, 1716.51074218750000000000, 0.00000000000000000000, 1516.02014160156250000000, 1719.59741210937500000000, 0.00000000000000000000, 723.71246337888351263246, 1975.82592773437500000000, 0.00000000000000000000, 0.00000000000000000000, 1868.78613281250000000000, 0.00000000000000000000, 0.00000000000000000000, 1292.58203125000000000000, 1863.33654785156250000000, 0.00000000000000000000, 2382.37744140625000000000, 2816.71166992187500000000, 0.00000000000000000000, 2682.14794921875000000000, 2990.51171875000000000000, 0.00000000000000000000, 456.54779052734375000000, 1902.70458984375000000000, 0.00000000000000000000, 0.00000000000000000000, 1659.82006835935840172169, 11.89496421813751148022, 0.00000000000000000000, 1740.33142089843750000000, 1990.08886718750000000000, 1351.19140625000000000000, 2051.00146484375000000000, 2355.69287109375000000000, 1917.85766601562500000000, 3038.97436523437500000000, 3620.40747070312500000000, 0.00000000000000000000, 583.12750244140625000000, 2750.21362304687681898940, 0.00000000000000000000, 0.00000000000000000000, 2242.11035156250000000000, 1500.31848144531250000000, 0.00000000000000000000, 1593.03588867187500000000, 1986.19702148437500000000, 0.00000000000000000000, 0.00000000000000000000, 1663.81298828125000000000, 0.00000000000000000000, 0.00000000000000000000, 1784.37573242187500000000, 1729.66601562500000000000, 0.00000000000000000000, 2514.95556640625000000000, 410.70431518554687500000, 0.00000000000000000000, 2046.25317382812500000000, 1600.54589843750000000000, 0.00000000000000000000, 1011.57678222656250000000, 2138.27514648437500000000, 0.00000000000000000000, 1491.00354003906250000000, 2806.89379882812500000000, 0.00000000000000000000, 464.54214477539062500000, 2347.38305664062500000000, 1928.72668457031250000000, 0.00000000000000000000, 2723.48193359375000000000]
last-generated=2014-12-08
preErr.u1=[0.00000000000000000000, 0.00000000000000000000, 0.00000000000000000000, 0.00000000000000000000, 2249.34863281250000000000, 0.00000000000000000000, 1036.57067871093750000000, 3015.50732421875000000000, 3698.77539062500000000000, 3284.25488281250000000000, 4208.08154296875000000000, 3817.57788085937500000000, 1901.33532714843750000000, 3500.59350585937500000000, 2385.28344726562500000000, 195.49012756347656250000, 1956.71704101562500000000, 2251.76733398437500000000, -38.44906616210937500000, 1438.96948242187500000000, 2652.48291015625000000000, 135.78686523437500000000, 581.80462646484375000000, 2508.74829101562500000000, 433.49279785156250000000, -22.34274291992187500000, 2195.73925781250000000000, 1308.36901855468750000000, -64.37308502197265625000, 1814.52331542968750000000, 1716.92651367187500000000, -131.64538574218750000000, 1966.71887207031250000000, 1701.19763183593750000000, -44.96735382080078125000, 580.35559082026975374902, 2003.27526855468750000000, 19.72887229919433593750, -204.54011535644531250000, 1832.17492675781250000000, 130.00337219238281250000, -217.85855102539062500000, 1272.51000976562500000000, 1684.51391601562500000000, 0.00000000000000000000, 2730.89208984375000000000, 2795.60742187500000000000, 0.00000000000000000000, 2341.60253906250000000000, 3056.37670898437500000000, 211.99052429199218750000, 76.33460998535156250000, 2058.50024414062500000000, 181.21611022949218750000, 90.79847717285156250000, 1452.93066406250000000000, 645.82250976562500000000, 1.10014116763979652447, 1499.49121093750000000000, 1977.97082519531250000000, 0.00000000000000000000, 2144.32543945312500000000, 2333.09838867187500000000, 400.86456298828125000000, 3371.99804687500000000000, 3421.83154296875000000000, 962.98315429687500000000, 1284.61804199218750000000, 2546.69335937500000000000, 475.84393310561893031263, 273.98281860351784189334, 2121.74682617187500000000, 2105.55004882812500000000, -68.54333496093750000000, 1454.80822753906250000000, 1990.07324218750000000000, -287.90649414062500000000, 1.62409412860870361328, 1551.63781738281250000000, -109.46224212646484375000, 308.04367065429687500000, 1877.32666015625000000000, 522.85900878906250000000, 506.86804199218750000000, 2480.66210937500000000000, 1219.16821289062500000000, 251.33824157714843750000, 2032.69445800781250000000, 1661.46862792968750000000, -21.99469757080078125000, 744.95245361328125000000, 2151.46386718750000000000, 456.20095825195312500000, 1316.32324218750000000000, 2826.27880859375000000000, 653.26861572265625000000, 571.39959716796875000000, 2460.49780273437500000000, 224.82096862792968750000, 0.00000000000000000000, 2774.63549804687500000000]
preErr.u2=[0.00000000000000000000, 1684.37927246093750000000, 0.00000000000000000000, 1600.26965332031250000000, 2910.58154296875000000000, 2909.59082031250000000000, 3656.14868164062500000000, 3725.88818359375045474735, 547.16723632812500000000, 3202.59741210937500000000, 4205.70556640625000000000, 671.52423095703125000000, 0.00000000000000000000, 3709.09082031250000000000, 1875.27709960933884758560, 0.00000000000000000000, 2048.48291015625000000000, 2168.88208007812545474735, 0.00000000000000000000, 1259.93530273437500000000, 2104.90307617187500000000, 0.00000000000000000000, 834.45446777343750000000, 2301.20654296875000000000, 0.00000000000000000000, 0.00000000000000000000, 2353.53100585937500000000, 0.00000000000000000000, 0.00000000000000000000, 1809.32739257812500000000, 1716.51184082031250000000, 0.00000000000000000000, 1515.92370605468750000000, 1719.59558105468750000000, 0.00000000000000000000, 724.37579345700851263246, 1975.83496093750000000000, 0.00000000000000000000, 0.00000000000000000000, 1868.78784179687500000000, 0.00000000000000000000, 0.00000000000000000000, 1292.73791503906250000000, 1863.34606933593750000000, 0.00000000000000000000, 2382.31127929687500000000, 2816.70996093750000000000, 0.00000000000000000000, 2682.16333007812500000000, 2990.51196289062500000000, 0.00000000000000000000, 456.27682495117187500000, 1902.69714355468750000000, 0.00000000000000000000, 0.00000000000000000000, 1659.81689453123340172169, 0.92546272277815400109, 0.00000000000000000000, 1740.36315917968750000000, 1990.08947753906250000000, 1351.19641113281250000000, 2051.01074218750000000000, 2355.69287109375000000000, 1917.85766601562500000000, 3038.97436523437500000000, 3620.40747070312500000000, 0.00000000000000000000, 583.26843261718750000000, 2750.20776367187681898940, 0.00000000000000000000, 0.00000000000000000000, 2242.10961914062500000000, 1500.32202148437500000000, 0.00000000000000000000, 1593.05029296875000000000, 1986.19714355468750000000, 0.00000000000000000000, 0.00000000000000000000, 1662.49584960937500000000, 0.00000000000000000000, 0.00000000000000000000, 1784.56237792968750000000, 1729.66430664062500000000, 0.00000000000000000000, 2515.05053710937500000000, 410.69845581054687500000, 0.00000000000000000000, 2046.32226562500000000000, 1600.54663085937500000000, 0.00000000000000000000, 1011.66870117187500000000, 2139.23242187500000000000, 0.00000000000000000000, 1491.04101562500000000000, 2806.88525390625000000000, 0.00000000000000000000, 464.41995239257812500000, 2347.37182617187500000000, 1928.72680664062500000000, 0.00000000000000000000, 2723.45996093750000000000]
time=[0.00000000000000000000, 2678400.00000000000000000000]
preErr.y=[0.00000000000000000000, -0.42109483480453491211, 0.00000000000000000000, -0.40010535717010498047, -0.16530835628509521484, -0.72739768028259277344, -0.65497130155563354492, -0.17760045826435102989, 0.78790217638015747070, 0.02056230790913105011, 0.00058448698837310076, 0.78651314973831176758, 0.47517672181129455566, -0.05206763744354248047, 0.12750108540059038043, 0.04887253046035766602, -0.02283201180398464203, 0.02072162926197044022, -0.00961227249354124069, 0.04492130875587463379, 0.13688789308071136475, 0.03394671902060508728, -0.06329341977834701538, 0.05189863219857215881, 0.10833586007356643677, -0.00557570112869143486, -0.03941075503826141357, 0.32703223824501037598, -0.01607474312186241150, 0.00117069645784795284, 0.00008784516103332862, -0.03291134163737297058, 0.11269953101873397827, -0.00460697896778583527, -0.01124184019863605499, -0.03586057946086428777, 0.00683760177344083786, 0.00493205711245536804, -0.05112411826848983765, -0.00914878398180007935, 0.03250057622790336609, -0.05445532873272895813, -0.00500163016840815544, -0.04474502056837081909, 0.00000000000000000000, 0.08713917434215545654, -0.00527741108089685440, 0.00000000000000000000, -0.08500896394252777100, 0.01645061187446117401, 0.05305310711264610291, -0.09507702291011810303, 0.03899908065795898438, 0.04530275985598564148, 0.02274287678301334381, -0.05172020569443285670, 0.15844573080539756105, 0.00027810703613772854, -0.06033759564161300659, -0.00302518880926072598, -0.33779785037040710449, 0.02331961877644062042, -0.00564687466248869896, -0.37924844026565551758, 0.08323471993207931519, -0.04965450242161750793, 0.24076078832149505615, 0.17538291215896606445, -0.05087644979357768688, 0.11894984543327274951, 0.06851152330637033661, -0.03010776080191135406, 0.15130430459976196289, -0.01713554188609123230, -0.03472841531038284302, 0.00097478792304173112, -0.07197637856006622314, 0.00041541506652720273, -0.02804385125637054443, -0.02736565284430980682, 0.07700787484645843506, 0.02321431040763854980, -0.30170178413391113281, 0.12671315670013427734, -0.00859576743096113205, 0.20209912955760955811, 0.06283492594957351685, -0.00353042013011872768, 0.01522154826670885086, -0.00549870263785123825, -0.06666705012321472168, 0.00330193084664642811, 0.11404929310083389282, -0.04369888454675674438, 0.00484187481924891472, 0.16332940757274627686, 0.02669562771916389465, 0.02829430811107158661, -0.42597225308418273926, 0.00000000000000000000, 0.01272508222609758377]
preErr.y=[0.00000000000000000000, -0.42109480500221252441, 0.00000000000000000000, -0.40006738901138305664, -0.16530819237232208252, -0.72739768028259277344, -0.65489447116851806641, -0.17759521305561079552, 0.78790205717086791992, 0.02041437849402427673, 0.00059405824868008494, 0.78651344776153564453, 0.47533383965492248535, -0.05212434381246566772, 0.12750156223774858355, 0.04887253418564796448, -0.02294147759675979614, 0.02072132192552081711, -0.00961226690560579300, 0.04475852474570274353, 0.13689495623111724854, 0.03394671529531478882, -0.06316246092319488525, 0.05188545584678649902, 0.10837320238351821899, -0.00558568583801388741, -0.03944792598485946655, 0.32709226012229919434, -0.01609327085316181183, 0.00129896320868283510, 0.00010369662777520716, -0.03291134536266326904, 0.11269880831241607666, -0.00459947250783443451, -0.01124183833599090576, -0.03600504994392893926, 0.00686009274795651436, 0.00493221823126077652, -0.05113502964377403259, -0.00915322173386812210, 0.03250084444880485535, -0.05446463450789451599, -0.00505698239430785179, -0.04470802471041679382, 0.00000000000000000000, 0.08714523166418075562, -0.00527564156800508499, 0.00000000000000000000, -0.08514019101858139038, 0.01646622829139232635, 0.05299763008952140808, -0.09498555213212966919, 0.03895079344511032104, 0.04530402645468711853, 0.02269962057471275330, -0.05172155424952089992, 0.16122426092624667082, 0.00027503530145600558, -0.06021795794367790222, -0.00302965729497373104, -0.33779910206794738770, 0.02332872524857521057, -0.00564862927421927452, -0.37924826145172119141, 0.08325590193271636963, -0.04964395239949226379, 0.24074578285217285156, 0.17533740401268005371, -0.05087861791253139171, 0.11896098405126515063, 0.06849570572376306732, -0.03009069897234439850, 0.15130701661109924316, -0.01713583432137966156, -0.03456049785017967224, 0.00096902076620608568, -0.07197662442922592163, 0.00040602352237328887, -0.02771450020372867584, -0.02736555971205234528, 0.07701091468334197998, 0.02319106087088584900, -0.30170133709907531738, 0.12671700119972229004, -0.00859711784869432449, 0.20211742818355560303, 0.06283456087112426758, -0.00340696400962769985, 0.01523050572723150253, -0.00549867423251271248, -0.06667905300855636597, 0.00305785308592021465, 0.11405023932456970215, -0.04367944225668907166, 0.00484837917611002922, 0.16331715881824493408, 0.02674491889774799347, 0.02828144654631614685, -0.42597645521163940430, 0.00000000000000000000, 0.01279388647526502609]

0 comments on commit b712f58

Please sign in to comment.