Yw.EPAnet修改

lixiaojun

2024-08-13 0e0709e63ed50093d09fb88ac1ea4eb9b5a37afc

 Hydro/Yw.EPAnet.Calcu.Core/04-Inp/InpInteropHelper.cs

@@ -1,11 +1,6 @@
using Hydro.CommonBase;
using System.Diagnostics.Metrics;
using System.Drawing;
using System.Text;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Xml.Linq;

using Hydro.CommonBase;

namespace Yw.EPAnet
{
@@ -113,11 +108,13 @@
            net.Pipes.ForEach(o =>
            {
                if (o.Roughness == 0) o.Roughness = 110;
                string statusString = o.LinkStatus == LinkStatus.Closed ? "CLOSED" : "";
                string statusString = o.LinkStatus == PipeStatus.Closed ? "CLOSED" : "";
                
                pipeStringBuilder.AppendLine($"{o.Id}\t{o.StartNode.Id}\t{o.EndNode.Id}\t{o.Length}\t{o.Diameter}\t{o.Roughness}\t{o.MinorLoss}\t{statusString}\t;\t");// + $"{p.Level}");
                if (o.LinkStatus!=LinkStatus.Open)
                if (o.LinkStatus != PipeStatus.Open)
                {
                    statusStringBuilder.AppendLine(o.Id + "\t" + statusString);
                }
            });

            string pipeString = pipeStringBuilder.ToString();
@@ -384,7 +381,7 @@
                                    float minorLoss;
                                    if (float.TryParse(parts[6], out minorLoss))
                                        p.MinorLoss = minorLoss;
                                    p.LinkStatus = parts.Length > 7 ? LinkStatus.Closed : LinkStatus.Open;
                                    p.LinkStatus = parts.Length > 7 ? PipeStatus.Closed : PipeStatus.Open;
                                    //int level;
                                    //if (int.TryParse(parts[8], out level))
                                    //    p.Level = level;