From f1c85ecf61f31e6570652c05af2fe97ecf17238a Mon Sep 17 00:00:00 2001 From: facat Date: Sun, 19 Apr 2020 21:59:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A6=86=E5=86=B0=E6=B0=B4=E5=B9=B3=E8=8D=B7?= =?UTF-8?q?=E8=BD=BD=E7=9A=84=E5=AF=BC=E7=BA=BF=E4=BD=93=E5=9E=8B=E7=B3=BB?= =?UTF-8?q?=E6=95=B0=E7=94=A8u=E8=A1=A8=E7=A4=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: facat --- Test/CheckAgainstExcelFixture.cs | 4 ++-- core.cs | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Test/CheckAgainstExcelFixture.cs b/Test/CheckAgainstExcelFixture.cs index f380e86..95b990e 100644 --- a/Test/CheckAgainstExcelFixture.cs +++ b/Test/CheckAgainstExcelFixture.cs @@ -50,7 +50,7 @@ namespace Test Assert.AreEqual(cal_value, excel_value, 1); } [Test, Combinatorial] - public void WindTest_D_Variable([Values(10, 17, 18)] double d, [Values(10, 20, 21, 27, 29, 31.5, 32)] double velocity,[Values(0,5,10,,13,15,,18,20,23,25)] double ice)//导线外径和风速、有冰无冰测试变化测试 + public void WindTest_D_Variable([Values(10, 17, 18)] double d, [Values(10, 20, 21, 27, 29, 31.5, 32)] double velocity,[Values(0,3,5,8,10,13,15,18,20,23,25,27,30)] double ice)//导线外径和风速、有冰无冰测试变化测试 { //修改Eecel线径 double org_d; @@ -170,7 +170,7 @@ namespace Test objApp = new Microsoft.Office.Interop.Excel.Application(); objBook = objApp.Application.Workbooks.Add(@"d:\code\conductortension\学习-张力计算(临界档距公式法V20090602)-送电室版-Unittest.xls"); w_sheet = objBook.Sheets["三维平台测试"] as Microsoft.Office.Interop.Excel.Worksheet; - objApp.Visible = true; + //objApp.Visible = true; double E; E = (double)(w_sheet.get_Range("J5", Missing.Value).Value2); double alpha;//膨胀系数 diff --git a/core.cs b/core.cs index 07b364c..443a343 100644 --- a/core.cs +++ b/core.cs @@ -300,7 +300,7 @@ namespace conductortension double ChuiZhiHeZai = 0; //垂直荷载=自重荷载+9.80665*0.9*PI*待求工况覆冰厚度*(待求工况覆冰厚度+导线直径)/1000 double ZiZhongHeZai = 0; //自重荷载=导线单位重量*9.80665/1000/ double bi = 1;//覆冰增大系数B - //导线力学计算不考虑覆冰增大系数 by 杜孟远 20200406 + //导线力学计算不考虑覆冰增大系数 by 杜孟远 2020.04.06 double u;//体型系数 if (inPut.DaiBing > 0 || inPut.WaiJing < 17) @@ -333,8 +333,7 @@ namespace conductortension } else { - //a = 1; // '有冰工况定义风压不均匀系数a=1 - dx3 = 1.2 * Math.Pow(wind_v, 2) * (inPut.WaiJing + 2 * inPut.DaiBing) * a * bi / 1600; // '导线有冰风荷载 + dx3 = u * Math.Pow(wind_v, 2) * (inPut.WaiJing + 2 * inPut.DaiBing) * a * bi / 1600; // '导线有冰风荷载 } HeZai = Math.Sqrt(Math.Pow((ZiZhongHeZai + ChuiZhiHeZai), 2) + Math.Pow(dx3, 2));// '存储导线荷载