Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

yangyin

2024-08-20 98e49c0dd42840a094837f7acae532bc237a719a

 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;