Skip to content

Commit

Permalink
Merge pull request #841 from ibpsa/issue840_senTemHeaTra
Browse files Browse the repository at this point in the history 
Issue840 sen tem hea tra
  • Loading branch information
@mwetter
mwetter authored Oct 23, 2017
2 parents 6840f6c + 74f8f4e commit a1ff2d8
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 11 deletions.
15 changes: 12 additions & 3 deletions IBPSA/Fluid/Sensors/TemperatureTwoPort.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ model TemperatureTwoPort "Ideal two port temperature sensor"
protected
parameter Real tauHeaTraInv(final unit = "1/s")=
if tauHeaTra<1E-10 then 0 else 1/tauHeaTra
"Dummy parameter to avoid division by tauLoss";
"Dummy parameter to avoid division by tauHeaTra";
parameter Real ratTau = if dynamic then tauHeaTra/tau else 1
"Ratio of tau";
Medium.Temperature TMed(start=T_start)
"Medium temperature to which the sensor is exposed";
Medium.Temperature T_a_inflow "Temperature of inflowing fluid at port_a";
Expand Down Expand Up @@ -63,7 +65,7 @@ equation
// Output signal of sensor
if dynamic then
if transferHeat then
der(T) = (TMed-T)*k*tauInv + (TAmb-T)*tauHeaTraInv;
der(T) = (TMed-T)*k*tauInv + (TAmb-T)*tauHeaTraInv/(ratTau*k+1);
else
der(T) = (TMed-T)*k*tauInv;
end if;
Expand Down Expand Up @@ -134,7 +136,8 @@ IBPSA.Fluid.Sensors.UsersGuide</a> for an explanation.
If <code>transferHeat = true</code>, then heat transfer with the ambient is
approximated and <i>T</i> converges towards the fixed ambient
temperature <i>T<sub>Amb</sub></i> using a first order approximation
with a time constant of <code>tauHeaTra</code>.
with a time constant of <code>tauHeaTra</code>
when the flow rate is small.
Note that no energy is exchanged with the fluid as the
sensor does not influence the fluid temperature.
</p>
Expand All @@ -153,6 +156,12 @@ the mass flow rate on should set <code>transferHeat=false</code>.
</html>", revisions="<html>
<ul>
<li>
October 23, 2017 by Filip Jorissen:<br/>
Revised implementation of equations
when <code>transferHeat=true</code>.
See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/840\">#840</a>.
</li>
<li>
January 12, 2016 by Filip Jorissen:<br/>
Removed parameter <code>tauInv</code>
since this now exists in
Expand Down
16 changes: 8 additions & 8 deletions IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Sensors_Examples_TemperatureDryBulb.txt
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
last-generated=2017-04-04
last-generated=2017-10-23
statistics-simulation=
{
"numerical Jacobians": "0",
"nonlinear": " ",
"number of continuous time states": "2",
"linear": " "
}
temSteSta.T=[2.981499938964844e+02, 3.011499937772739e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02]
temDynLoss.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.982846651083485e+02, 3.020130878863759e+02, 3.047207669899989e+02, 3.066868601583144e+02, 3.08114501953125e+02, 3.091510614342058e+02, 3.099038077549835e+02, 3.104504705421043e+02, 3.108474123167869e+02, 3.111356506347656e+02, 3.113449705865165e+02, 3.114969480728044e+02, 3.113733821059998e+02, 3.110125424978921e+02, 3.106588134765625e+02, 3.103120119374153e+02, 3.099720768448091e+02, 3.096388850795367e+02, 3.093122861717725e+02, 3.089921569824219e+02, 3.086783754420453e+02, 3.083707889622671e+02, 3.080693355587648e+02, 3.077738645605097e+02, 3.074842834472656e+02, 3.035588400771805e+02, 3.007085908222721e+02, 2.986386086764741e+02, 2.971355013964552e+02, 2.960440368652344e+02, 2.952515242227421e+02, 2.946761481020036e+02, 2.942583003444946e+02, 2.939548041431544e+02, 2.937344360351562e+02, 2.935744320385545e+02, 2.93458191047579e+02, 2.933738097261707e+02, 2.93312530654169e+02, 2.932680358886719e+02, 2.932357177059181e+02, 2.93212249781859e+02, 2.93195190411837e+02, 2.931828308380979e+02, 2.93173828125e+02, 2.931673278672779e+02, 2.931625976614887e+02, 2.931591796840075e+02, 2.931566772519144e+02, 2.931548767089844e+02, 2.98288188219601e+02, 3.020156513640365e+02, 3.047226285615334e+02, 3.066882280416548e+02, 3.08115478515625e+02, 3.091517660820671e+02, 3.099043265539923e+02, 3.10450867270241e+02, 3.1084768588323e+02, 3.111358337402344e+02, 3.113451237283392e+02, 3.114970701431142e+02, 3.116073914728681e+02, 3.116875303390787e+02, 3.117456970214844e+02, 3.117879639552731e+02, 3.118186339990543e+02, 3.118409118885177e+02, 3.118570556279746e+02, 3.118687438964844e+02, 3.118772583186312e+02, 3.118834533623497e+02, 3.118879699755538e+02, 3.118912658617678e+02, 3.118936462402344e+02]
temDyn.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.983335847341814e+02, 3.021736101866614e+02, 3.050185882159453e+02, 3.071261607831227e+02, 3.086874389648438e+02, 3.098439629732599e+02, 3.107008047011205e+02, 3.113356024783523e+02, 3.118058474167078e+02, 3.121542053222656e+02, 3.124122923354357e+02, 3.126034848926371e+02, 3.126796264648438e+02, 3.126796264648438e+02, 3.126796264648438e+02, 3.126796264648438e+02, 3.126796264648438e+02, 3.126796264648438e+02, 3.126796264648438e+02, 3.126796264648438e+02, 3.126796264648438e+02, 3.126796264648438e+02, 3.126796264648438e+02, 3.126796264648438e+02, 3.126796264648438e+02, 3.076178922480123e+02, 3.038683208640137e+02, 3.010902985736235e+02, 2.99032261705153e+02, 2.975076293945312e+02, 2.963782629905195e+02, 2.955416879517808e+02, 2.949219048615719e+02, 2.944626780337573e+02, 2.941224670410156e+02, 2.938704523476894e+02, 2.936837465476341e+02, 2.935454100099535e+02, 2.934429323594033e+02, 2.933670349121094e+02, 2.93310790896496e+02, 2.932691040508608e+02, 2.932382506996313e+02, 2.932153626004377e+02, 2.931984252929688e+02, 2.931859130595506e+02, 2.93176635752665e+02, 2.931697692797363e+02, 2.931646728628157e+02, 2.93160888671875e+02, 2.983416857692077e+02, 3.021795916340396e+02, 3.050230132630751e+02, 3.071294508322915e+02, 3.086898803710938e+02, 3.098457666067623e+02, 3.107021169575467e+02, 3.11336579040669e+02, 3.118065785335929e+02, 3.121547546386719e+02, 3.124126897549597e+02, 3.126037900684149e+02, 3.127453614779141e+02, 3.128502194910209e+02, 3.129279174804688e+02, 3.129854737546577e+02, 3.130281066415284e+02, 3.130596924161852e+02, 3.130830382776924e+02, 3.13100341796875e+02, 3.131131897244286e+02, 3.13122680653391e+02, 3.131297607495605e+02, 3.131349792364056e+02, 3.131388854980469e+02]
masFloRat.T=[2.931499938964844e+02, 2.931499938964844e+02]
time=[0e+00, 6e+01]
masFloRat.ports[1].m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00, -1e+00]
senRelTem.T_rel=[5e+00, 5e+00]
temSteSta.T=[298.149993896484375, 301.14999377727389173742, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 303.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375]
temDynLoss.T=[293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 298.33108229607358907742, 302.16396664225715085195, 305.00003351660984662885, 307.0983897813052294623, 308.650909423828125, 309.79955990184163283629, 310.64944362567320013113, 311.27825994226463990344, 311.74343896672576192941, 312.087646484375, 312.34234604841043392298, 312.53082254222584879244, 312.41220043879343393201, 312.03076147913014892765, 311.6568603515625, 311.29031395188292208331, 310.93100020909986369588, 310.57882646172771501369, 310.23358132614674786964, 309.895233154296875, 309.56356832439246318245, 309.23843424805772883701, 308.91979940441564167486, 308.60748271399779696367, 308.3013916015625, 304.36041481050199308811, 301.44470542317759509388, 299.28713761104779678135, 297.69076896675727539332, 296.5096435546875, 295.63580137441130091247, 294.98922802116589991783, 294.51083323459931762045, 294.15695269939533318393, 293.8951416015625, 293.7013545706961963333, 293.5579530419020102272, 293.45187366695506625547, 293.37335222734043327364, 293.315277099609375, 293.27227774122940218149, 293.2404785513260208063, 293.21694943805511002211, 293.19955448216359172875, 293.1866455078125, 293.17712400325928001621, 293.17010498842387278273, 293.16491698656068365381, 293.16104126830254017477, 293.15814208984375, 298.337138636485576626, 302.16842221034119120304, 305.00332941373687845044, 307.10082536651674445238, 308.652740478515625, 309.80090574868052044621, 310.65045070593015452687, 311.27899236376214275879, 311.74398699249979927117, 312.088043212890625, 312.34265190579003501625, 312.53103616526937003073, 312.67041030371069609828, 312.77355933865129600235, 312.849884033203125, 312.90634167225135797707, 312.94812007023290334473, 312.97903445661870591721, 313.00192255620032710794, 313.01885986328125, 313.03137209669938556544, 313.04061888620094578073, 313.04745484116335774161, 313.05252074069989021154, 313.0562744140625]
temDyn.T=[293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 298.33416456816581785461, 302.1740984681053987515, 305.01895442668882196813, 307.12646595890396383766, 308.687713623046875, 309.84423763146304509064, 310.70101832436137101467, 311.33572454866481393765, 311.80587793438286325909, 312.154205322265625, 312.41226181785754079101, 312.6034238574808341582, 312.6795654296875, 312.6795654296875, 312.6795654296875, 312.6795654296875, 312.6795654296875, 312.6795654296875, 312.6795654296875, 312.6795654296875, 312.6795654296875, 312.6795654296875, 312.6795654296875, 312.6795654296875, 312.6795654296875, 307.61786173033709701485, 303.86832086381969020294, 301.09026805604537457839, 299.03220067038478191535, 297.50762939453125, 296.37820195536323808483, 295.54153536389020473507, 294.92172175610318163308, 294.46261699860104954496, 294.122528076171875, 293.87051338245760234713, 293.68377706540627514187, 293.545471044915643688, 293.44299339417153760223, 293.3670654296875, 293.31082141407415520007, 293.26913456843897165527, 293.23828121720941908279, 293.21539311801586791262, 293.198455810546875, 293.18591305916260125741, 293.17663575247092921927, 293.1697692797363288264, 293.1646423456256229656, 293.16082763671875, 298.34220456803581100758, 302.1800493980995270249, 305.0233794738185792994, 307.12972549049464987547, 308.69012451171875, 309.84604126496537901403, 310.70236109817165015556, 311.33673162817154889126, 311.80660905155906448272, 312.15472412109375, 312.41265923738160381617, 312.60372903325867355306, 312.74530044275780937824, 312.85015845586463001382, 312.9278564453125, 312.98544323707960757019, 313.02807612395025671503, 313.05966189880109595833, 313.08306879527054888968, 313.100433349609375, 313.11328127716296876315, 313.12277220612537576017, 313.1297912671386711736, 313.1350097539837520344, 313.138885498046875]
masFloRat.T=[293.149993896484375, 293.149993896484375]
time=[0., 60.]
masFloRat.ports[1].m_flow=[0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., -0., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1., -1.]
senRelTem.T_rel=[5., 5.]

0 comments on commit a1ff2d8

Please sign in to comment.