kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

FEM: 1DFlow, delete not needed files and code formating

Browse Source
This commit is contained in:
Bernd Hahnebach
2017-06-26 21:26:46 +01:00
committed by wmayer
parent 9fd673851c
commit d0aefe42bb
3 changed files with 3 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Mod/Fem/TestFem.py
View File

@@ -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")

27
src/Mod/Fem/test_files/ccx/Flow1D_points.csv
View File

@@ -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
1 1 0 1.11E-14 50
2 2 0 -1.11E-14 -50
3 3 0 -9.55E-13 -4300
4 4 4950 -9.54792E-13 -4300
5 5 5000 -9.54792E-13 -4300
6 6 8535.53 -1.73984E-12 -7835.53
7 7 8569.88 -1.75E-12 -7870.88
8 8 12105.41 -2.53273E-12 -11406.41
9 9 12140.76 -2.54058E-12 -11441.76
10 10 13908.53 -2.9331E-12 -13209.53
11 11 13943.88 -2.94095E-12 -13244.88
12 12 15046.97 -3.18589E-12 -14347.97
13 13 15046.97 -1.7648E-12 -7947.97
14 14 15046.97 -1.74E-12 -7847.97
15 15 0 0 0
16 16 0 -4.82947E-13 -2175
17 17 2475 -9.54792E-13 -4300
18 18 4975 -9.54792E-13 -4300
19 19 6767.765 -1.34731E-12 -6067.765
20 20 8552.705 -1.74376E-12 -7853.205
21 21 10337.645 -2.14021E-12 -9638.645
22 22 12123.085 -2.53666E-12 -11424.085
23 23 13024.645 -2.73684E-12 -12325.645
24 24 13926.205 -2.93703E-12 -13227.205
25 25 14495.425 -3.06342E-12 -13796.425
26 26 15046.97 -2.47535E-12 -11147.97
27 27 15046.97 -1.75E-12 -7897.97

13
src/Mod/Fem/test_files/ccx/Flow1D_volumes.csv
View File

@@ -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
1 1 0 15 2
2 2 2 16 3
3 3 3 17 4
4 4 4 18 5
5 5 5 19 6
6 6 6 20 7
7 7 7 21 8
8 8 8 22 9
9 9 9 23 10
10 10 10 24 11
11 11 11 25 12
12 12 12 26 13
13 13 13 27 0