From 98e49c0dd42840a094837f7acae532bc237a719a Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期二, 20 八月 2024 15:42:37 +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/NetworkCalcuExtensions.cs | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/Hydro/Yw.EPAnet.Calcu.Core/03-calcu/NetworkCalcuExtensions.cs b/Hydro/Yw.EPAnet.Calcu.Core/03-calcu/NetworkCalcuExtensions.cs
index 50a2250..b5c865c 100644
--- a/Hydro/Yw.EPAnet.Calcu.Core/03-calcu/NetworkCalcuExtensions.cs
+++ b/Hydro/Yw.EPAnet.Calcu.Core/03-calcu/NetworkCalcuExtensions.cs
@@ -31,13 +31,14 @@
var errOpen = epanet.open(inpFilePath, "", "");
if (errOpen != 0)
{
- var sbmsg = new StringBuilder();
- epanet.geterror(errOpen, sbmsg, 256);
+
+ string txt = epanet.geterrormsg();
+
result.Succeed = false;
result.FailedList.Add(new CalcuFailed()
{
Code = errOpen,
- Message = $"鍔犺浇绠＄綉澶辫触锛寋sbmsg}"
+ Message = $"{txt}"
});
return result;
}
@@ -46,21 +47,21 @@
var errCalcu = epanet.solveH();
if (errCalcu != 0)
{
- var sbmsg = new StringBuilder();
- epanet.geterror(errCalcu, sbmsg, 256);
+
+ string txt = epanet.geterrormsg();
result.Succeed = false;
result.FailedList.Add(new CalcuFailed()
{
Code = errCalcu,
- Message = $"绠＄綉璁＄畻澶辫触锛寋sbmsg}"
+ Message = $"{txt}"
});
return result;
}
int nodeCount = 0;
int linkCount = 0;
- epanet.GetCount(eCountType.Node, ref nodeCount);
- epanet.GetCount(eCountType.Link, ref linkCount);
+ epanet.getcount((int)eCountType.Node, ref nodeCount);
+ epanet.getcount((int)eCountType.Link, ref linkCount);
const int MAXID = 31;
--
Gitblit v1.9.3