Merge branch 'main_8.1.x_IBPSA_1769_FMI.Adaptors' into maint_8.1.x_pa…

…tchReleaseNotes
lbl-srg · Jul 10, 2023 · e1c0d1b · e1c0d1b
2 parents bb04b43 + 281d2ae
commit e1c0d1b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml
@@ -24,7 +24,7 @@ jobs:
     # Skip if the commit message contains "ci skip"
     if: "!contains(github.event.head_commit.message, 'ci skip')"
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
       # Checks-out repository under $GITHUB_WORKSPACE, so job can access it

diff --git a/Buildings/Fluid/FMI/Adaptors/Outlet.mo b/Buildings/Fluid/FMI/Adaptors/Outlet.mo
@@ -85,7 +85,7 @@ equation
   bacPro_internal.T  = Medium.temperature_phX(
     p = p_in_internal,
     h = port_a.h_outflow,
-    X = port_a.Xi_outflow);
+    X = cat(1, port_a.Xi_outflow, {1-sum(port_a.Xi_outflow)}));
   bacPro_internal.C  = port_a.C_outflow;
 
   // Conditional connectors for pressure
@@ -153,6 +153,11 @@ for how to use this model.
 </html>", revisions="<html>
 <ul>
 <li>
+June 29, 2023, by Michael Wetter:<br/>
+Corrected dimension of <code>X</code> in function call.<br/>
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1768\">#1768</a>.
+</li>
+<li>
 January 18, 2019, by Jianjun Hu:<br/>
 Limited the media choice to moist air and water.
 See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1050\">#1050</a>.

diff --git a/Buildings/Utilities/Math/Functions/bicubic.mo b/Buildings/Utilities/Math/Functions/bicubic.mo
@@ -20,7 +20,9 @@ algorithm
             + a[10] * x1 * x2Sq;
 
   annotation (smoothOrder=999, Documentation(info="<html>
+<p>
 This function computes
+</p>
 <p align=\"center\" style=\"font-style:italic;\">
  y = a<sub>1</sub>
     + a<sub>2</sub>  x<sub>1</sub> + a<sub>3</sub>  x<sub>1</sub><sup>2</sup>

diff --git a/Buildings/package.mo b/Buildings/package.mo
@@ -320,13 +320,14 @@ that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
 units are wrong or errors in documentation):
 </p>
 <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>xxx</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">xxx
-    </td>
-    <td valign=\"top\">xxx.
+<tr><td colspan=\"2\"><b>Buildings.Fluid.FMI</b>
     </td>
+<tr><td valign=\"top\">Buildings.Fluid.FMI.Adaptors.Outlet
+  </td>
+  <td valign=\"top\">Corrected dimension of <code>X</code> in function call, which caused the model to not translate with some tools
+                     if the media has only one component such as water.<br/>
+                     <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1768\">IBPSA, #1768</a>.
+  </td>
 </tr>
 </table>
 <p>