冲突

ningshuxia

2022-08-19 153da1eef16b51d75442779a3964a1c5413132e4

 Calculation/IStation.EtaCalculation4Custom/base/station/EtaAnalyCalculatorBase4Station.cs

@@ -260,7 +260,8 @@
                    //计算效率
                    double eta = Math.Round(Model.EtaSingleRealRecordPure.Calc_Eta(result_pipe.Qa.Value, result_pipe.Ha.Value, result_pipe.Pa.Value, WaterDensity, g), 1);
                    result_pipe.Ea = eta;

                    result_pipe.UWPa = 0;
                    result_pipe.WPa = 0;
                    // 检查效率
                    if (eta > 98)
                    {//有时, 大流量曲线部分,是曲线不精确, 造成Q H曲线不符合实际, 造成效率计算出问题                 
@@ -271,8 +272,7 @@
                    {//计算 
                        if (result_pipe.AnalyStatus == Model.Eta.eAnalyStatus.Unkonw)
                            result_pipe.AnalyStatus = Model.Eta.eAnalyStatus.Normal;
                        result_pipe.Calcu_WP();
                        result_pipe.Calcu_UWP();
                        result_pipe.CalcUnitPower(); 
                    }
                }
                else
@@ -1047,14 +1047,12 @@



            ana_result.Calcu_WP();
            ana_result.CalcUnitPower();

            context_pump.Ana_eta_ok = false;

            if (total_power > 1 && context_pump.Ana_power_ok && context_pump.Ana_head_ok && context_pump.Ana_flow_ok)
            {
                ana_result.Calcu_UWP();

            { 
                //计算效率
                double eta = Math.Round(Model.EtaSingleRealRecordPure.Calc_Eta(total_flow, total_head, total_power, WaterDensity, g), 1);
                ana_result.Ea = eta;
@@ -1266,15 +1264,13 @@



            ana_result.Calcu_WP();
            ana_result.CalcUnitPower();

            context_pump.Ana_eta_ok = false;

            if (total_power > 1 && total_flow > 1 &&
                context_pump.Ana_head_ok && context_pump.Ana_power_ok)
            {
                ana_result.Calcu_UWP();

            { 
                //计算效率
                double eta = Math.Round(Model.EtaSingleRealRecordPure.Calc_Eta(total_flow, total_head, total_power, WaterDensity, g), 1);

@@ -1449,15 +1445,13 @@



            ana_result.Calcu_WP();
            ana_result.CalcUnitPower();


            pump.Ana_eta_ok = false;

            if (total_power > 1 && pump_flow > 1 && pump.Ana_head_ok)
            {
                ana_result.Calcu_UWP();

            { 
                //计算效率
                double eta = Math.Round(Model.EtaSingleRealRecordPure.Calc_Eta(pump_flow, total_head, total_power, WaterDensity, g), 1);
                ana_result.Ea = eta;
@@ -1663,14 +1657,12 @@



            ana_result.Calcu_WP();
            ana_result.CalcUnitPower();

            pump.Ana_eta_ok = false;

            if (total_power > 1 && pump.Ana_flow_ok && pump.Ana_head_ok && pump.Ana_power_ok)
            {
                ana_result.Calcu_UWP();

            { 
                //计算效率
                double eta = Math.Round(Model.EtaSingleRealRecordPure.Calc_Eta(averge_flow, total_head, total_power, WaterDensity, g), 1);
                ana_result.Ea = eta;
@@ -1875,13 +1867,12 @@



            ana_result.Calcu_WP();
            ana_result.CalcUnitPower();

            pump.Ana_eta_ok = false;

            if (total_power > 1 && pump.Ana_flow_ok && pump.Ana_head_ok && pump.Ana_power_ok)
            {
                ana_result.Calcu_UWP();
            { 

                //计算效率
                double eta = Math.Round(Model.EtaSingleRealRecordPure.Calc_Eta(averge_flow, total_head, total_power, WaterDensity, g), 1);
@@ -1978,7 +1969,8 @@
                    var ana_result = open_pump_result_list[i].AnaResult;

                    ana_result.Qa = Math.Round(ana_result.Qa.Value * monitor_value_total_flow / ana_total_flow, 1);

                    ana_result.UWPa = 0;
                    ana_result.WPa = 0;
                    if (ana_result.Pa != null && ana_result.Pa > 1)
                    {
                        double eta = Math.Round(Model.EtaSingleRealRecordPure.Calc_Eta(ana_result.Qa.Value, ana_result.Ha.Value, ana_result.Pa.Value, WaterDensity, g), 1);
@@ -1994,8 +1986,7 @@
                        {//计算 
                            if (ana_result.AnalyStatus == Model.Eta.eAnalyStatus.Unkonw)
                                ana_result.AnalyStatus = Model.Eta.eAnalyStatus.Normal;
                            ana_result.Calcu_WP();
                            ana_result.Calcu_UWP();
                            ana_result.CalcUnitPower(); 
                        }
                    }
                }