FEM: tasks and writer, use generic solver input writing method name

This commit is contained in:
Bernd Hahnebach
2021-07-18 14:36:04 +02:00
parent 21889b16d5
commit 2aeba3674a
7 changed files with 7 additions and 7 deletions

View File

@@ -84,7 +84,7 @@ class Prepare(run.Prepare):
self.directory,
meshdatagetter.mat_geo_sets
)
path = w.write_calculix_input_file()
path = w.write_solver_input()
# report to user if task succeeded
if path != "":
self.pushStatus("Write completed!")

View File

@@ -130,7 +130,7 @@ class FemInputWriterCcx(writerbase.FemInputWriter):
# ********************************************************************************************
# write calculix input
def write_calculix_input_file(self):
def write_solver_input(self):
time_start = time.process_time()
FreeCAD.Console.PrintMessage(

View File

@@ -84,7 +84,7 @@ class Prepare(run.Prepare):
FreeCAD.Console.PrintLog("Machine testmode: {}\n".format(self.testmode))
w = writer.Writer(self.solver, self.directory)
try:
w.write()
w.write_solver_input()
self.checkHandled(w)
except writer.WriteError as e:
self.report.error(str(e))

View File

@@ -79,7 +79,7 @@ class Writer(object):
def getHandledConstraints(self):
return self._handledObjects
def write(self):
def write_solver_input(self):
self._handleRedifinedConstants()
self._handleSimulation()
self._handleHeat()

View File

@@ -61,7 +61,7 @@ class Prepare(run.Prepare):
membertools.AnalysisMember(self.analysis),
self.directory
)
path = w.write_z88_input()
path = w.write_solver_input()
# report to user if task succeeded
if path is not None:
self.pushStatus("Write completed!")

View File

@@ -63,7 +63,7 @@ class FemInputWriterZ88(writerbase.FemInputWriter):
"FemInputWriterZ88 --> self.file_name --> " + self.file_name + "\n"
)
def write_z88_input(self):
def write_solver_input(self):
timestart = time.process_time()
FreeCAD.Console.PrintMessage("Write z88 input files to: {}\n".format(self.dir_name))
if not self.femnodes_mesh:

View File

@@ -391,7 +391,7 @@ class FemToolsCcx(QtCore.QRunnable, QtCore.QObject):
self.working_dir,
meshdatagetter.mat_geo_sets
)
self.inp_file_name = inp_writer.write_calculix_input_file()
self.inp_file_name = inp_writer.write_solver_input()
except Exception:
FreeCAD.Console.PrintError(
"Unexpected error when writing CalculiX input file: {}\n"