diff --git a/src/Mod/Fem/TestFem.py b/src/Mod/Fem/TestFem.py index b5011367b7..67cd67c6dd 100644 --- a/src/Mod/Fem/TestFem.py +++ b/src/Mod/Fem/TestFem.py @@ -64,6 +64,7 @@ Flow1D_thermomech_save_fc_file = Flow1D_thermomech_analysis_dir + '/' + Flow1D_t Flow1D_thermomech_analysis_inp_file = test_file_dir + '/' + Flow1D_thermomech_base_name + '.inp' Flow1D_thermomech_expected_values = test_file_dir + "/Flow1D_thermomech_expected_values" + class FemTest(unittest.TestCase): def setUp(self): try: @@ -441,7 +442,7 @@ class FemCcxAnalysisTest(unittest.TestCase): p26 = FreeCAD.Vector(15046.97, -2.4753465943661e-12, -11147.97) p27 = FreeCAD.Vector(15046.97, -1.75370162835975e-12, -7897.97) points = [p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, p20, p21, p22, p23, p24, p25, p26, p27] - line = Draft.makeWire(points,closed=False,face=False,support=None) + line = Draft.makeWire(points, closed=False, face=False, support=None) fcc_print('Checking FEM new analysis...') analysis = ObjectsFem.makeAnalysis('Analysis') self.assertTrue(analysis, "FemTest of new analysis failed") @@ -576,7 +577,7 @@ class FemCcxAnalysisTest(unittest.TestCase): PyObjects._FemElementFluid1D._FemElementFluid1D(Flow1d_gate_valve) Flow1d_gate_valve.SectionType = 'Liquid' Flow1d_gate_valve.LiquidSectionType = 'PIPE GATE VALVE' - Flow1d_gate_valve.GateValvePipeArea = 17671 + Flow1d_gate_valve.GateValvePipeArea = 17671 Flow1d_gate_valve.GateValveClosingCoeff = 0.5 Flow1d_gate_valve.References = [(line, "Edge10")] self.assertTrue(Flow1d_gate_valve, "FemTest of new Flow1D gate valve constraint failed") diff --git a/src/Mod/Fem/test_files/ccx/Flow1D_points.csv b/src/Mod/Fem/test_files/ccx/Flow1D_points.csv deleted file mode 100644 index b943838670..0000000000 --- a/src/Mod/Fem/test_files/ccx/Flow1D_points.csv +++ /dev/null @@ -1,27 +0,0 @@ -1,0,1.11E-14,50 -2,0,-1.11E-14,-50 -3,0,-9.55E-13,-4300 -4,4950,-9.54792E-13,-4300 -5,5000,-9.54792E-13,-4300 -6,8535.53,-1.73984E-12,-7835.53 -7,8569.88,-1.75E-12,-7870.88 -8,12105.41,-2.53273E-12,-11406.41 -9,12140.76,-2.54058E-12,-11441.76 -10,13908.53,-2.9331E-12,-13209.53 -11,13943.88,-2.94095E-12,-13244.88 -12,15046.97,-3.18589E-12,-14347.97 -13,15046.97,-1.7648E-12,-7947.97 -14,15046.97,-1.74E-12,-7847.97 -15,0,0,0 -16,0,-4.82947E-13,-2175 -17,2475,-9.54792E-13,-4300 -18,4975,-9.54792E-13,-4300 -19,6767.765,-1.34731E-12,-6067.765 -20,8552.705,-1.74376E-12,-7853.205 -21,10337.645,-2.14021E-12,-9638.645 -22,12123.085,-2.53666E-12,-11424.085 -23,13024.645,-2.73684E-12,-12325.645 -24,13926.205,-2.93703E-12,-13227.205 -25,14495.425,-3.06342E-12,-13796.425 -26,15046.97,-2.47535E-12,-11147.97 -27,15046.97,-1.75E-12,-7897.97 diff --git a/src/Mod/Fem/test_files/ccx/Flow1D_volumes.csv b/src/Mod/Fem/test_files/ccx/Flow1D_volumes.csv deleted file mode 100644 index 76360a7bf8..0000000000 --- a/src/Mod/Fem/test_files/ccx/Flow1D_volumes.csv +++ /dev/null @@ -1,13 +0,0 @@ -1,0,15,2 -2,2,16,3 -3,3,17,4 -4,4,18,5 -5,5,19,6 -6,6,20,7 -7,7,21,8 -8,8,22,9 -9,9,23,10 -10,10,24,11 -11,11,25,12 -12,12,26,13 -13,13,27,0