fix：修复初分配计算异常的问题

cloudflight

2024-08-03 5dde4212e3a73bf1ab0fd9e4d34dfebad0f8ffa2

 Hydraulic/Hydro.MapUI/Map/MapViewer.cs

@@ -2721,6 +2721,7 @@

        private void btn_初分配_Click(object sender, EventArgs e)
        {
            if (_Network == null) return;
            //btn_拓扑检查_Click(1,null);
            List<WaterEquivalentSettings> settings = new List<WaterEquivalentSettings>();
            settings.Add(new WaterEquivalentSettings() 
@@ -2738,72 +2739,71 @@
                            RatedFlow=0.72f,
                            Count=1,
                        },
                        new WaterEquivalent()
                        {
                            ID=1009,
                            MinRatedFlow=0.88f,
                            RatedFlow=0.96f,
                            Count=2,
                        },
                        new WaterEquivalent()
                        {
                            ID=1010,
                            MinRatedFlow=1.08f,
                            RatedFlow=1.08f,
                            Count=3,
                        }
                        //new WaterEquivalent()
                        //{
                        //    ID=1009,
                        //    MinRatedFlow=0.88f,
                        //    RatedFlow=0.96f,
                        //    Count=2,
                        //},
                        //new WaterEquivalent()
                        //{
                        //    ID=1010,
                        //    MinRatedFlow=1.08f,
                        //    RatedFlow=1.08f,
                        //    Count=3,
                        //}
                    }
                },
                Meters=new List<string>() 
                {
                    //按以下规律生成数组到M10，"M1","M2"

                        "M1","M2","M3","M4","M5","M6","M7","M8","M9","M10","M11","M12","M13","M14","M15","M16",
                    "M17","M18","M19","M20","M21","M22","M23","M24","M25","M26","M27","M28","M29","M30"
                        "M0","M1","M2","M3","M4","M5","M6"
                },
            });


            settings.Add(new WaterEquivalentSettings()
            {
                waterEquivalents = new WaterEquivalentTemplate()
                {
                    ID = "1",
                    Name = "1",
                    WaterEquivalentCollection = new WaterEquivalentCollection()
                    {
                        new WaterEquivalent()
                        {
                            ID=2008,
                            MinRatedFlow=0.48f,
                            RatedFlow=0.48f,
                            Count=1,
                        },
                        new WaterEquivalent()
                        {
                            ID=2009,
                            MinRatedFlow=0.12f,
                            RatedFlow=0.12f,
                            Count=5,
                        },
                        new WaterEquivalent()
                        {
                            ID=2010,
                            MinRatedFlow=0.16f,
                            RatedFlow=0.18f,
                            Count=6,
                        }
                    }
                },
                Meters = new List<string>()
                {
                    //按以下规律生成数组到M10，"M1","M2"
            //settings.Add(new WaterEquivalentSettings()
            //{
            //    waterEquivalents = new WaterEquivalentTemplate()
            //    {
            //        ID = "1",
            //        Name = "1",
            //        WaterEquivalentCollection = new WaterEquivalentCollection()
            //        {
            //            new WaterEquivalent()
            //            {
            //                ID=2008,
            //                MinRatedFlow=0.48f,
            //                RatedFlow=0.48f,
            //                Count=1,
            //            },
            //            new WaterEquivalent()
            //            {
            //                ID=2009,
            //                MinRatedFlow=0.12f,
            //                RatedFlow=0.12f,
            //                Count=5,
            //            },
            //            new WaterEquivalent()
            //            {
            //                ID=2010,
            //                MinRatedFlow=0.16f,
            //                RatedFlow=0.18f,
            //                Count=6,
            //            }
            //        }
            //    },
            //    Meters = new List<string>()
            //    {
            //        //按以下规律生成数组到M10，"M1","M2"

                       "M31","M32","M33","M34","M35","M36","M37","M38","M39","M40","M41","M42","M43","M44","M45","M46","M47","M48","M49","M50","M51","M52","M53","M54","M55","M56","M57","M58","M59","M60","M61","M62","M63","M64","M65","M66","M67","M68","M69","M70","M71","M72","M73","M74","M75","M76","M77","M78","M79","M80"
                },
            });
            //           "M31","M32","M33","M34","M35","M36","M37","M38","M39","M40","M41","M42","M43","M44","M45","M46","M47","M48","M49","M50","M51","M52","M53","M54","M55","M56","M57","M58","M59","M60","M61","M62","M63","M64","M65","M66","M67","M68","M69","M70","M71","M72","M73","M74","M75","M76","M77","M78","M79","M80"
            //    },
            //});
            var head=_Network.reservoirs.FirstOrDefault().Head;
            _Network.WaterDistribution(_Template.FullPath, GlobalPath.configPath + "config_waterDistri.wdb",settings,40, head);
            _Network.WaterDistribution(_Template.FullPath, GlobalPath.configPath + "config_waterDistri.wdb",settings,4, head);

        }
      public void btn_拓扑检查_Click(object sender, EventArgs e)