From c3b1e8241a0456eed42c3278c9616d6500859272 Mon Sep 17 00:00:00 2001
From: cloudflight <cloudflight@126.com>
Date: 星期六, 02 十二月 2023 18:51:59 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/Yw/Hydro.V1.0
---
Hydro.Inp/NetWork.cs | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/Hydro.Inp/NetWork.cs b/Hydro.Inp/NetWork.cs
index 9dd99e2..2f4c527 100644
--- a/Hydro.Inp/NetWork.cs
+++ b/Hydro.Inp/NetWork.cs
@@ -2,6 +2,7 @@
//using Hydro.HydraulicModel;
using System;
using System.Collections.Generic;
+using System.Data;
using System.Drawing;
using System.IO;
using System.IO.Ports;
@@ -465,7 +466,7 @@
#region 浼樺寲鏂规
int k1 = 0;
int k2 = 0;
-
+
Nodes.Sort((a, b) => string.Compare(a.ID, b.ID));
points.Sort((a, b) => string.Compare(a.ID, b.ID));
@@ -493,7 +494,7 @@
}
#endregion
-
+
//寤虹珛鐐圭嚎鍏崇郴閾捐〃StartNode锛屽厛灏嗙绾夸互Node1锛堣妭鐐�1鐨処D锛夋帓搴忥紝鍐嶅皢Nodes鎸塈D鎺掑簭锛屽缓绔嬩袱涓父鏍噆1銆乲2锛屾鍚戜竴娆″惊鐜紝寤虹珛閾捐〃鍏崇郴
//鏃堕棿澶嶆潅搴� O(n)
@@ -564,7 +565,7 @@
}
if (!File.Exists(tempPath))
{
- throw new Exception("妯℃澘鏂囦欢涓嶅瓨鍦�");
+ throw new Exception("妯℃澘鏂囦欢涓嶅瓨鍦�," + tempPath);
}
if (!File.Exists(InpPath))
File.Create(InpPath).Close();
@@ -954,9 +955,15 @@
HydraulicModel.Epanet epanet = new HydraulicModel.Epanet();
var result = new List<TimePoint>();
var err = epanet.open(InpPath, "d:\\5.log", "");
+
if (err != 0)
{
- throw new Exception($"璁＄畻澶辫触锛歿err}");
+ throw new Exception($"鎵撳紑璁＄畻鏂囦欢澶辫触锛歿err}");
+ }
+ var errCal = epanet.solveH();
+ if (errCal != 0)
+ {
+ throw new Exception($"璁＄畻澶辫触锛歿errCal}");
}
int nodeCount = 0, linkCount = 0;
epanet.getcount((int)CountType.Node, ref nodeCount);
@@ -1007,7 +1014,7 @@
/// <returns></returns>
public virtual List<TimePoint> Calc()
{
- var inpPath = Path.Combine(Directory.GetCurrentDirectory(), @"data\inp\calc.inp");
+ var inpPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"data\inp\calc.inp");
BuildToInp(inpPath);
return Calc(inpPath);
}
--
Gitblit v1.9.3