From 7c31bbaa93a4decc21408e2f0b2befffe49c9db2 Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期二, 25 十月 2022 16:28:27 +0800
Subject: [PATCH] eta 能效修改
---
Calculation/IStation.EtaCalculation4Custom/base/station/EtaAnalyCalculatorBase4Station.cs | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/Calculation/IStation.EtaCalculation4Custom/base/station/EtaAnalyCalculatorBase4Station.cs b/Calculation/IStation.EtaCalculation4Custom/base/station/EtaAnalyCalculatorBase4Station.cs
index 33fd177..a04a7b9 100644
--- a/Calculation/IStation.EtaCalculation4Custom/base/station/EtaAnalyCalculatorBase4Station.cs
+++ b/Calculation/IStation.EtaCalculation4Custom/base/station/EtaAnalyCalculatorBase4Station.cs
@@ -870,7 +870,7 @@
if (ana_result == null)
return false;
-
+ bool is娑蹭綅浠ｆ浛鍑哄彛鍘嬪姏 = context_pump.Is娑蹭綅浠ｆ浛鍑哄彛鍘嬪姏;
bool is娑蹭綅浠ｆ浛杩涘彛鍘嬪姏 = context_pump.Is娑蹭綅浠ｆ浛杩涘彛鍘嬪姏;
long monitor_id_杩涘彛鍘嬪姏 = context_pump.MonitorID_InletPress;
long monitor_id_鍑哄彛鍘嬪姏 = context_pump.MonitorID_OutletPress;
@@ -996,6 +996,10 @@
return false;
}
double p2m = monitor_outlet_press.DataValue;
+ if (is娑蹭綅浠ｆ浛鍑哄彛鍘嬪姏)
+ {//娑蹭綅涓�鑸兘鏄痬
+ p2m = UnitConvert_M2MPa(p2m);
+ }
if (monitor_outlet_press.Elevation != null)
{//鍒ゆ柇鏄惁鏈夋爣楂�
p2m += UnitConvert_M2MPa(monitor_outlet_press.Elevation.Value);
@@ -1088,7 +1092,7 @@
var ana_result = context_pump.AnaResult;
if (ana_result == null)
return false;
-
+ bool is娑蹭綅浠ｆ浛鍑哄彛鍘嬪姏 = context_pump.Is娑蹭綅浠ｆ浛鍑哄彛鍘嬪姏;
bool is娑蹭綅浠ｆ浛杩涘彛鍘嬪姏 = context_pump.Is娑蹭綅浠ｆ浛杩涘彛鍘嬪姏;
long monitor_id_杩涘彛鍘嬪姏 = context_pump.MonitorID_InletPress;
long monitor_id_鍑哄彛鍘嬪姏 = context_pump.MonitorID_OutletPress;
@@ -1213,6 +1217,10 @@
return false;
}
double p2m = monitor_outlet_press.DataValue;
+ if (is娑蹭綅浠ｆ浛鍑哄彛鍘嬪姏)
+ {//娑蹭綅涓�鑸兘鏄痬
+ p2m = UnitConvert_M2MPa(p2m);
+ }
if (monitor_outlet_press.Elevation != null)
{//鍒ゆ柇鏄惁鏈夋爣楂�
p2m += UnitConvert_M2MPa(monitor_outlet_press.Elevation.Value);
--
Gitblit v1.9.3