karthikeyad-pnnl · karthikeyad-pnnl · Sep 15, 2021 · Sep 15, 2021 · Sep 15, 2021 · Sep 15, 2021
diff --git a/Buildings/Controls/OBC/CDL/Logical/Latch.mo b/Buildings/Controls/OBC/CDL/Logical/Latch.mo
@@ -1,6 +1,6 @@
 within Buildings.Controls.OBC.CDL.Logical;
 block Latch
-  "Maintains a true signal until change condition"
+  "Maintains a true signal until cleared"
   Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u
     "Latch input"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
@@ -10,40 +10,11 @@ block Latch
   Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
-
-initial equation
-  pre(y)=false;
-  pre(u)=false;
-  pre(clr)=false;
-
 equation
   when initial() then
-    //scenario = 1;
-    y=if clr then
-        false
-      else
-        u;
-  elsewhen
-          (not clr) and change(u) and
-                                     (pre(u) == false) then
-    //scenario = 2;
-    y=not clr;
-  elsewhen
-          (not clr) and change(u) and
-                                     (pre(u) == true) then
-    //scenario = 3;
-    y=if clr then
-        false
-      else
-        pre(y);
-  elsewhen change(clr) and
-                          (pre(clr) == true) and
-                                                (not u) then
-    //scenario = 4;
-    y=false;
-  elsewhen clr then
-    //scenario = 5;
-    y=false;
+    y=not clr and u;
+  elsewhen {clr, u} then
+    y=not clr and u;
   end when;
   annotation (
     defaultComponentName="lat",
@@ -148,6 +119,11 @@ At initial time, if <code>clr = false</code>, then the output will be
       revisions="<html>
 <ul>
 <li>
+April 15, 2024, by Antoine Gautier:<br/>
+Simplified the implementation.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3796\">issue 3796</a>.
+</li>
+<li>
 October 13, 2020, by Jianjun Hu:<br/>
 Removed the parameter <code>pre_y_start</code>, and made the initial output to be
 equal to latch input when the clear input is <code>false</code>.<br/>

diff --git a/Buildings/Controls/OBC/CDL/Reals/Sort.mo b/Buildings/Controls/OBC/CDL/Reals/Sort.mo
@@ -13,11 +13,15 @@ block Sort
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput y[nin]
     "Connector of Real output signals"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
-
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput yIdx[nin]
+    "Indices of the sorted vector with respect to the original vector"
+    annotation (Placement(transformation(extent={{100,-80},{140,-40}}),
+      iconTransformation(extent={{100,-80},{140,-40}})));
 equation
-  y=Modelica.Math.Vectors.sort(
+  (y, yIdx)=Modelica.Math.Vectors.sort(
     u,
     ascending=ascending);
+
   annotation (
     defaultComponentName="sort",
     Icon(
@@ -42,10 +46,12 @@ equation
       info="<html>
 <p>
 Block that sorts the elements of the input signal <i>u</i>.
-If the parameter <code>ascending = true</code>, then the output signal satisfies
+If the parameter <code>ascending = true</code>, then the output signal <i>y</i> satisfies
 <i>y<sub>i</sub> &lt;= y<sub>i+1</sub></i> for all <i>i &isin; {1, ..., n-1}</i>.
 Otherwise, it satisfies
 <i>y<sub>i</sub> &gt;= y<sub>i+1</sub></i> for all <i>i &isin; {1, ..., n-1}</i>.
+The output signal <i>yIdx</i> contains the indices of the sorted elements,
+with respect to the input vector <i>u</i>.
 </p>
 <h4>Usage</h4>
 <p>
@@ -62,10 +68,14 @@ In real controllers, measurement noise may cause the output to change frequently
 This block may for example be used in a variable air volume flow
 controller to access the position of the dampers that are most open.
 </p>
-</html>",
-      revisions="<html>
+</html>", revisions="<html>
 <ul>
 <li>
+April 18, 2024, by Jianjun Hu:<br/>
+Added an output variable with the indices of the sorted elements.
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3809\">issue 3809</a>.
+</li>
+<li>
 March 2, 2020, by Michael Wetter:<br/>
 Changed icon to display dynamically the output value.
 </li>