删掉不应该有的判断代码

Signed-off-by: facat <facat@facat.com>
This commit is contained in:
facat 2020-04-18 19:51:28 +08:00
parent c84261e24e
commit d4429e589f
1 changed files with 8 additions and 24 deletions

32
core.cs
View File

@ -83,29 +83,12 @@ namespace conductortension
//张力=T6
//计算最大使用张力
double ZuiDaShiYongZhangLi; //最大使用张力=计算拉断力*保证破断张力取计算拉断力的/安全系数
ZuiDaShiYongZhangLi = inPut.LaDuanLi * inPut.BaoZhengPoDuanZhangLiXiShu / 100 / inPut.AnQuan;
ZuiDaShiYongZhangLi = inPut.EDingLaDuanLi * inPut.BaoZhengPoDuanZhangLiXiShu / 100 / inPut.AnQuan;
//ZuiDaShiYongZhangLi = inPut.LaDuanLi / inPut.AnQuan;
//计算温度线膨胀系数
double XianPengZhang = inPut.XianPengZhang;
//计算平均运行张力
//先判断年平均运行张力(%)是否为百分数,如果是百分数则变为小数计算。
if (inPut.NianPingJun > 100 || inPut.NianPingJun <= 0)
{
return false;
}
else if (inPut.NianPingJun >= 1)
{
inPut.NianPingJun = inPut.NianPingJun / 100;
}
double PingJunYunXingZhangLi = inPut.LaDuanLi * inPut.BaoZhengPoDuanZhangLiXiShu / 100 * inPut.NianPingJun;///////////////////////////////////////////////////////////////////////年平均是20%还是0.2,这里要求的是小数
if (inPut.SheJiFengSuGaoDu == 0)
{
inPut.SheJiFengSuGaoDu = 10;
}
if (inPut.PingJunGaoDu == 0)
{
inPut.PingJunGaoDu = 20;//TODO:需要依据电压等级选择
}
double PingJunYunXingZhangLi = inPut.EDingLaDuanLi * inPut.BaoZhengPoDuanZhangLiXiShu / 100 * inPut.NianPingJunXishu/100;//年平均单位是%
//double a, b, T1, T2, T3, T4, T5, T6;
//计算待求工况比载
double DaiHeZai = 0; //待求工况比载
@ -219,7 +202,8 @@ namespace conductortension
default:
break;
}
//TODO: 目前不会进入这个判断 by 杜孟远 2020.4.18
//TODO: 目前不进入这个判断 by 杜孟远 2020.4.18
MaxFxConditionFlag[t_dangju] = MaxFxConditionFlag[t_dangju - 1];//TODO: 以后删掉这句 by 杜孟远 2020.4.18
if (MaxFxConditionFlag[t_dangju] != MaxFxConditionFlag[t_dangju - 1])//有突变,找到了临界档距的范围
{
double criticalSpan;
@ -255,10 +239,10 @@ namespace conductortension
double t2 = 24 * inPut.XianPengZhang * (formerTemperature - currentTemperature);
double t3 = Math.Pow(formerLoad / formerTension, 2) - Math.Pow(currentLoad / currentTension, 2);
criticalSpan = Math.Sqrt((t1 + t2) / t3);//TODO:暂时不用
Console.WriteLine("{0}", criticalSpan);
//Console.WriteLine("{0}", criticalSpan);
}
double start_tension = inPut.LaDuanLi / inPut.AnQuan;
double start_tension = inPut.EDingLaDuanLi / inPut.AnQuan;
ZhangLi = tensionFrmoStateEquation(start_tension,inPut.MoLiang, inPut.XianPengZhang, inPut.JieMianJi, currentLoad, currentTension, currentTemperature, DaiHeZai, inPut.DaiWen, inPut.DangJu);
}
@ -269,13 +253,13 @@ namespace conductortension
public struct calStressLoadNew
{
public double WaiJing; //电线外径mm
public double LaDuanLi; //电线计算拉断力N
public double EDingLaDuanLi; //电线计算拉断力N
public double ZhongLiang; //电线单位重量kg/km
public double JieMianJi; //电线截面积mm2
public double MoLiang; //电线弹性模量N/mm2
public double XianPengZhang; //电线线性膨胀系数10e-6/C
public double AnQuan; //安全系数
public double NianPingJun; //年平均运行系数
public double NianPingJunXishu; //年平均运行系数
//public double XinXian; //新线系数
//public double FuBingGuoZai; //覆冰过载系数
public double DiBing; //最低温工况覆冰mm