Skip to content

Commit

Permalink
merged master
Browse files Browse the repository at this point in the history
  • Loading branch information
@hcasperfu
hcasperfu committed Sep 28, 2022
2 parents 14718fe + e8eb54e commit 23cb808
Show file tree
Hide file tree
Showing 23 changed files with 100 additions and 102 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ env:
global:
- [email protected]
- OMC_VERSION=ubuntu-2004-omc:1.19.0_dev-551-g1772c4b-1
- DYMOLA_VERSION=travis_ubuntu-2004_dymola:2022x-x86_64_rev-2
- DYMOLA_VERSION=travis_ubuntu-2004_dymola:2023-x86_64

jobs:
# Test matrix for regression tests.
Expand Down
8 changes: 4 additions & 4 deletions IBPSA/Fluid/Actuators/Valves/TwoWayTable.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ initial equation
Modelica.Constants.eps,
"flowCharateristics.phi[end] must be 1.");

// Assert that the sequences are strictly monotonic increasing
// Assert that the sequences are strictly increasing
assert(IBPSA.Utilities.Math.Functions.isMonotonic(
x=flowCharacteristics.y,
strict=true),
"The values for y in flowCharacteristics must be strictly monotone increasing.");
"The values for y in flowCharacteristics must be strictly increasing.");
assert(IBPSA.Utilities.Math.Functions.isMonotonic(
x=flowCharacteristics.phi,
strict=true),
"The values for phi in flowCharacteristics must be strictly monotone increasing.");
"The values for phi in flowCharacteristics must be strictly increasing.");

