diff --git a/src/Mod/Fem/TestFem.py b/src/Mod/Fem/TestFem.py index 67cd67c6dd..a5e1763b80 100644 --- a/src/Mod/Fem/TestFem.py +++ b/src/Mod/Fem/TestFem.py @@ -590,7 +590,7 @@ class FemCcxAnalysisTest(unittest.TestCase): Flow1d_enlargement1.SectionType = 'Liquid' Flow1d_enlargement1.LiquidSectionType = 'PIPE ENLARGEMENT' Flow1d_enlargement1.EnlargeArea1 = 17671 - Flow1d_enlargement1.EnlargeArea2 = 1000000000000 + Flow1d_enlargement1.EnlargeArea2 = 1e12 Flow1d_enlargement1.References = [(line, "Edge12")] self.assertTrue(Flow1d_enlargement1, "FemTest of new Flow1D enlargement constraint failed") analysis.Member = analysis.Member + [Flow1d_enlargement1] diff --git a/src/Mod/Fem/test_files/ccx/Flow1D_mesh.py b/src/Mod/Fem/test_files/ccx/Flow1D_mesh.py index 1b2d858499..cdd520608c 100644 --- a/src/Mod/Fem/test_files/ccx/Flow1D_mesh.py +++ b/src/Mod/Fem/test_files/ccx/Flow1D_mesh.py @@ -1,33 +1,33 @@ def create_nodes_Flow1D(femmesh): # nodes - femmesh.addNode(0, 1.11022302462516e-14, 50, 1) - femmesh.addNode(0, -1.11022302462516e-14, -50, 2) - femmesh.addNode(0, -9.54791801177633e-13, -4300, 3) - femmesh.addNode(4950, -9.54791801177633e-13, -4300, 4) - femmesh.addNode(5000, -9.54791801177633e-13, -4300, 5) - femmesh.addNode(8535.53, -1.73983716322823e-12, -7835.53, 6) - femmesh.addNode(8569.88, -1.74768644001233e-12, -7870.88, 7) - femmesh.addNode(12105.41, -2.53273180206292e-12, -11406.41, 8) - femmesh.addNode(12140.76, -2.54058107884702e-12, -11441.76, 9) - femmesh.addNode(13908.53, -2.93310487009534e-12, -13209.53, 10) - femmesh.addNode(13943.88, -2.94095414687944e-12, -13244.88, 11) - femmesh.addNode(15046.97, -3.1858893301262e-12, -14347.97, 12) - femmesh.addNode(15046.97, -1.764803858606e-12, -7947.97, 13) - femmesh.addNode(15046.97, -1.742599398113e-12, -7847.97, 14) + femmesh.addNode(0, 0, 50, 1) + femmesh.addNode(0, 0, -50, 2) + femmesh.addNode(0, 0, -4300, 3) + femmesh.addNode(4950, 0, -4300, 4) + femmesh.addNode(5000, 0, -4300, 5) + femmesh.addNode(8535.53, 0, -7835.53, 6) + femmesh.addNode(8569.88, 0, -7870.88, 7) + femmesh.addNode(12105.41, 0, -11406.41, 8) + femmesh.addNode(12140.76, 0, -11441.76, 9) + femmesh.addNode(13908.53, 0, -13209.53, 10) + femmesh.addNode(13943.88, 0, -13244.88, 11) + femmesh.addNode(15046.97, 0, -14347.97, 12) + femmesh.addNode(15046.97, 0, -7947.97, 13) + femmesh.addNode(15046.97, 0, -7847.97, 14) femmesh.addNode(0, 0, 0, 15) - femmesh.addNode(0, -4.82947015711942e-13, -2175, 16) - femmesh.addNode(2475, -9.54791801177633e-13, -4300, 17) - femmesh.addNode(4975, -9.54791801177633e-13, -4300, 18) - femmesh.addNode(6767.765, -1.34731448220293e-12, -6067.765, 19) - femmesh.addNode(8552.705, -1.74376180162028e-12, -7853.205, 20) - femmesh.addNode(10337.645, -2.14020912103763e-12, -9638.645, 21) - femmesh.addNode(12123.085, -2.53665644045497e-12, -11424.085, 22) - femmesh.addNode(13024.645, -2.73684297447118e-12, -12325.645, 23) - femmesh.addNode(13926.205, -2.93702950848739e-12, -13227.205, 24) - femmesh.addNode(14495.425, -3.06342173850282e-12, -13796.425, 25) - femmesh.addNode(15046.97, -2.4753465943661e-12, -11147.97, 26) - femmesh.addNode(15046.97, -1.75370162835975e-12, -7897.97, 27) - femmesh.addNode(15046.97, -1.75370162835975e-12, -7897.97, 28) + femmesh.addNode(0, 0, -2175, 16) + femmesh.addNode(2475, 0, -4300, 17) + femmesh.addNode(4975, 0, -4300, 18) + femmesh.addNode(6767.765, 0, -6067.765, 19) + femmesh.addNode(8552.705, 0, -7853.205, 20) + femmesh.addNode(10337.645, 0, -9638.645, 21) + femmesh.addNode(12123.085, 0, -11424.085, 22) + femmesh.addNode(13024.645, 0, -12325.645, 23) + femmesh.addNode(13926.205, 0, -13227.205, 24) + femmesh.addNode(14495.425, 0, -13796.425, 25) + femmesh.addNode(15046.97, 0, -11147.97, 26) + femmesh.addNode(15046.97, 0, -7897.97, 27) + femmesh.addNode(15046.97, 0, -7897.97, 28) return True diff --git a/src/Mod/Fem/test_files/ccx/Flow1D_thermomech.inp b/src/Mod/Fem/test_files/ccx/Flow1D_thermomech.inp index 2d2881cd54..a29eae28a2 100644 --- a/src/Mod/Fem/test_files/ccx/Flow1D_thermomech.inp +++ b/src/Mod/Fem/test_files/ccx/Flow1D_thermomech.inp @@ -2,34 +2,34 @@ ** Nodes *Node, NSET=Nall -1, 0, 1.110223024625e-14, 50 -2, 0, -1.110223024625e-14, -50 -3, 0, -9.547918011776e-13, -4300 -4, 4950, -9.547918011776e-13, -4300 -5, 5000, -9.547918011776e-13, -4300 -6, 8535.53, -1.739837163228e-12, -7835.53 -7, 8569.88, -1.747686440012e-12, -7870.88 -8, 12105.41, -2.532731802063e-12, -11406.41 -9, 12140.76, -2.540581078847e-12, -11441.76 -10, 13908.53, -2.933104870095e-12, -13209.53 -11, 13943.88, -2.940954146879e-12, -13244.88 -12, 15046.97, -3.185889330126e-12, -14347.97 -13, 15046.97, -1.764803858606e-12, -7947.97 -14, 15046.97, -1.742599398113e-12, -7847.97 +1, 0, 0, 50 +2, 0, 0, -50 +3, 0, 0, -4300 +4, 4950, 0, -4300 +5, 5000, 0, -4300 +6, 8535.53, 0, -7835.53 +7, 8569.88, 0, -7870.88 +8, 12105.41, 0, -11406.41 +9, 12140.76, 0, -11441.76 +10, 13908.53, 0, -13209.53 +11, 13943.88, 0, -13244.88 +12, 15046.97, 0, -14347.97 +13, 15046.97, 0, -7947.97 +14, 15046.97, 0, -7847.97 15, 0, 0, 0 -16, 0, -4.829470157119e-13, -2175 -17, 2475, -9.547918011776e-13, -4300 -18, 4975, -9.547918011776e-13, -4300 -19, 6767.765, -1.347314482203e-12, -6067.765 -20, 8552.705, -1.74376180162e-12, -7853.205 -21, 10337.645, -2.140209121038e-12, -9638.645 -22, 12123.085, -2.536656440455e-12, -11424.085 -23, 13024.645, -2.736842974471e-12, -12325.645 -24, 13926.205, -2.937029508487e-12, -13227.205 -25, 14495.425, -3.063421738503e-12, -13796.425 -26, 15046.97, -2.475346594366e-12, -11147.97 -27, 15046.97, -1.75370162836e-12, -7897.97 -28, 15046.97, -1.75370162836e-12, -7897.97 +16, 0, 0, -2175 +17, 2475, 0, -4300 +18, 4975, 0, -4300 +19, 6767.765, 0, -6067.765 +20, 8552.705, 0, -7853.205 +21, 10337.645, 0, -9638.645 +22, 12123.085, 0, -11424.085 +23, 13024.645, 0, -12325.645 +24, 13926.205, 0, -13227.205 +25, 14495.425, 0, -13796.425 +26, 15046.97, 0, -11147.97 +27, 15046.97, 0, -7897.97 +28, 15046.97, 0, -7897.97 ** Edge elements