From 1e387f457092df846ec04e2c6792b83244aae04e Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期六, 07 十二月 2024 12:09:23 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
Hydro/Yw.EPAnet.Calcu.Core/04-Inp/InpInteropHelper.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Hydro/Yw.EPAnet.Calcu.Core/04-Inp/InpInteropHelper.cs b/Hydro/Yw.EPAnet.Calcu.Core/04-Inp/InpInteropHelper.cs
index 6598cf3..0a5bb8c 100644
--- a/Hydro/Yw.EPAnet.Calcu.Core/04-Inp/InpInteropHelper.cs
+++ b/Hydro/Yw.EPAnet.Calcu.Core/04-Inp/InpInteropHelper.cs
@@ -141,7 +141,8 @@
x.Roughness = 110;
}
string statusString = x.LinkStatus == PipeStatus.Closed ? "CLOSED" : "";
- pipeSb.AppendLine($"{x.Id}\t{x.StartNode.Id}\t{x.EndNode.Id}\t{x.Length}\t{x.Diameter}\t{x.Roughness}\t{x.MinorLoss}\t{statusString}\t;\t");// + $"{p.Level}");
+ double minorLoss = x.MinorLoss + x.EndMinorloss + x.StartMinorloss;
+ pipeSb.AppendLine($"{x.Id}\t{x.StartNode.Id}\t{x.EndNode.Id}\t{x.Length}\t{x.Diameter}\t{x.Roughness}\t{minorLoss}\t{statusString}\t;\t");// + $"{p.Level}");
if (x.LinkStatus != PipeStatus.Open)
{
statusSb.AppendLine(x.Id + "\t" + statusString);
--
Gitblit v1.9.3