2023年12月26日

cloudflight

2023-12-26 5fa6947054206e2e781eadd4effdcdf52eda28c4

 Hydro.MapView/MapViewNetWork2Inp.cs

@@ -16,6 +16,7 @@
{
    partial class MapViewNetWork
    {

        public bool BuildFromInp(string filePath, bool use_old=false)
        {
            this.use_old = use_old;
@@ -29,8 +30,8 @@
            StreamReader sr = new StreamReader(filePath);
            //try
            {
                Nodes = new List<NodeViewModel>();
                Links = new List<LinkViewModel>();
                Nodes = new NodeViewModelList();
                Links = new LinkViewModelList();



@@ -592,12 +593,12 @@
            StreamReader sr = new StreamReader(filePath);
            //try
            {
                Nodes = new List<NodeViewModel>();
                Nodes = new NodeViewModelList();
                //reservoirs = new List<Reservoir>();
                //tanks = new List<Tank>();
                //meters = new List<Meter>();

                Links = new List<LinkViewModel>();
                Links =new LinkViewModelList();
                //valves = new List<Valve>();
                //repeaters = new List<Repeater>();

@@ -836,7 +837,7 @@
                    while (J.ID != p.Node2 && k1 < Nodes.Count)
                    {
                        k1++;
                        if (k1 < Nodes.Count) J = Nodes[k1];
                        if (k1 < Nodes.Count) J =Nodes[k1];
                    }
                    if (k1 == Nodes.Count)
                    {
@@ -897,8 +898,9 @@

            junctionStringBuilder.AppendLine(";ID                 Elev           Demand         Pattern         Type");

            Nodes.ForEach(o =>
            Nodes.ForEach(o0 =>
            {
                var o = o0;
                if (!o.Visible) return;
                if (o is JunctionViewModel j)
                    junctionStringBuilder.AppendLine(j.ToString() + $"{j.Level}\tJunction");
@@ -935,8 +937,9 @@

            pipeStringBuilder.AppendLine(";ID                 Node1              Node2              Length         Diameter       Roughness      MinorLoss      Status");

            Links.ForEach(o =>
            Links.ForEach(o0 =>
            {
                var o = (LinkViewModel)o0;
                if (!o.Visible) return;
                if (o is PipeViewModel p)
                    pipeStringBuilder.AppendLine(p.ToString() + $"{p.Level}");
@@ -1008,7 +1011,7 @@

            StringBuilder emitterStringBuilder = new StringBuilder();
            emitterStringBuilder.AppendLine(";Junction        \tCoefficient");
            Nodes.ForEach(o => emitterStringBuilder.Append(o.ToEmitterString()));
            Nodes.ForEach(o => emitterStringBuilder.Append((o).ToEmitterString()));