diff --git a/src/Mod/Fem/femsolver/calculix/writer.py b/src/Mod/Fem/femsolver/calculix/writer.py index a107bba381..c0bbac96ac 100644 --- a/src/Mod/Fem/femsolver/calculix/writer.py +++ b/src/Mod/Fem/femsolver/calculix/writer.py @@ -85,13 +85,13 @@ class FemInputWriterCcx(FemInputWriter.FemInputWriter): shellthickness_obj, fluidsection_obj, dir_name) - # self.dir_name does have a slash at the end + from os.path import join self.main_file_name = self.mesh_object.Name + '.inp' - self.file_name = self.dir_name + self.main_file_name + self.file_name = join(self.dir_name, self.main_file_name) self.FluidInletoutlet_ele = [] - self.fluid_inout_nodes_file = self.dir_name + self.mesh_object.Name + '_inout_nodes.txt' - FreeCAD.Console.PrintMessage('FemInputWriterCcx --> self.dir_name --> ' + self.dir_name + '\n') - FreeCAD.Console.PrintMessage('FemInputWriterCcx --> self.main_file_name --> ' + self.main_file_name + '\n') + self.fluid_inout_nodes_file = join(self.dir_name, (self.mesh_object.Name + '_inout_nodes.txt')) + FreeCAD.Console.PrintLog('FemInputWriterCcx --> self.dir_name --> ' + self.dir_name + '\n') + FreeCAD.Console.PrintLog('FemInputWriterCcx --> self.main_file_name --> ' + self.main_file_name + '\n') FreeCAD.Console.PrintMessage('FemInputWriterCcx --> self.file_name --> ' + self.file_name + '\n') def write_calculix_input_file(self): diff --git a/src/Mod/Fem/femsolver/writerbase.py b/src/Mod/Fem/femsolver/writerbase.py index be6e6e0be9..0c7150eb53 100644 --- a/src/Mod/Fem/femsolver/writerbase.py +++ b/src/Mod/Fem/femsolver/writerbase.py @@ -80,7 +80,6 @@ class FemInputWriter(): if not dir_name: FreeCAD.Console.PrintError('Error: FemInputWriter has no working_dir --> we are going to make a temporary one!\n') self.dir_name = FreeCAD.ActiveDocument.TransientDir.replace('\\', '/') + '/FemAnl_' + analysis_obj.Uid[-4:] - self.dir_name = os.path.join(self.dir_name, '') # check dir_name has a slash at the end, if not add one if not os.path.isdir(self.dir_name): os.mkdir(self.dir_name) self.fc_ver = FreeCAD.Version() diff --git a/src/Mod/Fem/femsolver/z88/writer.py b/src/Mod/Fem/femsolver/z88/writer.py index 57e5ce68b7..9b5450fbae 100644 --- a/src/Mod/Fem/femsolver/z88/writer.py +++ b/src/Mod/Fem/femsolver/z88/writer.py @@ -81,9 +81,9 @@ class FemInputWriterZ88(FemInputWriter.FemInputWriter): shellthickness_obj, fluidsection_obj, dir_name) - # self.dir_name does have a slash at the end - self.file_name = self.dir_name + 'z88' - FreeCAD.Console.PrintMessage('FemInputWriterZ88 --> self.dir_name --> ' + self.dir_name + '\n') + from os.path import join + self.file_name = join(self.dir_name, 'z88') + FreeCAD.Console.PrintLog('FemInputWriterZ88 --> self.dir_name --> ' + self.dir_name + '\n') FreeCAD.Console.PrintMessage('FemInputWriterZ88 --> self.file_name --> ' + self.file_name + '\n') def write_z88_input(self): diff --git a/src/Mod/Fem/femtest/testccxtools.py b/src/Mod/Fem/femtest/testccxtools.py index cfde7dbd13..18529db277 100644 --- a/src/Mod/Fem/femtest/testccxtools.py +++ b/src/Mod/Fem/femtest/testccxtools.py @@ -127,8 +127,7 @@ class TestCcxTools(unittest.TestCase): fcc_print('Setting up working directory {}'.format(static_analysis_dir)) fea.setup_working_dir(static_analysis_dir) - # setup_working_dir adds an / TODO: fix - self.assertTrue(True if fea.working_dir == static_analysis_dir + '/' else False, + self.assertTrue(True if fea.working_dir == static_analysis_dir else False, "Setting working directory {} failed".format(static_analysis_dir)) fcc_print('Checking FEM inp file prerequisites for static analysis...') @@ -151,8 +150,7 @@ class TestCcxTools(unittest.TestCase): fea.setup_working_dir(self.test_file_dir) fcc_print(fea.working_dir) fcc_print(self.test_file_dir) - # setup_working_dir adds an / TODO: fix - self.assertTrue(True if fea.working_dir == self.test_file_dir + '/' else False, + self.assertTrue(True if fea.working_dir == self.test_file_dir else False, "Setting working directory {} failed".format(self.test_file_dir)) fcc_print('Setting base name to read test {}.frd file...'.format('cube_static')) @@ -341,8 +339,7 @@ class TestCcxTools(unittest.TestCase): fcc_print('Setting up working directory {}'.format(frequency_analysis_dir)) fea.setup_working_dir(frequency_analysis_dir) - # setup_working_dir adds an / TODO: fix - self.assertTrue(True if fea.working_dir == frequency_analysis_dir + '/' else False, + self.assertTrue(True if fea.working_dir == frequency_analysis_dir else False, "Setting working directory {} failed".format(frequency_analysis_dir)) fcc_print('Checking FEM inp file prerequisites for frequency analysis...') @@ -363,8 +360,7 @@ class TestCcxTools(unittest.TestCase): fcc_print('Setting up working directory to {} in order to read simulated calculations'.format(self.test_file_dir)) fea.setup_working_dir(self.test_file_dir) - # setup_working_dir adds an / TODO: fix - self.assertTrue(True if fea.working_dir == self.test_file_dir + '/' else False, + self.assertTrue(True if fea.working_dir == self.test_file_dir else False, "Setting working directory {} failed".format(self.test_file_dir)) fcc_print('Setting base name to read test {}.frd file...'.format(frequency_base_name)) @@ -474,8 +470,7 @@ class TestCcxTools(unittest.TestCase): fcc_print('Setting up working directory {}'.format(thermomech_analysis_dir)) fea.setup_working_dir(thermomech_analysis_dir) - # setup_working_dir adds an / TODO: fix - self.assertTrue(True if fea.working_dir == thermomech_analysis_dir + '/' else False, + self.assertTrue(True if fea.working_dir == thermomech_analysis_dir else False, "Setting working directory {} failed".format(thermomech_analysis_dir)) fcc_print('Checking FEM inp file prerequisites for thermo-mechanical analysis...') @@ -496,8 +491,7 @@ class TestCcxTools(unittest.TestCase): fcc_print('Setting up working directory to {} in order to read simulated calculations'.format(self.test_file_dir)) fea.setup_working_dir(self.test_file_dir) - # setup_working_dir adds an / TODO: fix - self.assertTrue(True if fea.working_dir == self.test_file_dir + '/' else False, + self.assertTrue(True if fea.working_dir == self.test_file_dir else False, "Setting working directory {} failed".format(self.test_file_dir)) fcc_print('Setting base name to read test {}.frd file...'.format('spine_thermomech')) @@ -727,8 +721,7 @@ class TestCcxTools(unittest.TestCase): fcc_print('Setting up working directory {}'.format(Flow1D_thermomech_analysis_dir)) fea.setup_working_dir(Flow1D_thermomech_analysis_dir) - # setup_working_dir adds an / TODO: fix - self.assertTrue(True if fea.working_dir == Flow1D_thermomech_analysis_dir + '/' else False, + self.assertTrue(True if fea.working_dir == Flow1D_thermomech_analysis_dir else False, "Setting working directory {} failed".format(Flow1D_thermomech_analysis_dir)) fcc_print('Checking FEM inp file prerequisites for thermo-mechanical analysis...') @@ -749,8 +742,7 @@ class TestCcxTools(unittest.TestCase): fcc_print('Setting up working directory to {} in order to read simulated calculations'.format(self.test_file_dir)) fea.setup_working_dir(self.test_file_dir) - # setup_working_dir adds an / TODO: fix - self.assertTrue(True if fea.working_dir == self.test_file_dir + '/' else False, + self.assertTrue(True if fea.working_dir == self.test_file_dir else False, "Setting working directory {} failed".format(self.test_file_dir)) fcc_print('Setting base name to read test {}.frd file...'.format('Flow1D_thermomech')) diff --git a/src/Mod/Fem/femtools/ccxtools.py b/src/Mod/Fem/femtools/ccxtools.py index 0adc5d4b59..a3e3949507 100644 --- a/src/Mod/Fem/femtools/ccxtools.py +++ b/src/Mod/Fem/femtools/ccxtools.py @@ -491,9 +491,6 @@ class FemToolsCcx(QtCore.QRunnable, QtCore.QObject): self.working_dir = _getTempDir(self.solver) FreeCAD.Console.PrintMessage("Dir \'{}\' will be used instead.\n".format(self.working_dir)) - # check working_dir has a slash at the end, if not add one, needed for inp writer - self.working_dir = os.path.join(self.working_dir, '') - # Update inp file name self.set_inp_file_name()