diff --git a/src/Mod/Fem/femsolver/calculix/tasks.py b/src/Mod/Fem/femsolver/calculix/tasks.py index d20bc6e158..ea99c1a347 100644 --- a/src/Mod/Fem/femsolver/calculix/tasks.py +++ b/src/Mod/Fem/femsolver/calculix/tasks.py @@ -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!") diff --git a/src/Mod/Fem/femsolver/calculix/writer.py b/src/Mod/Fem/femsolver/calculix/writer.py index e338c2aecb..6f9d365a86 100644 --- a/src/Mod/Fem/femsolver/calculix/writer.py +++ b/src/Mod/Fem/femsolver/calculix/writer.py @@ -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( diff --git a/src/Mod/Fem/femsolver/elmer/tasks.py b/src/Mod/Fem/femsolver/elmer/tasks.py index cd5c5e33b6..b56792fa17 100644 --- a/src/Mod/Fem/femsolver/elmer/tasks.py +++ b/src/Mod/Fem/femsolver/elmer/tasks.py @@ -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)) diff --git a/src/Mod/Fem/femsolver/elmer/writer.py b/src/Mod/Fem/femsolver/elmer/writer.py index b8138d95a4..ae2120886c 100644 --- a/src/Mod/Fem/femsolver/elmer/writer.py +++ b/src/Mod/Fem/femsolver/elmer/writer.py @@ -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() diff --git a/src/Mod/Fem/femsolver/z88/tasks.py b/src/Mod/Fem/femsolver/z88/tasks.py index 774e994a43..e931c4d5bc 100644 --- a/src/Mod/Fem/femsolver/z88/tasks.py +++ b/src/Mod/Fem/femsolver/z88/tasks.py @@ -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!") diff --git a/src/Mod/Fem/femsolver/z88/writer.py b/src/Mod/Fem/femsolver/z88/writer.py index 7d145fa115..873ecfc6da 100644 --- a/src/Mod/Fem/femsolver/z88/writer.py +++ b/src/Mod/Fem/femsolver/z88/writer.py @@ -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: diff --git a/src/Mod/Fem/femtools/ccxtools.py b/src/Mod/Fem/femtools/ccxtools.py index 06e3f950e2..7f262bfa85 100644 --- a/src/Mod/Fem/femtools/ccxtools.py +++ b/src/Mod/Fem/femtools/ccxtools.py @@ -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"