equation
connect(phiLooUp.u[1], y_actual) annotation (Line(
Expand Down Expand Up @@ -102,7 +102,7 @@ requirements, otherwise the model stops with an error:
<li>
Their arrays
<code>y</code> and <code>phi</code>
must be strictly monotonic increasing.
must be strictly increasing.
</li>
<li>
The first value must satisfy
Expand Down
4 changes: 2 additions & 2 deletions IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ Documentation(info="<html>
Function that computes the pressure drop of flow elements as
</p>
<p align=\"center\" style=\"font-style:italic;\">
m = sign(&Delta;p) k &radic;<span style=\"text-decoration:overline;\">&nbsp;&Delta;p &nbsp;</span>
m&#775; = sign(&Delta;p) k &radic;<span style=\"text-decoration:overline;\">&nbsp;&Delta;p &nbsp;</span>
</p>
<p>
with regularization near the origin.
Therefore, the flow coefficient is
</p>
<p align=\"center\" style=\"font-style:italic;\">
k = m &frasl; &radic;<span style=\"text-decoration:overline;\">&nbsp;&Delta;p &nbsp;</span>
k = m&#775; &frasl; &radic;<span style=\"text-decoration:overline;\">&nbsp;&Delta;p &nbsp;</span>
</p>
<p>
The input <code>m_flow_turbulent</code> determines the location of the regularization.
Expand Down
4 changes: 2 additions & 2 deletions IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ Documentation(info="<html>
Function that computes the pressure drop of flow elements as
</p>
<p align=\"center\" style=\"font-style:italic;\">
&Delta;p = sign(m) (m &frasl; k)<sup>2</sup>
&Delta;p = sign(m&#775;) (m&#775; &frasl; k)<sup>2</sup>
</p>
<p>
with regularization near the origin.
Therefore, the flow coefficient is
</p>
<p align=\"center\" style=\"font-style:italic;\">
k = m &frasl; &radic;<span style=\"text-decoration:overline;\">&nbsp;&Delta;p &nbsp;</span>
k = m&#775; &frasl; &radic;<span style=\"text-decoration:overline;\">&nbsp;&Delta;p &nbsp;</span>
</p>
<p>
The input <code>m_flow_turbulent</code> determines the location of the regularization.
Expand Down
6 changes: 2 additions & 4 deletions IBPSA/Fluid/Examples/SimpleHouse.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,15 +291,13 @@ equation
June 15, 2022, by Hongxiang Fu:<br/>
Changed <code>conDam.yMin</code> from 0.1 to 0.25.<br/>
This is for
<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1624\">
IBPSA, #1624</a>.
<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1624\">IBPSA, #1624</a>.
</li>
<li>
May 8, 2017, by Michael Wetter:<br/>
Updated heater model.<br/>
This is for
<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/763\">
IBPSA, #763</a>.
<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/763\">IBPSA, #763</a>.
</li>
<li>
November 10, 2016, by Michael Wetter:<br/>
Expand Down
4 changes: 2 additions & 2 deletions IBPSA/Fluid/FixedResistances/CheckValve.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,14 @@ Note that the small reverse flows can still occur with this model.
The basic flow function
</p>
<p align=\"center\" style=\"font-style:italic;\">
m = sign(&Delta;p) k &radic;<span style=\"text-decoration:overline;\">&nbsp;&Delta;p &nbsp;</span>,
m&#775; = sign(&Delta;p) k &radic;<span style=\"text-decoration:overline;\">&nbsp;&Delta;p &nbsp;</span>,
</p>
<p>
with regularization near the origin, is used to compute the pressure drop.
The flow coefficient
</p>
<p align=\"center\" style=\"font-style:italic;\">
k = m &frasl; &radic;<span style=\"text-decoration:overline;\">&nbsp;&Delta;p &nbsp;</span>
k = m&#775; &frasl; &radic;<span style=\"text-decoration:overline;\">&nbsp;&Delta;p &nbsp;</span>
</p>
<p>
is increased from <code>l*KV_Si</code> to <code>KV_Si</code>,
Expand Down
6 changes: 3 additions & 3 deletions IBPSA/Fluid/FixedResistances/HydraulicDiameter.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@ The mass flow rate is computed as
</p>
<p align=\"center\" style=\"font-style:italic;\">
m&#775; = k
&radic;<span style=\"text-decoration:overline;\">&Delta;P</span>,
&radic;<span style=\"text-decoration:overline;\">&Delta;p</span>,
</p>
<p>
where
<i>k</i> is a constant and
<i>&Delta;P</i> is the pressure drop.
<i>&Delta;p</i> is the pressure drop.
The constant <i>k</i> is equal to
<code>k=m_flow_nominal/sqrt(dp_nominal)</code>,
where <code>m_flow_nominal</code> is a parameter.
Expand Down Expand Up @@ -163,7 +163,7 @@ IBPSA.Fluid.BaseClasses.FlowModels</a>,
This package contains regularized implementations of the equation
</p>
<p align=\"center\" style=\"font-style:italic;\">
m = sign(&Delta;p) k &radic;<span style=\"text-decoration:overline;\">&nbsp;&Delta;p &nbsp;</span>
m&#775; = sign(&Delta;p) k &radic;<span style=\"text-decoration:overline;\">&nbsp;&Delta;p &nbsp;</span>
</p>
<p>
and its inverse function.
Expand Down
6 changes: 3 additions & 3 deletions IBPSA/Fluid/FixedResistances/PressureDrop.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,12 @@ The mass flow rate is
</p>
<p align=\"center\" style=\"font-style:italic;\">
m&#775; = k
&radic;<span style=\"text-decoration:overline;\">&Delta;P</span>,
&radic;<span style=\"text-decoration:overline;\">&Delta;p</span>,
</p>
<p>
where
<i>k</i> is a constant and
<i>&Delta;P</i> is the pressure drop.
<i>&Delta;p</i> is the pressure drop.
The constant <i>k</i> is equal to
<code>k=m_flow_nominal/sqrt(dp_nominal)</code>,
where <code>m_flow_nominal</code> and <code>dp_nominal</code>
Expand Down Expand Up @@ -163,7 +163,7 @@ IBPSA.Fluid.BaseClasses.FlowModels</a>,
This package contains regularized implementations of the equation
</p>
<p align=\"center\" style=\"font-style:italic;\">
m = sign(&Delta;p) k &radic;<span style=\"text-decoration:overline;\">&nbsp;&Delta;p &nbsp;</span>
m&#775; = sign(&Delta;p) k &radic;<span style=\"text-decoration:overline;\">&nbsp;&Delta;p &nbsp;</span>
</p>
<p>
and its inverse function.
Expand Down
2 changes: 1 addition & 1 deletion IBPSA/Fluid/FixedResistances/package.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ flow coefficient
</p>
<p align=\"center\" style=\"font-style:italic;\">
k = m &frasl;
&radic;<span style=\"text-decoration:overline;\">&Delta;P</span>.
&radic;<span style=\"text-decoration:overline;\">&Delta;p</span>.
</p>
<p>
For models of valves and air dampers, see
Expand Down
2 changes: 1 addition & 1 deletion IBPSA/Fluid/Movers/Validation/FlowControlled_dpSystem.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,5 +235,5 @@ This is for
</li>
</ul>
</html>"),
Icon(coordinateSystem(extent={{-120,-120},{120,120}})));
Icon(coordinateSystem(extent={{-100,-100},{100,100}})));
end FlowControlled_dpSystem;
10 changes: 5 additions & 5 deletions IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Basic.txt
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
last-generated=2021-07-22
last-generated=2022-08-12
statistics-initialization=
{
"nonlinear": "0, 0, 28, 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, 0, 0, 0, 1, 0, 1, 1, 1",
"nonlinear": "0, 0, 30, 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, 0, 0, 0, 1, 0, 1, 1, 1",
"numerical Jacobians": "0"
}
statistics-simulation=
{
"linear": "24",
"nonlinear": "0, 0, 28, 0, 1, 0, 1, 1, 1",
"nonlinear": "0, 0, 29, 0, 1, 0, 1, 1, 1",
"number of continuous time states": "74",
"numerical Jacobians": "0"
}
time=[0e+00, 1e+03]
pmpNorth.m_flow=[0e+00, 3.935724020004272e+00, 5.780118465423584e+00, 5.809208869934082e+00, 5.690212726593018e+00, 5.605245590209961e+00, 5.558028697967529e+00, 5.541175365447998e+00, 5.548319339752197e+00, 5.572464466094971e+00, 5.607481002807617e+00, 5.646369457244873e+00, 5.681735038757324e+00, 5.72193431854248e+00, 5.762411117553711e+00, 5.800228595733643e+00, 5.834198474884033e+00, 5.864230155944824e+00, 5.89064884185791e+00, 5.913696765899658e+00, 5.933657169342041e+00, 5.950778961181641e+00, 5.965269088745117e+00, 5.977297306060791e+00, 5.986998558044434e+00, 5.9944748878479e+00, 5.999798774719238e+00, 6.3902268409729e+00, 6.807069301605225e+00, 6.980991363525391e+00, 7.000593662261963e+00, 6.958019256591797e+00, 6.904678344726562e+00, 6.857888221740723e+00, 6.819098472595215e+00, 6.785050868988037e+00, 6.752820491790771e+00, 6.716575145721436e+00, 6.678925514221191e+00, 6.641193389892578e+00, 6.599531173706055e+00, 6.552486896514893e+00, 6.499288082122803e+00, 6.439398288726807e+00, 6.372330188751221e+00, 6.297479152679443e+00, 6.214093685150146e+00, 6.121401786804199e+00, 6.018572330474854e+00, 5.904721736907959e+00, 5.778929710388184e+00, 4.47222375869751e+00, 1.745699048042297e+00, 5.036171674728394e-01, 9.377436339855194e-02, 1.978908851742744e-02, 1.248623803257942e-02, 1.202286221086979e-02, 1.169310603290796e-02, 1.12301018089056e-02, 1.065045781433582e-02, 9.964198805391788e-03, 9.177707135677338e-03, 8.295927196741104e-03, 7.330215070396662e-03, 6.302594672888517e-03, 5.245842039585114e-03, 4.203033167868853e-03, 3.222585888579488e-03, 2.349353628233075e-03, 1.618833048269153e-03, 1.046625315211713e-03, 6.29027490504086e-04, 3.473415563348681e-04, 1.738473365548998e-04, 7.811961404513568e-05, 3.217469929950312e-05, 1.334789158136118e-05, 6.513616426673252e-06, 5.050420440966263e-06, 5.084565145807574e-06, 4.724148766399594e-06, 3.699633680298575e-06, 2.51979986387596e-06, 1.523279024695512e-06, 8.47593582875561e-07, 4.281127132799156e-07, 2.039845554691055e-07, 9.459198935246604e-08, 3.976019513629581e-08, 1.592701970309918e-08, 7.053657213873521e-09, 3.465641773559014e-09, 1.755281586746094e-09, 8.613355029218894e-10, 4.554035204495932e-10, 2.943428556445582e-10, 2.655828057473997e-10, 2.776880669852488e-10, 3.206765686325497e-10, 3.199153719712911e-10]
pmpSouth.m_flow=[-0e+00, 3.541325807571411e+00, 5.228494167327881e+00, 5.277606010437012e+00, 5.183747291564941e+00, 5.11500072479248e+00, 5.076899528503418e+00, 5.063858985900879e+00, 5.070789337158203e+00, 5.091943264007568e+00, 5.122228622436523e+00, 5.155235767364502e+00, 5.186134338378906e+00, 5.221257209777832e+00, 5.256392478942871e+00, 5.289219856262207e+00, 5.318800926208496e+00, 5.345064163208008e+00, 5.36826753616333e+00, 5.388591289520264e+00, 5.406257629394531e+00, 5.421462535858154e+00, 5.434368133544922e+00, 5.445109367370605e+00, 5.45379114151001e+00, 5.460492610931396e+00, 5.465270519256592e+00, 5.777584075927734e+00, 6.105603694915771e+00, 6.243701457977295e+00, 6.263343334197998e+00, 6.234053611755371e+00, 6.194809436798096e+00, 6.159224987030029e+00, 6.128802299499512e+00, 6.101316928863525e+00, 6.074681282043457e+00, 6.046490669250488e+00, 6.015296459197998e+00, 5.982007026672363e+00, 5.945979118347168e+00, 5.905919075012207e+00, 5.861014366149902e+00, 5.810750961303711e+00, 5.754717826843262e+00, 5.692442417144775e+00, 5.623343467712402e+00, 5.546819686889648e+00, 5.462211132049561e+00, 5.36879825592041e+00, 5.265806198120117e+00, 4.085400104522705e+00, 1.59485936164856e+00, 4.647243022918701e-01, 8.380109071731567e-02, 1.835094578564167e-02, 1.158771384507418e-02, 1.104761473834515e-02, 1.070825103670359e-02, 1.028449833393097e-02, 9.770855307579041e-03, 9.167879819869995e-03, 8.477493189275265e-03, 7.701354566961527e-03, 6.846601143479347e-03, 5.929496604949236e-03, 4.976001102477312e-03, 4.022412467747927e-03, 3.112199017778039e-03, 2.288640476763248e-03, 1.589175080880523e-03, 1.033950597047806e-03, 6.243749521672726e-04, 3.45907494192943e-04, 1.734857069095597e-04, 7.804632332408801e-05, 3.216224649804644e-05, 1.353727202513255e-05, 7.105197710188804e-06, 5.877755484107183e-06, 6.787786333006807e-06, 7.6057458500145e-06, 6.684305844828486e-06, 4.705678293248639e-06, 2.857600975403329e-06, 1.584779965924099e-06, 7.951966836117208e-07, 3.75594083834585e-07, 1.7240412830688e-07, 7.167732007928862e-08, 2.839781565455723e-08, 1.244594294291801e-08, 6.057523815883314e-09, 3.04289748953579e-09, 1.482835632060642e-09, 7.795025736001548e-10, 5.014584303353331e-10, 4.507444972823293e-10, 4.698463840213662e-10, 5.412420511774485e-10, 5.388779422688117e-10]
pmpNorth.m_flow=[-4.798053284898018e-18, 3.935721158981323e+00, 5.780116558074951e+00, 5.809209823608398e+00, 5.690202236175537e+00, 5.605241298675537e+00, 5.558027267456055e+00, 5.541175842285156e+00, 5.548302173614502e+00, 5.572486400604248e+00, 5.607396602630615e+00, 5.646417617797852e+00, 5.68189525604248e+00, 5.721853256225586e+00, 5.762373447418213e+00, 5.800230503082275e+00, 5.834185600280762e+00, 5.864241123199463e+00, 5.890644073486328e+00, 5.913690090179443e+00, 5.933657169342041e+00, 5.950785636901855e+00, 5.965280055999756e+00, 5.977309226989746e+00, 5.987007141113281e+00, 5.994473934173584e+00, 5.999794006347656e+00, 6.390223026275635e+00, 6.80706262588501e+00, 6.98099422454834e+00, 7.000592231750488e+00, 6.95805025100708e+00, 6.904640674591064e+00, 6.857924938201904e+00, 6.819052696228027e+00, 6.785079479217529e+00, 6.752790927886963e+00, 6.716523170471191e+00, 6.678958415985107e+00, 6.641191482543945e+00, 6.599569320678711e+00, 6.55250358581543e+00, 6.499250411987305e+00, 6.439381122589111e+00, 6.372344493865967e+00, 6.297481060028076e+00, 6.214086055755615e+00, 6.121389865875244e+00, 6.018561840057373e+00, 5.904717922210693e+00, 5.778934001922607e+00, 4.472177982330322e+00, 1.745278358459473e+00, 5.024964213371277e-01, 9.307030588388443e-02, 1.901817880570889e-02, 1.264136657118797e-02, 1.200185623019934e-02, 1.16927158087492e-02, 1.123250368982553e-02, 1.065156608819962e-02, 9.965270757675171e-03, 9.178410284221172e-03, 8.296509273350239e-03, 7.330868858844042e-03, 6.302871275693178e-03, 5.245259962975979e-03, 4.201991483569145e-03, 3.222420811653137e-03, 2.350914524868131e-03, 1.620577648282051e-03, 1.047386089339852e-03, 6.287603755481541e-04, 3.466466441750526e-04, 1.73381413333118e-04, 7.79970214352943e-05, 3.219255449948832e-05, 1.337109097221401e-05, 6.544453299284214e-06, 5.092298124509398e-06, 5.140294888406061e-06, 4.762345270137303e-06, 3.713541673278087e-06, 2.526684738768381e-06, 1.521332023912692e-06, 8.436474558948248e-07, 4.318564208460884e-07, 2.024092253805065e-07, 9.277906087845622e-08, 4.126753339050993e-08, 1.641576297117808e-08, 6.557832055165136e-09, 3.134358328438225e-09, 1.678908234659104e-09, 9.357168373469449e-10, 5.442942208055968e-10, 3.604418985503344e-10, 2.902829643325333e-10, 2.802219289943508e-10, 2.951387190197607e-10, 3.003797210965331e-10]
pmpSouth.m_flow=[-4.231031314750574e-18, 3.541323184967041e+00, 5.228492259979248e+00, 5.277607440948486e+00, 5.183738231658936e+00, 5.114996910095215e+00, 5.076898574829102e+00, 5.063859462738037e+00, 5.070775508880615e+00, 5.09196138381958e+00, 5.122159481048584e+00, 5.155277252197266e+00, 5.186259746551514e+00, 5.221194267272949e+00, 5.256364345550537e+00, 5.289220809936523e+00, 5.318789482116699e+00, 5.34507417678833e+00, 5.368262767791748e+00, 5.388584613800049e+00, 5.406256675720215e+00, 5.421468257904053e+00, 5.434378623962402e+00, 5.445120811462402e+00, 5.453798770904541e+00, 5.46049165725708e+00, 5.465266227722168e+00, 5.777580261230469e+00, 6.105597972869873e+00, 6.243703842163086e+00, 6.263341426849365e+00, 6.234074592590332e+00, 6.194782257080078e+00, 6.15925121307373e+00, 6.128768920898438e+00, 6.101337909698486e+00, 6.074659824371338e+00, 6.04365062713623e+00, 6.012744426727295e+00, 5.980926990509033e+00, 5.945638179779053e+00, 5.905815601348877e+00, 5.860947608947754e+00, 5.810722351074219e+00, 5.754720211029053e+00, 5.692437648773193e+00, 5.623332500457764e+00, 5.546806812286377e+00, 5.46220064163208e+00, 5.368793964385986e+00, 5.26580810546875e+00, 4.085356712341309e+00, 1.594476461410522e+00, 4.636799991130829e-01, 8.308113366365433e-02, 1.691985130310059e-02, 1.125625241547823e-02, 1.0703488253057e-02, 1.045004930347204e-02, 1.006650552153587e-02, 9.579313918948174e-03, 9.001354686915874e-03, 8.335450664162636e-03, 7.584122940897942e-03, 6.753960624337196e-03, 5.859667900949717e-03, 4.926009569317102e-03, 3.989060409367085e-03, 3.092605154961348e-03, 2.279580105096102e-03, 1.585763529874384e-03, 1.032536616548896e-03, 6.233266904018819e-04, 3.449780342634767e-04, 1.729613286443055e-04, 7.7911710832268e-05, 3.217799894628115e-05, 1.336847617494641e-05, 6.543617018905934e-06, 5.091404091217555e-06, 5.138277174410177e-06, 4.757794158649631e-06, 3.705546987475827e-06, 2.515695541660534e-06, 1.509274625277612e-06, 8.325258136210323e-07, 4.231176831126504e-07, 1.965536000625434e-07, 8.917609051195541e-08, 3.923194924482232e-08, 1.543500083300842e-08, 6.10193584549279e-09, 2.889035455311273e-09, 1.534831040039819e-09, 8.494921988067006e-10, 4.913029427733306e-10, 3.238253554194159e-10, 2.598039561263477e-10, 2.500312179520847e-10, 2.626901751678901e-10, 2.668206489087055e-10]
Loading

0 comments on commit 23cb808

Please sign in to comment.