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

[FEM] speed up get_femelement_sets in meshtools.py

Browse Source 
The previous implementation was quite slow in filling up the remaining_femelements list.
The new implementation fixes this by using numpy for the heavy work.
This commit is contained in:
Philipp Knechtges
2021-04-25 00:15:48 +02:00
committed by Uwe
parent 2edfc6abf4
commit 2e2f45f1fe
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Mod/Fem/femmesh/meshtools.py
View File

@@ -30,7 +30,7 @@ __url__ = "https://www.freecadweb.org"
import FreeCAD
from femtools import geomtools
import numpy as np
# ************************************************************************************************
def get_femnodes_by_femobj_with_references(
@@ -485,7 +485,7 @@ def get_femelement_sets(
# fem_objects = FreeCAD FEM document objects
# get femelements for reference shapes of each obj.References
count_femelements = 0
referenced_femelements = []
referenced_femelements = np.zeros((max(femelement_table.keys())+1,),dtype=np.int)
has_remaining_femelements = None
for fem_object_i, fem_object in enumerate(fem_objects):
obj = fem_object["Object"]
@@ -503,17 +503,19 @@ def get_femelement_sets(
obj.References,
femnodes_ele_table
)
referenced_femelements += ref_shape_femelements
ref_shape_femelements_array = np.zeros_like(referenced_femelements)
ref_shape_femelements_array[ref_shape_femelements] = 1
referenced_femelements += ref_shape_femelements_array
count_femelements += len(ref_shape_femelements)
fem_object["FEMElements"] = ref_shape_femelements
else:
has_remaining_femelements = obj.Name
# get remaining femelements for the fem_objects
if has_remaining_femelements:
remaining_femelements = []
for elemid in femelement_table:
if elemid not in referenced_femelements:
remaining_femelements.append(elemid)
femelement_table_array = np.zeros_like(referenced_femelements)
femelement_table_array[list(femelement_table.keys())] = 1
remaining_femelements_array = femelement_table_array > referenced_femelements
remaining_femelements = [ i.item() for i in np.nditer(remaining_femelements_array.nonzero()) ]
count_femelements += len(remaining_femelements)
for fem_object in fem_objects:
obj = fem_object["Object"]