From b825d70578b0ddf6d479569887c194f919795dad Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期五, 28 三月 2025 14:22:48 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/PBS.WinFrmUI.Hydro/05-system-curve/00-core/SystemCurvePage.cs | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI.Hydro/05-system-curve/00-core/SystemCurvePage.cs b/WinFrmUI/PBS.WinFrmUI.Hydro/05-system-curve/00-core/SystemCurvePage.cs
index c9120d3..07ef700 100644
--- a/WinFrmUI/PBS.WinFrmUI.Hydro/05-system-curve/00-core/SystemCurvePage.cs
+++ b/WinFrmUI/PBS.WinFrmUI.Hydro/05-system-curve/00-core/SystemCurvePage.cs
@@ -13,6 +13,7 @@
_curveLowerPressure = l;
_curveAveragePressure = a;
};
+
}
@@ -65,7 +66,7 @@
var file_path = _facility.ModelPath;
var minDemand = 0; // 鏈�灏忔�婚渶姘撮噺(m鲁/h)
var maxDemand = _facility.MaxWaterDemand ?? 45; // 鏈�澶ф�婚渶姘撮噺(m鲁/h)
- var calcCount = 20000; // 璁＄畻娆℃暟
+ var calcCount = 1000; // 璁＄畻娆℃暟
var maxHeight = 22.5; //椤舵ゼ鏍囬珮
var requiredEndPressure = _facility.TerminalPressure ?? 15; //闈欏帇
CalcSystemCurve(file_path, minDemand, maxDemand, maxHeight, requiredEndPressure, calcCount);
@@ -90,8 +91,6 @@
double requiredEndPressure,
int calcCount)
{
-
- var pressure = 0d;
var nodeConfig = new List<WaterDistributionCalculator.NodeConfig>();
var waterPointCalcList = new List<WaterPointCalcViewModel>(calcCount);
using (var helper = new Yw.Epanet.InteropXHelper())
@@ -156,7 +155,6 @@
foreach (var node in nodeConfig)
{
var userNodeIndex = node.NodeIndex;
- pressure = 0;
//鑷敱鍘嬪姏=缁濆鍘嬪姏-鏍囬珮
//榛樿璧峰鐐瑰帇鍔涗负鏈�浣庢按浣嶏紝鎵�浠ョ敤 缁濆鍘嬪姏 褰撹嚜鐢卞帇鍔� 锛堢粷瀵瑰帇鍔�=鑷敱鍘嬪姏+鏍囬珮锛�
--
Gitblit v1.9.3