duheng
2025-03-28 b825d70578b0ddf6d479569887c194f919795dad
WinFrmUI/PBS.WinFrmUI.Hydro/06-schedule-simulation/01-/02-schedule/ScheduleHelper.cs
文件名从 WinFrmUI/PBS.WinFrmUI.Hydro/06-simulation-drill/01-/02-schedule/ScheduleHelper.cs 修改
@@ -227,8 +227,6 @@
                //杩涘彛姘翠綅
                var inlet_water_level = 0;
                var current_pressure_diff = target_pressure - inlet_water_level +  _sel_opt_pump_pressure_excess;
                current_pressure_diff = Math.Round(current_pressure_diff, 1);
@@ -264,13 +262,13 @@
                return default;
            var total_flow_deviation_ratio = Math.Abs(1 - Math.Abs(total_flow / target_flow));
            if (total_flow_deviation_ratio > _sel_opt_flow_deviation_ratio)
                return default;
            if (total_flow_deviation_ratio > _sel_opt_reasonable_flow_deviation_ratio)
            {
                combine_merit_ratio -= total_flow_deviation_ratio;
            }
            //var total_flow_deviation_ratio = Math.Abs(1 - Math.Abs(total_flow / target_flow));
            //if (total_flow_deviation_ratio > _sel_opt_flow_deviation_ratio)
            //    return default;
            //if (total_flow_deviation_ratio > _sel_opt_reasonable_flow_deviation_ratio)
            //{
            //    combine_merit_ratio -= total_flow_deviation_ratio;
            //}
            double eff = 0, wp = 0, uwp = 0;
            wp =  Yw.Pump.CalculationHelper.CalcuWP(total_power, total_flow);