FEM: code formating

This commit is contained in:
Bernd Hahnebach
2021-07-05 13:06:21 +02:00
parent 20a2ee5732
commit fb8c6f7abe
2 changed files with 18 additions and 16 deletions

View File

@@ -1662,13 +1662,13 @@ class FemInputWriterCcx(writerbase.FemInputWriter):
ccx_elset["ccx_mat_name"] = mat_obj.Material["Name"]
self.ccx_elsets.append(ccx_elset)
def is_DENSITY_card_needed(self):
def is_density_needed(self):
if self.analysis_type == "frequency":
return True
if self.selfweight_objects:
return True
if self.analysis_type == "thermomech" and not self.solver_obj.ThermoMechSteadyState:
return True
if self.selfweight_objects:
return True
return False
def write_materials(self, f):
@@ -1676,7 +1676,7 @@ class FemInputWriterCcx(writerbase.FemInputWriter):
f.write("** Materials\n")
f.write("** written by {} function\n".format(sys._getframe().f_code.co_name))
f.write("** Young\'s modulus unit is MPa = N/mm2\n")
if self.is_DENSITY_card_needed() is True:
if self.is_density_needed() is True:
f.write("** Density\'s unit is t/mm^3\n")
if self.analysis_type == "thermomech":
f.write("** Thermal conductivity unit is kW/mm/K = t*mm/K*s^3\n")
@@ -1692,7 +1692,7 @@ class FemInputWriterCcx(writerbase.FemInputWriter):
YM = FreeCAD.Units.Quantity(mat_obj.Material["YoungsModulus"])
YM_in_MPa = float(YM.getValueAs("MPa"))
PR = float(mat_obj.Material["PoissonRatio"])
if self.is_DENSITY_card_needed() is True:
if self.is_density_needed() is True:
density = FreeCAD.Units.Quantity(mat_obj.Material["Density"])
density_in_tonne_per_mm3 = float(density.getValueAs("t/mm^3"))
if self.analysis_type == "thermomech":
@@ -1717,7 +1717,7 @@ class FemInputWriterCcx(writerbase.FemInputWriter):
f.write("*ELASTIC\n")
f.write("{0:.0f}, {1:.3f}\n".format(YM_in_MPa, PR))
if self.is_DENSITY_card_needed() is True:
if self.is_density_needed() is True:
f.write("*DENSITY\n")
f.write("{0:.3e}\n".format(density_in_tonne_per_mm3))
if self.analysis_type == "thermomech":