From c34f05eace8f6aefe1cdc2f77f5bfa17bd25a260 Mon Sep 17 00:00:00 2001
From: qinjie <qinjie@163.com>
Date: 星期二, 19 十二月 2023 15:46:24 +0800
Subject: [PATCH] 冲突解决
---
Hydro.HydraulicModel/EpanetBase2.2.cs | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Hydro.HydraulicModel/EpanetBase2.2.cs b/Hydro.HydraulicModel/EpanetBase2.2.cs
index 944c687..b9416bf 100644
--- a/Hydro.HydraulicModel/EpanetBase2.2.cs
+++ b/Hydro.HydraulicModel/EpanetBase2.2.cs
@@ -11,11 +11,12 @@
namespace Hydro.HydraulicModel
{
- class EpanetBase2_2
+ class HydraulicCoreBase
{
- const string DLLName = "epanet2.2.dll";//"epanet2.2.dll"
- //{ These are codes used by the DLL functions }
+ const string DLLName = "hydraulicCore.dll";//"epanet2.2.dll";//"epanet2.2.dll"
+ //{ These are codes used by the DLL functions }
+
@@ -152,7 +153,7 @@
int nodeindex = 0;
err = ENgetnodeindex22 (projectID,nodeID,ref nodeindex);
if (err > 0) return err;
- err = ENsetnodevalue22(projectID, nodeindex, Epanet.Const_class.Const_Node.EN_PATTERN, patternid);
+ err = ENsetnodevalue22(projectID, nodeindex, HydraulicCore.Const_class.Const_Node.EN_PATTERN, patternid);
return err;
}
--
Gitblit v1.9.3