From cb12c35c7af4350b0f38b6d90a15d8bd9796b8c5 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 30 十一月 2024 13:22:49 +0800
Subject: [PATCH] epa报错处理
---
Hydro/Yw.EPAnet.Calcu.Core/03-calcu/00-core/NetworkCalcuExtensions.cs | 20 +++++-----
WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/00-core/HydroLinkViewModel.cs | 28 ++++++++++++++
WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/02-pump/HydroPumpViewModel.cs | 26 +++++++++++++
WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/00-core/HydroNodeViewModel.cs | 1
WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/04-instrument/00-core/HydroFlowmeterViewModel.cs | 12 ++++++
5 files changed, 77 insertions(+), 10 deletions(-)
diff --git a/Hydro/Yw.EPAnet.Calcu.Core/03-calcu/00-core/NetworkCalcuExtensions.cs b/Hydro/Yw.EPAnet.Calcu.Core/03-calcu/00-core/NetworkCalcuExtensions.cs
index 0e2c8a8..e6ec2d8 100644
--- a/Hydro/Yw.EPAnet.Calcu.Core/03-calcu/00-core/NetworkCalcuExtensions.cs
+++ b/Hydro/Yw.EPAnet.Calcu.Core/03-calcu/00-core/NetworkCalcuExtensions.cs
@@ -21,7 +21,7 @@
return result;
}
- var linkdict= network.GetAllLinks().ToDictionary(p => p.Id);
+ var linkdict = network.GetAllLinks().ToDictionary(p => p.Id);
var nodedict = network.GetAllNodes().ToDictionary(p => p.Id);
//鑾峰彇绯荤粺涓存椂鏂囦欢鐩綍锛屽垱寤篿np涓存椂鏂囦欢
@@ -97,7 +97,7 @@
}
result.NodeList.Add(calcuNode);
}
- var nodeResultDict= result.NodeList.ToDictionary(p => p.Id);
+ var nodeResultDict = result.NodeList.ToDictionary(p => p.Id);
for (int i = 1; i <= linkCount; i++)
{
epanet.getlinkid(i, sb);
@@ -131,18 +131,18 @@
double minorloss1 = p.StartMinorloss * Math.Pow(calcuLink.Velocity, 2) / 2 / 9.81;
double minorloss2 = p.EndMinorloss * Math.Pow(calcuLink.Velocity, 2) / 2 / 9.81;
double minorloss = p.MinorLoss * Math.Pow(calcuLink.Velocity, 2) / 2 / 9.81;
- calcuLink.Headloss-= minorloss1 + minorloss2;
+ calcuLink.Headloss -= minorloss1 + minorloss2;
calcuLink.MinorLoss = minorloss;
- calcuLink.FrictionLoss = calcuLink.Headloss- minorloss;
+ calcuLink.FrictionLoss = calcuLink.Headloss - minorloss;
//if (nodedict[p.StartNode.Id] is Elbow)
{
- nodeResultDict[p.StartNode.Id].Minorloss += minorloss1;
+ nodeResultDict[p.StartNode.Id].MinorLoss += minorloss1;
}
//if (nodedict[p.EndNode.Id] is Elbow)
{
- nodeResultDict[p.EndNode.Id].Minorloss += minorloss2;
+ nodeResultDict[p.EndNode.Id].MinorLoss += minorloss2;
}
-
+
}
}
result.LinkList.Add(calcuLink);
@@ -272,7 +272,7 @@
branchPipe.StartMinorloss = minorLoss.Value;
else
branchPipe.EndMinorloss = minorLoss.Value;
-
+
}
}
}
@@ -294,7 +294,7 @@
bool isNext = prevLinks.Count < nextLinks.Count;
- var branchLinks = isNext ? nextLinks:prevLinks ;
+ var branchLinks = isNext ? nextLinks : prevLinks;
foreach (var branchLink in branchLinks)
{
var pipe = branchLink as Pipe;
@@ -308,7 +308,7 @@
{
pipe.EndMinorloss = fourlink.MinorLoss.Value;
}
-
+
}
}
}
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/00-core/HydroNodeViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/00-core/HydroNodeViewModel.cs
index 0c79651..5dc2db4 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/00-core/HydroNodeViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/00-core/HydroNodeViewModel.cs
@@ -99,6 +99,7 @@
this.CalcuPress = calcuNodeProperty.CalcuPress.HasValue ? Math.Round(calcuNodeProperty.CalcuPress.Value, 2) : null;
this.CalcuHead = calcuNodeProperty.CalcuHead.HasValue ? Math.Round(calcuNodeProperty.CalcuHead.Value, 2) : null;
this.CalcuDemand = calcuNodeProperty.CalcuDemand.HasValue ? Math.Round(calcuNodeProperty.CalcuDemand.Value, 1) : null;
+ this.CalcuMinorLoss = calcuNodeProperty.CalcuMinorLoss.HasValue ? Math.Round(calcuNodeProperty.CalcuMinorLoss.Value, 4) : null;
}
}
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/04-instrument/00-core/HydroFlowmeterViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/04-instrument/00-core/HydroFlowmeterViewModel.cs
index c1be137..e9962fc 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/04-instrument/00-core/HydroFlowmeterViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/04-instrument/00-core/HydroFlowmeterViewModel.cs
@@ -56,6 +56,18 @@
[Browsable(false)]
public override double? CalcuDemand { get; set; }
+ /// <summary>
+ /// 灞�閮ㄦ崯澶�
+ /// </summary>
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("灞�閮ㄦ崯澶�")]
+ [PropertyOrder(10004)]
+ [DisplayUnit("m")]
+ [HydroCalcuPro]
+ [ShowEditor(false)]
+ [Browsable(false)]
+ public override double? CalcuMinorLoss { get; set; }
+
/// <summary>
///
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/00-core/HydroLinkViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/00-core/HydroLinkViewModel.cs
index 0d45320..edcc529 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/00-core/HydroLinkViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/00-core/HydroLinkViewModel.cs
@@ -106,6 +106,32 @@
[ShowEditor(false)]
public virtual double? CalcuHeadLoss { get; set; }
+ /// <summary>
+ /// 灞�閮ㄦ崯澶�
+ /// </summary>
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("灞�閮ㄦ崯澶�")]
+ [Display(Name = "灞�閮ㄦ崯澶�(m)")]
+ [PropertyOrder(10004)]
+ [Browsable(true)]
+ [DisplayUnit("m")]
+ [HydroCalcuPro]
+ [ShowEditor(false)]
+ public virtual double? CalcuMinorLoss { get; set; }
+
+ /// <summary>
+ /// 娌跨▼鎹熷け
+ /// </summary>
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("娌跨▼鎹熷け")]
+ [Display(Name = "娌跨▼鎹熷け(m)")]
+ [PropertyOrder(10005)]
+ [Browsable(true)]
+ [DisplayUnit("m")]
+ [HydroCalcuPro]
+ [ShowEditor(false)]
+ public virtual double? CalcuFrictionLoss { get; set; }
+
/// <summary>
/// Vmo
@@ -153,6 +179,8 @@
this.CalcuFlow = calcuLinkProperty.CalcuFlow.HasValue ? Math.Round(calcuLinkProperty.CalcuFlow.Value, 1) : null;
this.CalcuVelocity = calcuLinkProperty.CalcuVelocity.HasValue ? Math.Round(calcuLinkProperty.CalcuVelocity.Value, 2) : null;
this.CalcuHeadLoss = calcuLinkProperty.CalcuHeadLoss.HasValue ? Math.Round(calcuLinkProperty.CalcuHeadLoss.Value, 2) : null;
+ this.CalcuMinorLoss = calcuLinkProperty.CalcuMinorLoss.HasValue ? Math.Round(calcuLinkProperty.CalcuMinorLoss.Value, 4) : null;
+ this.CalcuFrictionLoss = calcuLinkProperty.CalcuFrictionLoss.HasValue ? Math.Round(calcuLinkProperty.CalcuFrictionLoss.Value, 4) : null;
}
}
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/02-pump/HydroPumpViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/02-pump/HydroPumpViewModel.cs
index ff04437..3d263a5 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/02-pump/HydroPumpViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/02-pump/HydroPumpViewModel.cs
@@ -231,6 +231,32 @@
[Browsable(false)]
public override double? CalcuHeadLoss { get; set; }
+ /// <summary>
+ /// 灞�閮ㄦ崯澶�
+ /// </summary>
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("灞�閮ㄦ崯澶�")]
+ [Display(Name = "灞�閮ㄦ崯澶�(m)")]
+ [PropertyOrder(10004)]
+ [DisplayUnit("m")]
+ [HydroCalcuPro]
+ [ShowEditor(false)]
+ [Browsable(false)]
+ public override double? CalcuMinorLoss { get; set; }
+
+ /// <summary>
+ /// 娌跨▼鎹熷け
+ /// </summary>
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("娌跨▼鎹熷け")]
+ [Display(Name = "娌跨▼鎹熷け(m)")]
+ [PropertyOrder(10005)]
+ [DisplayUnit("m")]
+ [HydroCalcuPro]
+ [ShowEditor(false)]
+ [Browsable(false)]
+ public override double? CalcuFrictionLoss { get; set; }
+
/// <summary>
/// 娴侀噺
--
Gitblit v1.9.3