Skip to content

Commit 686ceac

Browse files
jelgerjansenjelgerjansen
authored
Merge pull request #1434 from annadellisola/issue1433_UpdateFloorOnGround
Issue1433 update floor on ground
2 parents 70734bd + 5dd1249 commit 686ceac

8 files changed

+54
-35
lines changed

‎IDEAS/Buildings/Components/Examples/RectangularZoneEmbedded.mo‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,17 @@ model RectangularZoneEmbedded
1414
package Medium = IDEAS.Media.Water;
1515
IDEAS.Fluid.HeatExchangers.RadiantSlab.EmbeddedPipe embeddedPipe(
1616
redeclare package Medium = Medium,
17-
redeclare IDEAS.Fluid.HeatExchangers.RadiantSlab.BaseClasses.FH_ValidationEmpa4_6
18-
RadSlaCha,
17+
redeclare IDEAS.Fluid.HeatExchangers.RadiantSlab.BaseClasses.RadiantSlabChar RadSlaCha(
18+
tabs=false,
19+
T=0.25,
20+
S_1=0.08 - 0.01,
21+
S_2=0.01 + 1e-6,
22+
lambda_b=1.3,
23+
c_b=1000,
24+
rho_b(displayUnit="kg/m3") = 2000,
25+
nParCir=10,
26+
lambda_i=0.035,
27+
d_i=0.1),
1928
m_flow_nominal=1,
2029
nParCir=10,
2130
computeFlowResistance=true,
@@ -80,6 +89,11 @@ This example illustrates how to implement floorheating or CCA in RectangularZone
8089
</html>", revisions="<html>
8190
<ul>
8291
<li>
92+
June 17, 2025 by Jelger Jansen:<br/>
93+
Update parameter <code>RadSlaCha</code> in embedded pipe model according to floor structure.
94+
See <a href=\"https://github.com/open-ideas/IDEAS/issues/1433\">#1433</a>.
95+
</li>
96+
<li>
8397
August 29, 2018 by Damien Picard:<br/>
8498
First implementation
8599
</li>

‎IDEAS/Buildings/Data/Constructions/FloorOnGround.mo‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
11
within IDEAS.Buildings.Data.Constructions;
22
record FloorOnGround "Floor on ground for floor heating system"
33
extends IDEAS.Buildings.Data.Interfaces.Construction(
4-
locGain={3},
4+
locGain={2},
55
incLastLay = IDEAS.Types.Tilt.Floor,
66
mats={
77
IDEAS.Buildings.Data.Materials.Concrete(d=0.20),
8-
IDEAS.Buildings.Data.Insulation.Rockwool(d=0.1),
8+
IDEAS.Buildings.Data.Insulation.Eps(d=0.1),
99
IDEAS.Buildings.Data.Materials.Screed(d=0.08),
10-
IDEAS.Buildings.Data.Materials.Concrete(d=0.015)});
10+
IDEAS.Buildings.Data.Materials.Tile(d=0.02)});
1111

1212

