Changed sensor name in examples and validations

For #1933 (comment)
ibpsa · Sep 23, 2024 · 7916773 · 7916773
1 parent 8cc71e9
commit 7916773
Show file tree

Hide file tree

Showing 15 changed files with 56 additions and 56 deletions.
diff --git a/IBPSA/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mo b/IBPSA/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mo
@@ -24,7 +24,7 @@ model ThreeWayValveParameterization
       273.15 + 4,
       Medium.X_default) "Standard density";
 
-  IBPSA.Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear valOPPoi(
+  IBPSA.Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear valOpePoi(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal,
     CvData=IBPSA.Fluid.Types.CvTypes.OpPoint,
@@ -84,17 +84,17 @@ model ThreeWayValveParameterization
     offset=0) "Control signal"
     annotation (Placement(transformation(extent={{-80,100},{-60,120}})));
 
-  IBPSA.Fluid.Sensors.MassFlowRate senM_flowOpPoi(
+  IBPSA.Fluid.Sensors.MassFlowRate senMasFloOpPoi(
     redeclare package Medium = Medium) "Mass flow rate sensor"
     annotation (Placement(transformation(extent={{20,80},{40,100}})));
-  IBPSA.Fluid.Sensors.MassFlowRate senM_flowKv(
+  IBPSA.Fluid.Sensors.MassFlowRate senMasFloKv(
     redeclare package Medium = Medium) "Mass flow rate sensor"
     annotation (Placement(transformation(extent={{20,20},{40,40}})));
-  IBPSA.Fluid.Sensors.MassFlowRate senM_flowCv(
+  IBPSA.Fluid.Sensors.MassFlowRate senMasFloCv(
     redeclare package Medium = Medium) "Mass flow rate sensor"
     annotation (Placement(transformation(extent={{20,-40},{40,-20}})));
 
-  IBPSA.Fluid.Sensors.MassFlowRate senM_flowAv(redeclare package Medium =
+  IBPSA.Fluid.Sensors.MassFlowRate senMasFloAv(redeclare package Medium =
         Medium) "Mass flow rate sensor"
     annotation (Placement(transformation(extent={{20,-94},{40,-74}})));
   IBPSA.Fluid.Sources.Boundary_pT sou3(
@@ -105,39 +105,39 @@ model ThreeWayValveParameterization
     T=293.15) "Boundary condition for flow source"
     annotation (Placement(transformation(extent={{-70,-20},{-50,0}})));
 equation
-  connect(sou1.ports[1], valOPPoi.port_1) annotation (Line(points={{-48,33},{-32,
+  connect(sou1.ports[1], valOpePoi.port_1) annotation (Line(points={{-48,33},{-32,
           33},{-32,90},{-10,90}}, color={0,127,255}));
   connect(sou1.ports[2], valKv.port_1) annotation (Line(points={{-48,31},{-42,31},
           {-42,30},{-10,30}}, color={0,127,255}));
   connect(sou1.ports[3], valCv.port_1) annotation (Line(points={{-48,29},{-32,29},
           {-32,-30},{-10,-30}}, color={0,127,255}));
   connect(sou1.ports[4], valAv.port_1) annotation (Line(points={{-48,27},{-32,27},
           {-32,-84},{-10,-84}}, color={0,127,255}));
-  connect(sou3.ports[1], valOPPoi.port_3) annotation (Line(points={{-50,-7},{-20,
+  connect(sou3.ports[1], valOpePoi.port_3) annotation (Line(points={{-50,-7},{-20,
           -7},{-20,70},{0,70},{0,80}}, color={0,127,255}));
   connect(sou3.ports[2], valKv.port_3) annotation (Line(points={{-50,-9},{-20,-9},
           {-20,12},{0,12},{0,20}}, color={0,127,255}));
   connect(sou3.ports[3], valCv.port_3) annotation (Line(points={{-50,-11},{-20,-11},
           {-20,-48},{0,-48},{0,-40}}, color={0,127,255}));
   connect(sou3.ports[4], valAv.port_3) annotation (Line(points={{-50,-13},{-20,-13},
           {-20,-110},{0,-110},{0,-94}}, color={0,127,255}));
-  connect(valOPPoi.port_2, senM_flowOpPoi.port_a)
+  connect(valOpePoi.port_2, senMasFloOpPoi.port_a)
     annotation (Line(points={{10,90},{20,90}}, color={0,127,255}));
-  connect(valKv.port_2, senM_flowKv.port_a)
+  connect(valKv.port_2, senMasFloKv.port_a)
     annotation (Line(points={{10,30},{20,30}}, color={0,127,255}));
-  connect(valCv.port_2, senM_flowCv.port_a)
+  connect(valCv.port_2, senMasFloCv.port_a)
     annotation (Line(points={{10,-30},{20,-30}}, color={0,127,255}));
-  connect(valAv.port_2, senM_flowAv.port_a)
+  connect(valAv.port_2, senMasFloAv.port_a)
     annotation (Line(points={{10,-84},{20,-84}}, color={0,127,255}));
-  connect(senM_flowOpPoi.port_b, sin.ports[1]) annotation (Line(points={{40,90},
+  connect(senMasFloOpPoi.port_b, sin.ports[1]) annotation (Line(points={{40,90},
           {52,90},{52,92},{90,92},{90,3},{100,3}}, color={0,127,255}));
-  connect(senM_flowKv.port_b, sin.ports[2]) annotation (Line(points={{40,30},{76,
+  connect(senMasFloKv.port_b, sin.ports[2]) annotation (Line(points={{40,30},{76,
           30},{76,1},{100,1}}, color={0,127,255}));
-  connect(senM_flowCv.port_b, sin.ports[3]) annotation (Line(points={{40,-30},{90,
+  connect(senMasFloCv.port_b, sin.ports[3]) annotation (Line(points={{40,-30},{90,
           -30},{90,-1},{100,-1}}, color={0,127,255}));
-  connect(senM_flowAv.port_b, sin.ports[4]) annotation (Line(points={{40,-84},{92,
+  connect(senMasFloAv.port_b, sin.ports[4]) annotation (Line(points={{40,-84},{92,
           -84},{92,-3},{100,-3}}, color={0,127,255}));
-  connect(y.y, valOPPoi.y) annotation (Line(points={{-59,110},{0,110},{0,102}},
+  connect(y.y, valOpePoi.y) annotation (Line(points={{-59,110},{0,110},{0,102}},
                             color={0,0,127}));
   connect(y.y, valKv.y) annotation (Line(points={{-59,110},{-40,110},{-40,52},{0,
           52},{0,42}},

diff --git a/IBPSA/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mo b/IBPSA/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mo
@@ -26,7 +26,7 @@ model TwoWayValveParameterization
       273.15 + 4,
       Medium.X_default) "Standard density";
 
-  IBPSA.Fluid.Actuators.Valves.TwoWayLinear valOPPoi(
+  IBPSA.Fluid.Actuators.Valves.TwoWayLinear valOpePoi(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal,
     CvData=IBPSA.Fluid.Types.CvTypes.OpPoint,
@@ -66,13 +66,13 @@ model TwoWayValveParameterization
     T=293.15) "Boundary condition for flow sink"    annotation (Placement(
         transformation(extent={{90,-10},{70,10}})));
 
-  IBPSA.Fluid.Sensors.MassFlowRate senM_flowOpPoi(
+  IBPSA.Fluid.Sensors.MassFlowRate senMasFloOpPoi(
     redeclare package Medium = Medium) "Mass flow rate sensor"
     annotation (Placement(transformation(extent={{20,30},{40,50}})));
-  IBPSA.Fluid.Sensors.MassFlowRate senM_flowKv(
+  IBPSA.Fluid.Sensors.MassFlowRate senMasFloKv(
     redeclare package Medium = Medium) "Mass flow rate sensor"
     annotation (Placement(transformation(extent={{20,-10},{40,10}})));
-  IBPSA.Fluid.Sensors.MassFlowRate senM_flowCv(
+  IBPSA.Fluid.Sensors.MassFlowRate senMasFloCv(
     redeclare package Medium = Medium) "Mass flow rate sensor"
     annotation (Placement(transformation(extent={{20,-50},{40,-30}})));
   Valves.TwoWayLinear valAv(
@@ -82,11 +82,11 @@ model TwoWayValveParameterization
     CvData=IBPSA.Fluid.Types.CvTypes.Av,
     Av=Av) "Valve model, linear opening characteristics"
     annotation (Placement(transformation(extent={{-10,-90},{10,-70}})));
-  IBPSA.Fluid.Sensors.MassFlowRate senM_flowAv(redeclare package Medium =
+  IBPSA.Fluid.Sensors.MassFlowRate senMasFloAv(redeclare package Medium =
         Medium) "Mass flow rate sensor"
     annotation (Placement(transformation(extent={{20,-90},{40,-70}})));
 equation
-  connect(y.y, valOPPoi.y)
+  connect(y.y, valOpePoi.y)
                          annotation (Line(
       points={{-39,70},{-20,70},{6.66134e-16,70},{6.66134e-16,52}},
       color={0,0,127}));
@@ -102,33 +102,33 @@ equation
   connect(y.y, valCv.y) annotation (Line(
       points={{-39,70},{-20,70},{-20,-20},{6.66134e-16,-20},{6.66134e-16,-28}},
       color={0,0,127}));
-  connect(sou.ports[1], valOPPoi.port_a) annotation (Line(
+  connect(sou.ports[1], valOpePoi.port_a) annotation (Line(
       points={{-50,-1.5},{-40,-1.5},{-40,40},{-10,40}},
       color={0,127,255}));
-  connect(valOPPoi.port_b, senM_flowOpPoi.port_a) annotation (Line(
+  connect(valOpePoi.port_b, senMasFloOpPoi.port_a) annotation (Line(
       points={{10,40},{20,40}},
       color={0,127,255}));
-  connect(valKv.port_b, senM_flowKv.port_a) annotation (Line(
+  connect(valKv.port_b, senMasFloKv.port_a) annotation (Line(
       points={{10,6.10623e-16},{12.5,6.10623e-16},{12.5,1.22125e-15},{15,
           1.22125e-15},{15,6.10623e-16},{20,6.10623e-16}},
       color={0,127,255}));
-  connect(valCv.port_b, senM_flowCv.port_a) annotation (Line(
+  connect(valCv.port_b, senMasFloCv.port_a) annotation (Line(
       points={{10,-40},{20,-40}},
       color={0,127,255}));
-  connect(senM_flowCv.port_b, sin.ports[3]) annotation (Line(
+  connect(senMasFloCv.port_b, sin.ports[3]) annotation (Line(
       points={{40,-40},{56,-40},{56,0.5},{70,0.5}},
       color={0,127,255}));
-  connect(senM_flowKv.port_b, sin.ports[2]) annotation (Line(
+  connect(senMasFloKv.port_b, sin.ports[2]) annotation (Line(
       points={{40,0},{50,0},{50,-0.5},{70,-0.5}},
       color={0,127,255}));
-  connect(senM_flowOpPoi.port_b, sin.ports[1]) annotation (Line(
+  connect(senMasFloOpPoi.port_b, sin.ports[1]) annotation (Line(
       points={{40,40},{60,40},{60,2},{66,2},{66,-1.5},{70,-1.5}},
       color={0,127,255}));
   connect(sou.ports[4], valAv.port_a) annotation (Line(points={{-50,1.5},{-40,1.5},
           {-40,-80},{-10,-80}}, color={0,127,255}));
-  connect(valAv.port_b, senM_flowAv.port_a)
+  connect(valAv.port_b, senMasFloAv.port_a)
     annotation (Line(points={{10,-80},{20,-80}}, color={0,127,255}));
-  connect(senM_flowAv.port_b, sin.ports[4]) annotation (Line(points={{40,-80},{60,
+  connect(senMasFloAv.port_b, sin.ports[4]) annotation (Line(points={{40,-80},{60,
           -80},{60,1.5},{70,1.5}},  color={0,127,255}));
   connect(valAv.y, y.y) annotation (Line(points={{0,-68},{0,-60},{-20,-60},{-20,
           70},{-39,70}}, color={0,0,127}));

diff --git a/IBPSA/Fluid/Sensors/Examples/EnthalpyFlowRate.mo b/IBPSA/Fluid/Sensors/Examples/EnthalpyFlowRate.mo
@@ -33,7 +33,7 @@ model EnthalpyFlowRate "Test model for the enthalpy flow rate sensors"
     m_flow_nominal=2,
     tau=0)            "Specific enthalpy sensor"
                 annotation (Placement(transformation(extent={{0,-20},{20,0}})));
-  IBPSA.Fluid.Sensors.MassFlowRate senM_flow(
+  IBPSA.Fluid.Sensors.MassFlowRate senMasFlo(
     redeclare package Medium = Medium) "Mass flow rate sensor"
                 annotation (Placement(transformation(extent={{28,-20},{48,0}})));
   Modelica.Blocks.Math.Add cheEqu(k2=-1)
@@ -51,10 +51,10 @@ equation
   connect(senH_flow.port_b, senH.port_a) annotation (Line(
       points={{-10,-10},{-5.55112e-16,-10}},
       color={0,127,255}));
-  connect(senH.port_b, senM_flow.port_a) annotation (Line(
+  connect(senH.port_b, senMasFlo.port_a) annotation (Line(
       points={{20,-10},{28,-10}},
       color={0,127,255}));
-  connect(senM_flow.port_b, sin.ports[1]) annotation (Line(
+  connect(senMasFlo.port_b, sin.ports[1]) annotation (Line(
       points={{48,-10},{60,-10}},
       color={0,127,255}));
   connect(senH_flow.H_flow,cheEqu. u1) annotation (Line(
@@ -63,7 +63,7 @@ equation
   connect(senH.h_out, pro.u1) annotation (Line(
       points={{10,1},{10,28},{-14,28},{-14,70},{-2,70}},
       color={0,0,127}));
-  connect(senM_flow.m_flow, pro.u2) annotation (Line(
+  connect(senMasFlo.m_flow, pro.u2) annotation (Line(
       points={{38,1},{38,36},{-10,36},{-10,58},{-2,58}},
       color={0,0,127}));
   connect(pro.y,cheEqu. u2) annotation (Line(

diff --git a/IBPSA/Fluid/Sensors/Examples/EntropyFlowRate.mo b/IBPSA/Fluid/Sensors/Examples/EntropyFlowRate.mo
@@ -33,7 +33,7 @@ model EntropyFlowRate "Test model for the entropy flow rate sensors"
     m_flow_nominal=2,
     tau=0)            "Specific entropy sensor"
                 annotation (Placement(transformation(extent={{0,-20},{20,0}})));
-  IBPSA.Fluid.Sensors.MassFlowRate senM_flow(
+  IBPSA.Fluid.Sensors.MassFlowRate senMasFlo(
     redeclare package Medium = Medium) "Mass flow rate sensor"
                 annotation (Placement(transformation(extent={{28,-20},{48,0}})));
   IBPSA.Utilities.Diagnostics.AssertEquality assEqu
@@ -51,13 +51,13 @@ equation
   connect(senS_flow.port_b,senS. port_a) annotation (Line(
       points={{-10,-10},{-5.55112e-16,-10}},
       color={0,127,255}));
-  connect(senS.port_b, senM_flow.port_a) annotation (Line(
+  connect(senS.port_b, senMasFlo.port_a) annotation (Line(
       points={{20,-10},{28,-10}},
       color={0,127,255}));
-  connect(senM_flow.port_b, sin.ports[1]) annotation (Line(
+  connect(senMasFlo.port_b, sin.ports[1]) annotation (Line(
       points={{48,-10},{60,-10}},
       color={0,127,255}));
-  connect(senM_flow.m_flow, pro.u2) annotation (Line(
+  connect(senMasFlo.m_flow, pro.u2) annotation (Line(
       points={{38,1},{38,36},{-10,36},{-10,58},{-2,58}},
       color={0,0,127}));
   connect(pro.y, assEqu.u2) annotation (Line(

diff --git a/IBPSA/Fluid/Sensors/Examples/MoistAirEnthalpyFlowRate.mo b/IBPSA/Fluid/Sensors/Examples/MoistAirEnthalpyFlowRate.mo
@@ -34,7 +34,7 @@ model MoistAirEnthalpyFlowRate
     redeclare package Medium = Medium,
     m_flow_nominal=1) "Specific enthalpy sensor"
                 annotation (Placement(transformation(extent={{0,10},{20,30}})));
-  IBPSA.Fluid.Sensors.MassFlowRate senM_flow(
+  IBPSA.Fluid.Sensors.MassFlowRate senMasFlo(
     redeclare package Medium = Medium) "Mass flow rate sensor"
                 annotation (Placement(transformation(extent={{28,10},{48,30}})));
   Modelica.Blocks.Math.Product pro "Product to compute enthalpy flow rate"
@@ -60,20 +60,20 @@ equation
   connect(senH_flow.port_b, senH.port_a) annotation (Line(
       points={{-10,20},{-5.55112e-16,20}},
       color={0,127,255}));
-  connect(senH.port_b, senM_flow.port_a) annotation (Line(
+  connect(senH.port_b, senMasFlo.port_a) annotation (Line(
       points={{20,20},{28,20}},
       color={0,127,255}));
   connect(senH.h_out, pro.u1) annotation (Line(points={{10,31},{10,38},{10,76},
           {58,76}},          color={0,0,127}));
-  connect(senM_flow.m_flow, pro.u2) annotation (Line(points={{38,31},{38,48},{
+  connect(senMasFlo.m_flow, pro.u2) annotation (Line(points={{38,31},{38,48},{
           38,64},{58,64}},       color={0,0,127}));
   connect(senHLat_flow.H_flow, add.u1) annotation (Line(
       points={{-50,-59},{-50,-30},{18,-30}},
       color={0,0,127}));
   connect(senHSen_flow.H_flow, add.u2) annotation (Line(
       points={{-10,-59},{-10,-42},{18,-42}},
       color={0,0,127}));
-  connect(senM_flow.port_b, senHLat_flow.port_a) annotation (Line(
+  connect(senMasFlo.port_b, senHLat_flow.port_a) annotation (Line(
       points={{48,20},{60,20},{60,0},{-70,0},{-70,-70},{-60,-70}},
       color={0,127,255}));
   connect(senHLat_flow.port_b, senHSen_flow.port_a)