core升级

cloudflight

2024-06-17 b62f5f0104845c2a3a74707792ebf28a506e24f1

 Hydraulic/Hydro.Inp2.2/NetWork.cs

@@ -1,4 +1,5 @@
using Hydro.Core.Model;
using Hydro.CommonBase;
using Hydro.Core.Model;
//using Hydro.HydraulicModel;
using System;
using System.Collections.Generic;
@@ -740,7 +741,7 @@

            string backupFileName = $"{Path.GetFileNameWithoutExtension(InpPath)}_{DateTime.Now:yyyyMMddHHmmss}{Path.GetExtension(InpPath)}";
            string backupFilePath = Path.Combine(backupFolderPath, backupFileName);
            //if (File.Exists(InpPath)) File.Copy(InpPath, backupFilePath, true);
            FileCopy.Copy(InpPath, backupFilePath, true);

            //Global.ClearFileReadOnly(InpPath);
            File.WriteAllText(InpPath, output);
@@ -980,35 +981,38 @@

            var sb = new StringBuilder(MAXID);

            for (int i = 1; i < nodeCount; i++)
            for (int i = 1; i <= nodeCount; i++)
            {
                epanet.getnodeid(i, sb);
                var arr = System.Enum.GetValues(typeof(HydraulicModel.NodeValueType));
                var arr = new string[] {"Press", "Head", "Demand" }; //System.Enum.GetValues(typeof(HydraulicModel.NodeValueType));
                var arrnum = new int[] { 10, 11, 9 };
                for (var j = 0; j < arr.Length; j++)
                {
                    float v = 0;
                    var t = (HydraulicModel.NodeValueType)j;
                    epanet.getnodevalue(i, (int)t, ref v);
                    epanet.getnodevalue(i, arrnum[j], ref v);
                    result.Add(new TimePoint()
                    {
                        Key = sb.ToString() + "_" + t.ToString(),
                        Key = arr[j] + "_"+sb.ToString(),
                        Value = v,
                    });
                }
            }

            for (int i = 1; i < linkCount; i++)
            for (int i = 1; i <= linkCount; i++)
            {
                epanet.getlinkid(i, sb);
                var arr = System.Enum.GetValues(typeof(HydraulicModel.LinkValueType));
                //var arr = System.Enum.GetValues(typeof(HydraulicModel.LinkValueType));
                var arr = new string[] { "Flow", "Velocity", "Headloss" }; //System.Enum.GetValues(typeof(HydraulicModel.NodeValueType));
                var arrnum = new int[] { 8, 9, 10 };
                for (var j = 0; j < arr.Length; j++)
                {
                    float v = 0;
                    var t = (HydraulicModel.LinkValueType)j;
                    epanet.getlinkvalue(i, (int)t, ref v);
                    epanet.getlinkvalue(i, arrnum[j], ref v);
                    result.Add(new TimePoint()
                    {
                        Key = sb.ToString() + "_" + t.ToString(),
                        Key = arr[j] + "_" +sb.ToString(),
                        Value = v,
                    });
                }