1313
annotation (Documentation(revisions="<html>
1414
<ul>
1515
<li>
16+
April 14, 2025, by Anna Dell'Isola:<br/>
17+
Update contruction.
18+
See <a href=\"https://github.com/open-ideas/IDEAS/issues/1433\">#1433</a>
19+
</li>
20+
<li>
1621
November 14, 2016, by Filip Jorissen:<br/>
1722
Revised implementation: removed insulationType.
1823
</li>

‎IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_AirflowOptions.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
last-generated=2024-11-04
1+
last-generated=2025-06-17
22
statistics-initialization=
33
{
44
"nonlinear": "8, 8, 8, 8, 8, 1, 1, 1",
@@ -8,12 +8,12 @@ statistics-simulation=
88
{
99
"linear": "0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0",
1010
"nonlinear": "1, 1, 1, 1, 1, 1, 1, 1",
11-
"number of continuous time states": "275",
11+
"number of continuous time states": "270",
1212
"numerical Jacobians": "0"
1313
}
1414
time=[0e+00, 3e+06]
1515
Energy_Only.BoxModel.airModel.ACH=[5.000000074505806e-02, 5.000000074505806e-02]
1616
Energy_n50Corr.BoxModel.airModel.ACH=[5.000000074505806e-02, 5.000000074505806e-02]
1717
IAQ_1port.BoxModel.airModel.ACH=[3.10519989579916e-02, 2.87510734051466e-02, 3.185813874006271e-02, 3.428845107555389e-02, 2.420403622090816e-02, 3.178483992815018e-02, 1.436753198504448e-02, 1.429393794387579e-02, 2.036718092858791e-02, 5.567135754972696e-03, 2.758531644940376e-02, 1.938669569790363e-02, 2.132634073495865e-02, 3.149599209427834e-02, 2.555416151881214e-02, 1.107475161552429e-02, 1.255190465599298e-02, 5.812013521790504e-03, 1.462079584598541e-02, 2.444652281701565e-02, 3.553354740142822e-02, 3.005150333046913e-02, 8.15022885799408e-02, 4.794127494096756e-02, 2.441266179084778e-02, 5.179888755083084e-02, 3.407102823257446e-02, 2.164919674396515e-02, 1.661740615963915e-02, 3.360852971672995e-02, 1.459905784577131e-02, 4.591472819447517e-02, 1.477295160293579e-02, 3.419966250658035e-02, 2.766492776572728e-02, 2.787128649652004e-02, 3.616029396653175e-02, 5.296425148844719e-02, 5.384308099746704e-02, 3.50341908633709e-02, 9.799592196941376e-03, 1.447791140526533e-02, 4.565519094467163e-02, 5.677500739693642e-02, 4.256006330251694e-02, 3.613485768437386e-02, 6.033733487129211e-02, 4.841165244579315e-02, 5.271943658590317e-02, 1.937347091734409e-02, 1.238330360502005e-02, 1.501012779772282e-02, 2.09919847548008e-02, 2.457526326179504e-02, 1.148330420255661e-02, 1.294454280287062e-02, 1.451470144093028e-02, 3.273779898881855e-02, 1.937195099890203e-02, 5.801267456263304e-03, 1.363798417150974e-02, 4.504559189081192e-02, 3.807644546031952e-02, 2.99950148910284e-02, 3.25038954615593e-02, 2.366030775010586e-02, 1.313138380646706e-02, 1.283604279160504e-02, 1.473879627883431e-02, 1.493508089333762e-02, 1.217212621122599e-02, 4.152758792042732e-02, 3.626059740781784e-02, 2.351965755224228e-02, 6.092352420091629e-02, 6.799665838479996e-02, 6.046304106712341e-02, 3.346924483776093e-02, 7.728297263383865e-02, 5.896076560020447e-02, 2.949630282819271e-02, 1.112191472202539e-02, 2.568310312926769e-02, 4.966992884874344e-02, 2.427212707698345e-02, 1.389316935092211e-02, 2.602547779679298e-02, 1.464989315718412e-02, 2.178134955465794e-02, 4.62290458381176e-02, 5.052433907985687e-02, 6.004394218325615e-02, 8.724498748779297e-02, 4.541996493935585e-02, 3.568749874830246e-02, 2.469607442617416e-02, 2.843115665018559e-02, 3.945166617631912e-02, 1.435885857790709e-02, 6.136580184102058e-02, 4.554446786642075e-02]
1818
IAQ_1port_trickle.BoxModel.airModel.ACH=[4.353448376059532e-02, 4.027604311704636e-02, 3.622004017233849e-02, 3.814568743109703e-02, 2.766926027834415e-02, 3.428065031766891e-02, 1.650677993893623e-02, 1.712401397526264e-02, 2.187751792371273e-02, 9.229773655533791e-03, 3.489074483513832e-02, 2.284146100282669e-02, 3.195297345519066e-02, 4.042819514870644e-02, 4.016912728548042e-02, 1.119235251098871e-02, 1.872591488063335e-02, 1.045040041208267e-02, 2.699369937181473e-02, 4.216262698173523e-02, 5.887070298194885e-02, 3.440092504024506e-02, 1.004392802715302e-01, 6.052859127521515e-02, 2.814602106809616e-02, 5.886510759592056e-02, 3.868579119443893e-02, 2.45046466588974e-02, 1.693299226462821e-02, 7.495645433664283e-02, 2.695283852517605e-02, 5.296842381358147e-02, 1.623247750103474e-02, 5.664152652025223e-02, 4.351580888032917e-02, 3.293809294700623e-02, 3.63309271633625e-02, 7.667556405067444e-02, 7.351472228765488e-02, 4.264137148857117e-02, 1.361977402120829e-02, 2.592956274747849e-02, 7.579199969768524e-02, 1.155383959412575e-01, 1.281542330980301e-01, 7.942702621221542e-02, 1.534190773963928e-01, 1.327613741159439e-01, 7.958263158798218e-02, 2.365320920944214e-02, 3.223345428705215e-02, 2.653184533119202e-02, 3.135937452316284e-02, 3.824959322810173e-02, 1.156870927661657e-02, 1.488455757498782e-02, 2.081343904137599e-02, 4.885077476501359e-02, 2.30073127895592e-02, 1.005581580102444e-02, 4.277239739894867e-02, 1.629672348499298e-01, 1.35962650179863e-01, 1.135211810469627e-01, 4.87617515027523e-02, 2.630777657032013e-02, 1.404126547276974e-02, 1.454522646963612e-02, 2.753334492444969e-02, 3.223375231027558e-02, 4.47470098733902e-02, 1.3165183365345e-01, 7.970710843801498e-02, 4.241811111569405e-02, 1.366479843854904e-01, 2.141154706478119e-01, 1.322289854288101e-01, 4.020079597830772e-02, 1.089882552623749e-01, 8.318625390529633e-02, 4.084185138344765e-02, 1.123963668942451e-02, 9.097480028867722e-02, 9.163505584001541e-02, 3.296882659196854e-02, 1.883185096085072e-02, 6.377068907022476e-02, 3.828202933073044e-02, 7.921095937490463e-02, 7.100784033536911e-02, 8.155747503042221e-02, 9.985372424125671e-02, 1.633830815553665e-01, 7.539866119623184e-02, 4.457569122314453e-02, 4.610468074679375e-02, 3.822497650980949e-02, 5.485855787992477e-02, 2.491196244955063e-02, 1.352294087409973e-01, 6.139024347066879e-02]
19-
IAQ_2Port.BoxModel.airModel.ACH=[4.246703162789345e-02, 4.173914343118668e-02, 3.996537625789642e-02, 4.477600753307343e-02, 3.77570278942585e-02, 4.337332770228386e-02, 3.396248444914818e-02, 3.446902334690093e-02, 3.760899230837822e-02, 3.661106899380684e-02, 4.065492004156113e-02, 4.247376695275307e-02, 3.932803124189377e-02, 4.119399562478065e-02, 4.48931865394115e-02, 3.664142638444901e-02, 3.367903083562851e-02, 3.331917524337769e-02, 3.601560369133949e-02, 3.489545732736588e-02, 4.11863848567009e-02, 4.534092918038368e-02, 8.319129049777985e-02, 5.378416553139687e-02, 3.937537968158722e-02, 5.917416512966156e-02, 5.104038864374161e-02, 4.342637956142426e-02, 3.959959372878066e-02, 4.69691678881644e-02, 3.477324545383453e-02, 4.991838708519936e-02, 3.524339199066162e-02, 4.280957207083702e-02, 4.155166447162642e-02, 4.183049127459526e-02, 4.510622471570969e-02, 5.746207758784294e-02, 5.777369067072868e-02, 4.279718548059464e-02, 3.34152840077877e-02, 3.504617512226105e-02, 5.003508180379868e-02, 5.832742527127266e-02, 4.899267107248306e-02, 4.480027034878731e-02, 6.364580243825912e-02, 5.339682102203369e-02, 6.040214747190475e-02, 4.390432313084602e-02, 4.302066937088966e-02, 3.930755332112312e-02, 4.668338969349861e-02, 4.759865626692772e-02, 4.225815460085869e-02, 4.577042907476448e-02, 4.422971606254558e-02, 5.26210665702815e-02, 4.724465683102606e-02, 4.260256513953209e-02, 4.542634263634682e-02, 6.654039770364761e-02, 5.993549153208733e-02, 5.463841184973717e-02, 5.087827518582344e-02, 4.468100890517235e-02, 4.216482862830162e-02, 4.168245941400529e-02, 3.922789543867113e-02, 4.409970715641968e-02, 4.202964901924133e-02, 5.564770847558975e-02, 4.63305227458477e-02, 3.599466010928154e-02, 6.269728392362595e-02, 7.242739945650101e-02, 6.222204864025116e-02, 5.001629516482353e-02, 8.436398208141327e-02, 6.554590910673141e-02, 4.432576894760132e-02, 3.872337564826012e-02, 4.709075391292572e-02, 5.792031437158585e-02, 4.398714751005173e-02, 4.187367111444473e-02, 4.530180245637894e-02, 4.667980223894119e-02, 5.098000541329384e-02, 5.612162128090858e-02, 5.267802998423576e-02, 6.129417940974236e-02, 8.880175650119781e-02, 4.893527925014496e-02, 4.683088138699532e-02, 3.777006641030312e-02, 4.488867893815041e-02, 5.426096543669701e-02, 3.665747120976448e-02, 6.318503618240356e-02, 4.903232678771019e-02]
19+
IAQ_2Port.BoxModel.airModel.ACH=[4.246703162789345e-02, 4.173914343118668e-02, 3.996537625789642e-02, 4.477600380778313e-02, 3.77570316195488e-02, 4.337332770228386e-02, 3.396249189972878e-02, 3.446902707219123e-02, 3.760899603366852e-02, 3.661106899380684e-02, 4.065492004156113e-02, 4.247376695275307e-02, 3.932803124189377e-02, 4.119399562478065e-02, 4.48931865394115e-02, 3.664142638444901e-02, 3.367903083562851e-02, 3.331917896866798e-02, 3.601560369133949e-02, 3.489545360207558e-02, 4.11863811314106e-02, 4.534091427922249e-02, 8.319129049777985e-02, 5.378415808081627e-02, 3.937537595629692e-02, 5.917416140437126e-02, 5.104038864374161e-02, 4.342637583613396e-02, 3.959959372878066e-02, 4.696917161345469e-02, 3.477324545383453e-02, 4.991838335990906e-02, 3.524338826537132e-02, 4.280957207083702e-02, 4.155166447162642e-02, 4.183049127459526e-02, 4.510621726512909e-02, 5.746207758784294e-02, 5.777369067072868e-02, 4.279718920588493e-02, 3.34152840077877e-02, 3.504617884755135e-02, 5.003508180379868e-02, 5.832742527127266e-02, 4.899267852306366e-02, 4.480027407407761e-02, 6.364580243825912e-02, 5.339682102203369e-02, 6.040214747190475e-02, 4.390432313084602e-02, 4.302066937088966e-02, 3.930755704641342e-02, 4.668338969349861e-02, 4.759865254163742e-02, 4.225815460085869e-02, 4.577042907476448e-02, 4.422971606254558e-02, 5.26210702955718e-02, 4.724465683102606e-02, 4.260256513953209e-02, 4.542634263634682e-02, 6.654039770364761e-02, 5.993549153208733e-02, 5.463841184973717e-02, 5.087827518582344e-02, 4.468101263046265e-02, 4.216483235359192e-02, 4.168245941400529e-02, 3.922789543867113e-02, 4.409970343112938e-02, 4.202964529395103e-02, 5.564770475029945e-02, 4.63305227458477e-02, 3.599465638399124e-02, 6.269728392362595e-02, 7.242739945650101e-02, 6.222204864025116e-02, 5.001630261540413e-02, 8.436398208141327e-02, 6.554590910673141e-02, 4.432577267289162e-02, 3.872337564826012e-02, 4.709076136350632e-02, 5.792031809687614e-02, 4.398715123534203e-02, 4.187367111444473e-02, 4.530180245637894e-02, 4.667980223894119e-02, 5.098000541329384e-02, 5.612162500619888e-02, 5.267802998423576e-02, 6.129417940974236e-02, 8.880176395177841e-02, 4.893529415130615e-02, 4.68309111893177e-02, 3.777009248733521e-02, 4.48886901140213e-02, 5.42609803378582e-02, 3.665748611092567e-02, 6.318503618240356e-02, 4.903232678771019e-02]

0 commit comments

Comments
 (0)