Skip to content

Commit

Permalink
Merge branch 'maint_10.0.x' into maint_10.0.x_issue3964_addStartTime
Browse files Browse the repository at this point in the history
  • Loading branch information
@JayHuLBL
JayHuLBL committed Sep 3, 2024
2 parents 0605310 + 7bf2b3a commit ca334da
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 21 deletions.
31 changes: 18 additions & 13 deletions Buildings/Fluid/Interfaces/EightPort.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,39 +4,39 @@ partial model EightPort "Partial model with eight ports"
replaceable package Medium1 =
Modelica.Media.Interfaces.PartialMedium "Medium 1 in the component"
annotation (choices(
choice(redeclare package Medium = Buildings.Media.Air "Moist air"),
choice(redeclare package Medium = Buildings.Media.Water "Water"),
choice(redeclare package Medium =
choice(redeclare package Medium1 = Buildings.Media.Air "Moist air"),
choice(redeclare package Medium1 = Buildings.Media.Water "Water"),
choice(redeclare package Medium1 =
Buildings.Media.Antifreeze.PropyleneGlycolWater (
property_T=293.15,
X_a=0.40)
"Propylene glycol water, 40% mass fraction")));
replaceable package Medium2 =
Modelica.Media.Interfaces.PartialMedium "Medium 2 in the component"
annotation (choices(
choice(redeclare package Medium = Buildings.Media.Air "Moist air"),
choice(redeclare package Medium = Buildings.Media.Water "Water"),
choice(redeclare package Medium =
choice(redeclare package Medium2 = Buildings.Media.Air "Moist air"),
choice(redeclare package Medium2 = Buildings.Media.Water "Water"),
choice(redeclare package Medium2 =
Buildings.Media.Antifreeze.PropyleneGlycolWater (
property_T=293.15,
X_a=0.40)
"Propylene glycol water, 40% mass fraction")));
replaceable package Medium3 =
Modelica.Media.Interfaces.PartialMedium "Medium 3 in the component"
annotation (choices(
choice(redeclare package Medium = Buildings.Media.Air "Moist air"),
choice(redeclare package Medium = Buildings.Media.Water "Water"),
choice(redeclare package Medium =
choice(redeclare package Medium3 = Buildings.Media.Air "Moist air"),
choice(redeclare package Medium3 = Buildings.Media.Water "Water"),
choice(redeclare package Medium3 =
Buildings.Media.Antifreeze.PropyleneGlycolWater (
property_T=293.15,
X_a=0.40)
"Propylene glycol water, 40% mass fraction")));
replaceable package Medium4 =
Modelica.Media.Interfaces.PartialMedium "Medium 4 in the component"
annotation (choices(
choice(redeclare package Medium = Buildings.Media.Air "Moist air"),
choice(redeclare package Medium = Buildings.Media.Water "Water"),
choice(redeclare package Medium =
choice(redeclare package Medium4 = Buildings.Media.Air "Moist air"),
choice(redeclare package Medium4 = Buildings.Media.Water "Water"),
choice(redeclare package Medium4 =
Buildings.Media.Antifreeze.PropyleneGlycolWater (
property_T=293.15,
X_a=0.40)
Expand Down Expand Up @@ -151,9 +151,14 @@ may be used by models that extend this model to treat flow reversal. </p>
</html>", revisions="<html>
<ul>
<li>
August 27, 2024, by Jianjun Hu:<br/>
Corrected dropdown media choice.
See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1924\">IBPSA #1924</a>.
</li>
<li>
January 18, 2019, by Jianjun Hu:<br/>
Limited the media choice.
See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1050\">#1050</a>.
See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1050\">IBPSA #1050</a>.
</li>
<li>July 2014, by Damien Picard:<br/>First implementation. </li>
</ul>
Expand Down
17 changes: 11 additions & 6 deletions Buildings/Fluid/Interfaces/PartialFourPort.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ partial model PartialFourPort "Partial model with four ports"
replaceable package Medium1 =
Modelica.Media.Interfaces.PartialMedium "Medium 1 in the component"
annotation (choices(
choice(redeclare package Medium = Buildings.Media.Air "Moist air"),
choice(redeclare package Medium = Buildings.Media.Water "Water"),
choice(redeclare package Medium =
choice(redeclare package Medium1 = Buildings.Media.Air "Moist air"),
choice(redeclare package Medium1 = Buildings.Media.Water "Water"),
choice(redeclare package Medium1 =
Buildings.Media.Antifreeze.PropyleneGlycolWater (
property_T=293.15,
X_a=0.40)
"Propylene glycol water, 40% mass fraction")));
replaceable package Medium2 =
Modelica.Media.Interfaces.PartialMedium "Medium 2 in the component"
annotation (choices(
choice(redeclare package Medium = Buildings.Media.Air "Moist air"),
choice(redeclare package Medium = Buildings.Media.Water "Water"),
choice(redeclare package Medium =
choice(redeclare package Medium2 = Buildings.Media.Air "Moist air"),
choice(redeclare package Medium2 = Buildings.Media.Water "Water"),
choice(redeclare package Medium2 =
Buildings.Media.Antifreeze.PropyleneGlycolWater (
property_T=293.15,
X_a=0.40)
Expand Down Expand Up @@ -83,6 +83,11 @@ are not implemented.
</html>", revisions="<html>
<ul>
<li>
August 27, 2024, by Jianjun Hu:<br/>
Corrected dropdown media choice.
See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1924\">IBPSA #1924</a>.
</li>
<li>
April 6, 2020, by Filip Jorissen:<br/>
Added arrows to the icon indicating the intended flow direction
when <code>allowFlowReversal=false</code>.
Expand Down
4 changes: 2 additions & 2 deletions ...rces/ReferenceResults/Dymola/Buildings_Fluid_Movers_BaseClasses_Validation_EulerCurve.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
last-generated=2022-12-21
last-generated=2024-08-29
statistics-simulation=
{
"linear": " ",
Expand All @@ -7,5 +7,5 @@ statistics-simulation=
"numerical Jacobians": "0"
}
time=[0e+00, 1e+01]
etaApp=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.855637955746114e-04, 4.59920376507617e-03, 7.53781449416334e-03, 9.437445890689155e-03, 1.063414290547371e-02, 1.14639548626641e-02, 1.226292788605206e-02, 1.336711154766603e-02, 1.511255054099777e-02, 1.783529296517372e-02, 2.187138685176643e-02, 2.755687824446199e-02, 3.522782457353359e-02, 4.522025860147311e-02, 5.787022784352303e-02, 7.351380773791941e-02, 9.248698275769272e-02, 1.151258841091057e-01, 1.417664615421357e-01, 1.727448850870132e-01, 2.083971272510535e-01, 2.490591650024873e-01, 2.950672146623474e-01, 3.467571219983731e-01, 4.044651687145233e-01, 4.685272925113446e-01, 5.392793662505206e-01, 6.170577798566035e-01, 7.021981829010199e-01, 7.950370311737061e-01, 8.791437810901985e-01, 9.393392557289867e-01, 9.778635628245929e-01, 9.969514495375512e-01, 9.98837947845459e-01, 9.857579864725872e-01, 9.599464512495479e-01, 9.236384796535777e-01, 8.790687774067438e-01, 8.28472375869751e-01, 7.767439004268902e-01, 7.272692596483503e-01, 6.799931815321251e-01, 6.348647301497695e-01, 5.918336510658264e-01, 5.508493401733497e-01, 5.118613117936541e-01, 4.748192823429438e-01, 4.396722942838692e-01, 4.063701033592224e-01, 3.748621054137408e-01, 3.450978446193792e-01, 3.170269058340908e-01, 2.905985362847852e-01, 2.657622992992401e-01, 2.424677545863655e-01, 2.206643271570004e-01, 2.003016104434399e-01, 1.813289102828318e-01, 1.636957824230194e-01, 1.473517418213958e-01, 1.3224624333944e-01, 1.183288577520289e-01, 1.055489225621399e-01, 9.385599195957184e-02, 8.319955850194359e-02, 7.352909199985674e-02, 6.479413169228214e-02, 5.694406450578496e-02, 4.992842301726341e-02, 4.36966960109598e-02, 3.819835707088755e-02, 3.338291992198465e-02, 2.919982004621781e-02, 2.55985651165247e-02, 2.252865187197084e-02, 1.9939522485169e-02, 1.7780713824086e-02, 1.600166741341505e-02, 1.455189846456051e-02, 1.338087524231094e-02, 1.243807403754423e-02, 1.16729954686943e-02, 1.103510950584886e-02, 1.047391258180141e-02, 9.938881917135984e-03, 9.379496592061984e-03, 8.745250650742834e-03, 7.985616558652946e-03, 7.050091866403818e-03, 5.888155363324267e-03, 4.449275943871451e-03, 2.682964699717192e-03, 5.386718640394318e-04, 0e+00]
etaApp=[1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 4.599201436769734e-03, 7.537812165856626e-03, 9.437444028044006e-03, 1.063414104282856e-02, 1.146395300001895e-02, 1.226292602340691e-02, 1.336711061634345e-02, 1.511254960967408e-02, 1.783529296517372e-02, 2.187138498912128e-02, 2.755687824445755e-02, 3.52278245735247e-02, 4.522025487618725e-02, 5.787022784352303e-02, 7.351380773791941e-02, 9.248698275769272e-02, 1.151258841091057e-01, 1.417664615421357e-01, 1.727448850870132e-01, 2.083971272510535e-01, 2.490591650024873e-01, 2.950672146623474e-01, 3.467571219983731e-01, 4.044651687145233e-01, 4.685272925113446e-01, 5.392793662505206e-01, 6.170577798566035e-01, 7.021981829010199e-01, 7.950370311737061e-01, 8.791388935096112e-01, 9.393344277526178e-01, 9.778587348483661e-01, 9.969466215610402e-01, 9.988331198692322e-01, 9.857530988917156e-01, 9.599415636692448e-01, 9.236336516767825e-01, 8.790638898258722e-01, 8.284674286842346e-01, 7.767439004268902e-01, 7.272692596483503e-01, 6.799931815321251e-01, 6.348647301497695e-01, 5.918336510658264e-01, 5.508493401733497e-01, 5.118613117936541e-01, 4.748192823429438e-01, 4.396722942838692e-01, 4.063701033592224e-01, 3.748621054137408e-01, 3.450978446193792e-01, 3.170269058340908e-01, 2.905985362847852e-01, 2.657622992992401e-01, 2.424677545863655e-01, 2.206643271570004e-01, 2.003016104434399e-01, 1.813289102828318e-01, 1.636957824230194e-01, 1.473517418213958e-01, 1.3224624333944e-01, 1.183288577520289e-01, 1.055489225621755e-01, 9.385599195957184e-02, 8.319955850194359e-02, 7.352909199985674e-02, 6.479413169228214e-02, 5.694406450578496e-02, 4.992842301726341e-02, 4.36966960109598e-02, 3.819835707088755e-02, 3.338291992198465e-02, 2.919982004621781e-02, 2.55985651165247e-02, 2.252865187197084e-02, 1.993952434779639e-02, 1.7780713824086e-02, 1.600166741341505e-02, 1.455189846456051e-02, 1.338087617361575e-02, 1.243807403754423e-02, 1.16729954686943e-02, 1.103511043717143e-02, 1.047391258180141e-02, 9.938881917135984e-03, 9.379496592070866e-03, 8.745250650742834e-03, 7.985616558652946e-03, 7.050091866403818e-03, 5.888155363324267e-03, 4.449275943871451e-03, 2.682964932547836e-03, 9.979827248627414e-04, 1.000000047497451e-03]
etaOri=[2.479024697095156e-03, 2.746579465864791e-03, 3.061462882205037e-03, 3.433521323929959e-03, 3.874928895158657e-03, 4.400783684104681e-03, 5.029863516840864e-03, 5.785587344347606e-03, 6.69722526732726e-03, 7.801435251899647e-03, 9.1441934928298e-03, 1.078322021842397e-02, 1.27910104450589e-02, 1.525857618930315e-02, 1.830003678995541e-02, 2.205818518996239e-02, 2.671107901682587e-02, 3.247970043363225e-02, 3.963654876015722e-02, 4.851479323668479e-02, 5.951742827892303e-02, 7.312510142192234e-02, 8.990081277272097e-02, 1.104891559770564e-01, 1.356056670104133e-01, 1.660128980875015e-01, 2.024765698114463e-01, 2.456976849698127e-01, 2.962169313638693e-01, 3.542894138442433e-01, 4.197385013103485e-01, 4.918003503752691e-01, 5.689884644755167e-01, 6.490137364567458e-01, 7.288017713167815e-01, 8.046507239341736e-01, 8.725439895371198e-01, 9.286066052951638e-01, 9.696375279392979e-01, 9.936081605851388e-01, 1e+00, 9.89869397558476e-01, 9.656038282053598e-01, 9.304258369584909e-01, 8.877873252191486e-01, 8.408296704292297e-01, 7.92039764819902e-01, 7.43147280811198e-01, 6.952138850876689e-01, 6.488166291240832e-01, 6.042364835739136e-01, 5.615973673354995e-01, 5.209488712396669e-01, 4.823062545592169e-01, 4.456660791321708e-01, 4.110130667686462e-01, 3.783215579709061e-01, 3.475569219560302e-01, 3.186767935998717e-01, 2.91631306480805e-01, 2.663650512695312e-01, 2.428173952868145e-01, 2.209234136456831e-01, 2.006149667572646e-01, 1.818210358193988e-01, 1.644691079854965e-01, 1.484854672476533e-01, 1.337959649406203e-01, 1.203266108613783e-01, 1.08003925687232e-01, 9.675576537847519e-02, 8.651144625190289e-02, 7.720219904864054e-02, 6.876152065302732e-02, 6.112521840761029e-02, 5.423190072178841e-02, 4.802292402564318e-02, 4.244258375454039e-02, 3.743817825073294e-02, 3.2959968207248e-02, 2.896131202578545e-02, 2.539857841968452e-02, 2.223102186255667e-02, 1.942090269163234e-02, 1.69331697223098e-02, 1.473557576537132e-02, 1.279839084986559e-02, 1.109436505840783e-02, 9.598636910359818e-03, 8.288491565763275e-03, 7.143341936171055e-03, 6.144503474737525e-03, 5.275103137460704e-03, 4.519965927882693e-03, 3.865432966364286e-03, 3.29929543659091e-03, 2.810629908464056e-03, 2.389708266831722e-03, 2.027898511339361e-03, 1.717537611489981e-03, 1.451865653507411e-03]

0 comments on commit ca334da

Please sign in to comment.