From f47abf649b85ce5fd21725fedaebba359a6dfd1d Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 24 十二月 2024 09:20:02 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
Hydro/Yw.EPAnet.Calcu.Core/03-calcu/NetworkPathAnalyseExtensions.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Hydro/Yw.EPAnet.Calcu.Core/03-calcu/NetworkPathAnalyseExtensions.cs b/Hydro/Yw.EPAnet.Calcu.Core/03-calcu/NetworkPathAnalyseExtensions.cs
index 3df4d85..d539e31 100644
--- a/Hydro/Yw.EPAnet.Calcu.Core/03-calcu/NetworkPathAnalyseExtensions.cs
+++ b/Hydro/Yw.EPAnet.Calcu.Core/03-calcu/NetworkPathAnalyseExtensions.cs
@@ -81,7 +81,7 @@
length += p.Length;
}
-
+ nodeEnd.Distance = length;
chartNodes.Add(nodeEnd);
for (int i=0;i<links.Count;i++)
@@ -96,8 +96,8 @@
//鏍规嵁p.diameter鍜宲.flow璁＄畻娴侀��
double velocity = dictLinks[ p.Id].Flow/ (Math.PI * Math.Pow(p.Diameter / 2, 2));
//鏍规嵁娴侀�熻绠楀眬閮ㄦ按澶存崯澶�
- double minorloss1 = p.StartMinorloss* Math.Pow(velocity, 2) / 2 / 9.81;
- double minorloss2 = p.EndMinorloss * Math.Pow(velocity, 2) / 2 / 9.81;
+ double minorloss1 = dictLinks[p.Id].StartMinorLoss;
+ double minorloss2 = dictLinks[p.Id].EndMinorLoss;
if (i < links.Count - 1)
--
Gitblit v1.9.3