Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Inp writer speed up #105

Closed
wants to merge 6 commits into from
Closed

Inp writer speed up #105

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6fa50ff
FEM frd import mesh - added HEX20, PENTA6, PENTA15
fandaL Nov 28, 2015
62f630b
Revert "FEM frd import mesh - added HEX20, PENTA6, PENTA15"
fandaL Nov 28, 2015
6313ac1
Merge branch 'master' of https://github.com/FreeCAD/FreeCAD
fandaL Nov 28, 2015
f49c86f
Merge branch 'master' of https://github.com/FreeCAD/FreeCAD
fandaL Feb 20, 2016
06832b5
FEM: ccxInpWriter copy Nodes dict
fandaL Feb 21, 2016
9e2ef5f
FEM: ccxInpWriter Nodes_copy renamed to mesh_nodes
fandaL Feb 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 16 additions & 14 deletions src/Mod/Fem/ccxInpWriter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -835,14 +835,15 @@ def get_refedge_node_lengths(self, edge_table):
# [ (nodeID, length), ... , (nodeID, length) ] some nodes will have more than one entry
node_length_table = []
mesh_edge_length = 0
mesh_nodes = self.mesh_object.FemMesh.Nodes
# print(len(edge_table))
for me in edge_table:
if len(edge_table[me]) == 2: # 2 node mesh edge
# end_node_length = mesh_edge_length / 2
# ______
# P1 P2
P1 = self.mesh_object.FemMesh.Nodes[edge_table[me][0]]
P2 = self.mesh_object.FemMesh.Nodes[edge_table[me][1]]
P1 = mesh_nodes[edge_table[me][0]]
P2 = mesh_nodes[edge_table[me][1]]
edge_vec = P2 - P1
mesh_edge_length = edge_vec.Length
# print(mesh_edge_length)
Expand All @@ -855,9 +856,9 @@ def get_refedge_node_lengths(self, edge_table):
# middle_node_length = mesh_face_area * 2 / 3
# _______ _______
# P1 P3 P2
P1 = self.mesh_object.FemMesh.Nodes[edge_table[me][0]]
P2 = self.mesh_object.FemMesh.Nodes[edge_table[me][1]]
P3 = self.mesh_object.FemMesh.Nodes[edge_table[me][2]]
P1 = mesh_nodes[edge_table[me][0]]
P2 = mesh_nodes[edge_table[me][1]]
P3 = mesh_nodes[edge_table[me][2]]
edge_vec1 = P3 - P1
edge_vec2 = P2 - P3
mesh_edge_length = edge_vec1.Length + edge_vec2.Length
Expand All @@ -879,6 +880,7 @@ def get_ref_face_node_areas(self, face_table):
# [ (nodeID,Area), ... , (nodeID,Area) ] some nodes will have more than one entry
node_area_table = []
mesh_face_area = 0
mesh_nodes = self.mesh_object.FemMesh.Nodes
for mf in face_table:
if len(face_table[mf]) == 3: # 3 node mesh face triangle
# corner_node_area = mesh_face_area / 3.0
Expand All @@ -887,9 +889,9 @@ def get_ref_face_node_areas(self, face_table):
# / \
# /____\
# P1 P2
P1 = self.mesh_object.FemMesh.Nodes[face_table[mf][0]]
P2 = self.mesh_object.FemMesh.Nodes[face_table[mf][1]]
P3 = self.mesh_object.FemMesh.Nodes[face_table[mf][2]]
P1 = mesh_nodes[face_table[mf][0]]
P2 = mesh_nodes[face_table[mf][1]]
P3 = mesh_nodes[face_table[mf][2]]

mesh_face_area = getTriangleArea(P1, P2, P3)
corner_node_area = mesh_face_area / 3.0
Expand All @@ -913,12 +915,12 @@ def get_ref_face_node_areas(self, face_table):
# /t1 \ /t2 \
# /_____\/_____\
# P1 P4 P2
P1 = self.mesh_object.FemMesh.Nodes[face_table[mf][0]]
P2 = self.mesh_object.FemMesh.Nodes[face_table[mf][1]]
P3 = self.mesh_object.FemMesh.Nodes[face_table[mf][2]]
P4 = self.mesh_object.FemMesh.Nodes[face_table[mf][3]]
P5 = self.mesh_object.FemMesh.Nodes[face_table[mf][4]]
P6 = self.mesh_object.FemMesh.Nodes[face_table[mf][5]]
P1 = mesh_nodes[face_table[mf][0]]
P2 = mesh_nodes[face_table[mf][1]]
P3 = mesh_nodes[face_table[mf][2]]
P4 = mesh_nodes[face_table[mf][3]]
P5 = mesh_nodes[face_table[mf][4]]
P6 = mesh_nodes[face_table[mf][5]]

mesh_face_t1_area = getTriangleArea(P1, P4, P6)
mesh_face_t2_area = getTriangleArea(P2, P5, P4)
Expand Down