From 05f522e321a742f03bf1e3e26edaeb5147da42f4 Mon Sep 17 00:00:00 2001
From: tangxu <76880903@qq.com>
Date: 星期三, 02 十一月 2022 16:18:47 +0800
Subject: [PATCH] 解决南汇北 计划计算
---
Calculation/IStation.Calculation.Dispatch/custom/shys/station/陈行一输/OptAna.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git "a/Calculation/IStation.Calculation.Dispatch/custom/shys/station/\351\231\210\350\241\214\344\270\200\350\276\223/OptAna.cs" "b/Calculation/IStation.Calculation.Dispatch/custom/shys/station/\351\231\210\350\241\214\344\270\200\350\276\223/OptAna.cs"
index c3d5ae7..99d021a 100644
--- "a/Calculation/IStation.Calculation.Dispatch/custom/shys/station/\351\231\210\350\241\214\344\270\200\350\276\223/OptAna.cs"
+++ "b/Calculation/IStation.Calculation.Dispatch/custom/shys/station/\351\231\210\350\241\214\344\270\200\350\276\223/OptAna.cs"
@@ -104,7 +104,7 @@
double pipe3_TargetPess = complex_request_paras.OutletPipePara[2].TargetPress;
if (pipe1_TargetFlow > 50)
{
- if (pipe1_TargetPess < water_level1/100 + 0.01)
+ if (pipe1_TargetPess < water_level1 / 102 + 0.01)
{
error_info = "ERROR 35,闄堣涓�杈撻渶瑕佷竴鍙风鍘嬪姏鏈祴鍊�";
return default;
@@ -112,7 +112,7 @@
}
if (pipe2_TargetFlow > 50)
{
- if (pipe2_TargetPess < water_level2 / 100 + 0.01)
+ if (pipe2_TargetPess < water_level2 / 102 + 0.01)
{
error_info = "ERROR 35,闄堣涓�杈撻渶瑕佷簩鍙风鍘嬪姏鏈祴鍊�";
return default;
@@ -120,7 +120,7 @@
}
if (pipe3_TargetFlow > 50)
{
- if (pipe3_TargetPess < water_level3 / 100 + 0.01)
+ if (pipe3_TargetPess < water_level3 / 102 + 0.01)
{
error_info = "ERROR 35,闄堣涓�杈撻渶瑕佷笁鍙风鍘嬪姏鏈祴鍊�";
return default;
@@ -239,9 +239,9 @@
var plan = new Model.AnaScheme();
plan.ID = 1;
plan.TotalWrkQ = Math.Round(totalQ, 1);
- plan.TotalWrkH = Math.Round(totalH / totalH, 2);
+ plan.TotalWrkH = Math.Round(totalH / pipe_count, 2);
plan.TotalWrkP = Math.Round(totalP, 1);
- plan.TotalWrkE = IStation.Common.PumpParaHelper.CalculateE(plan.TotalWrkQ, plan.TotalWrkH, plan.TotalWrkP);
+ plan.TotalWrkE = CalcConnectPipeEta(new List<AnaScheme>() { pipe1_result, pipe2_result, pipe3_result });
plan.UWP = CalculateUWP(plan.TotalWrkP, plan.TotalWrkQ, plan.TotalWrkH);
plan.WP = CalculateWP(plan.TotalWrkP, plan.TotalWrkQ);
@@ -419,9 +419,9 @@
var plan = new Model.AnaScheme();
plan.ID = 1;
plan.TotalWrkQ = Math.Round(totalQ, 1);
- plan.TotalWrkH = Math.Round(totalH / totalH, 2);
+ plan.TotalWrkH = Math.Round(totalH / pipe_count, 2);
plan.TotalWrkP = Math.Round(totalP, 1);
- plan.TotalWrkE = IStation.Common.PumpParaHelper.CalculateE(plan.TotalWrkQ, plan.TotalWrkH, plan.TotalWrkP);
+ plan.TotalWrkE = CalcConnectPipeEta(new List<AnaScheme>() { pipe1_result, pipe2_result, pipe3_result });
plan.UWP = CalculateUWP(plan.TotalWrkP, plan.TotalWrkQ, plan.TotalWrkH);
plan.WP = CalculateWP(plan.TotalWrkP, plan.TotalWrkQ);
--
Gitblit v1.9.3