FEM: Avoid dictionary.keys() where possible

This commit is contained in:
Roy-043
2023-08-09 09:18:26 +02:00
committed by wwmayer
parent 2c5a4b71eb
commit efda96b933
7 changed files with 11 additions and 11 deletions

View File

@@ -716,7 +716,7 @@ def read_frd_result(
"""
print("---- End of Section --> Mode_Results may be changed ----")
for key in sorted(mode_results.keys()):
for key in sorted(mode_results):
if key is "number" or key is "time":
print(key + " --> " + str(mode_results[key]))
else:
@@ -735,7 +735,7 @@ def read_frd_result(
"""
print("\n\n----Append mode_results to results")
print(line)
for key in sorted(mode_results.keys()):
for key in sorted(mode_results):
if key is "number" or key is "time":
print(key + " --> " + str(mode_results[key]))
else:

View File

@@ -356,7 +356,7 @@ def fill_femresult_mechanical(
if "disp" in result_set:
disp = result_set["disp"]
res_obj.DisplacementVectors = list(map((lambda x: x), disp.values()))
res_obj.NodeNumbers = list(disp.keys())
res_obj.NodeNumbers = list(disp)
# fill res_obj.NodeStressXX etc if they exist in result_set
# list values are just added
@@ -458,7 +458,7 @@ def fill_femresult_mechanical(
res_obj.MassFlowRate = list(map((lambda x: x), MassFlow.values()))
res_obj.Time = step_time
# disp does not exist, res_obj.NodeNumbers needs to be set
res_obj.NodeNumbers = list(MassFlow.keys())
res_obj.NodeNumbers = list(MassFlow)
# fill res_obj.NetworkPressure, disp does not exist, see MassFlow
if "npressure" in result_set:

View File

@@ -651,7 +651,7 @@ class GmshTools():
# we use the element name of FreeCAD which starts
# with 1 (example: "Face1"), same as Gmsh
# for unit test we need them to have a fixed order
for group in sorted(self.group_elements.keys()):
for group in sorted(self.group_elements):
gdata = self.group_elements[group]
# print(gdata)
# geo.write("// " + group + "\n")

View File

@@ -518,7 +518,7 @@ def get_femelement_sets(
# get remaining femelements for the fem_objects
if has_remaining_femelements:
femelement_table_array = np.zeros_like(referenced_femelements)
femelement_table_array[list(femelement_table.keys())] = 1
femelement_table_array[list(femelement_table)] = 1
remaining_femelements_array = femelement_table_array > referenced_femelements
remaining_femelements = [
i.item() for i in np.nditer(remaining_femelements_array.nonzero())

View File

@@ -305,7 +305,7 @@ class _Writer(object):
self._stream.write(_SECTION_DELIM)
def _writeSectionBody(self, s):
for key in sorted(s.keys()): # def keys() from class sifio.Section is called
for key in sorted(s): # def keys() from class sifio.Section is called
self._writeAttribute(key, s[key])
def _writeAttribute(self, key, data):

View File

@@ -750,13 +750,13 @@ class _TaskPanel:
card_name_list = [] # [ [card_name, card_path, icon_path], ... ]
if sort_by_resources is True:
for a_path in sorted(self.materials.keys()):
for a_path in sorted(self.materials):
card_name_list.append([self.cards[a_path], a_path, self.icons[a_path]])
else:
card_names_tmp = {}
for path, name in self.cards.items():
card_names_tmp[name] = path
for a_name in sorted(card_names_tmp.keys()):
for a_name in sorted(card_names_tmp):
a_path = card_names_tmp[a_name]
card_name_list.append([a_name, a_path, self.icons[a_path]])

View File

@@ -410,13 +410,13 @@ class _TaskPanel:
card_name_list = [] # [ [card_name, card_path, icon_path], ... ]
if sort_by_resources is True:
for a_path in sorted(self.materials.keys()):
for a_path in sorted(self.materials):
card_name_list.append([self.cards[a_path], a_path, self.icons[a_path]])
else:
card_names_tmp = {}
for path, name in self.cards.items():
card_names_tmp[name] = path
for a_name in sorted(card_names_tmp.keys()):
for a_name in sorted(card_names_tmp):
a_path = card_names_tmp[a_name]
card_name_list.append([a_name, a_path, self.icons[a_path]])