Skip to content

Commit df9d3bd

Browse files
authored
Removing temporary files at the end of execution (#1784)
* Removing temporary files at the end of execution * fix edge cdread case * Fix mpread tests
1 parent 60c30e3 commit df9d3bd

File tree

3 files changed

+19
-3
lines changed

3 files changed

+19
-3
lines changed

src/ansys/mapdl/core/mapdl.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3006,6 +3006,8 @@ def load_array(self, name, array):
30063006

30073007
if self._local:
30083008
os.remove(filename)
3009+
else:
3010+
self.slashdelete(filename)
30093011

30103012
def load_table(self, name, array, var1="", var2="", var3="", csysid=""):
30113013
"""Load a table from Python to into MAPDL.
@@ -3128,6 +3130,11 @@ def load_table(self, name, array, var1="", var2="", var3="", csysid=""):
31283130
# skip the first line its a header we wrote in np.savetxt
31293131
self.tread(name, filename, nskip=1, mute=True)
31303132

3133+
if self._local:
3134+
os.remove(filename)
3135+
else:
3136+
self.slashdelete(filename)
3137+
31313138
def _display_plot(self, *args, **kwargs): # pragma: no cover
31323139
raise NotImplementedError("Implemented by child class")
31333140

src/ansys/mapdl/core/mapdl_grpc.py

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,8 +1218,12 @@ def sys(self, cmd):
12181218
super().sys(f"{cmd} > {tmp_file}")
12191219
if self._local: # no need to download when local
12201220
with open(os.path.join(self.directory, tmp_file)) as fobj:
1221-
return fobj.read()
1222-
return self._download_as_raw(tmp_file).decode()
1221+
obj = fobj.read()
1222+
else:
1223+
obj = self._download_as_raw(tmp_file).decode()
1224+
1225+
self.slashdelete(tmp_file)
1226+
return obj
12231227

12241228
def download_result(self, path=None, progress_bar=False, preference=None):
12251229
"""Download remote result files to a local directory
@@ -1559,9 +1563,12 @@ def input(
15591563
# Using CDREAD
15601564
option = kwargs.get("cd_read_option", "COMB")
15611565
tmp_dat = f"/OUT,{tmp_out}\n{orig_cmd},'{option}','{filename}'\n"
1566+
delete_uploaded_files = False
1567+
15621568
else:
15631569
# Using default INPUT
15641570
tmp_dat = f"/OUT,{tmp_out}\n{orig_cmd},'{filename}'\n"
1571+
delete_uploaded_files = True
15651572

15661573
if write_to_log and self._apdl_log is not None:
15671574
if not self._apdl_log.closed:
@@ -1605,6 +1612,8 @@ def input(
16051612
# Deleting the previous files
16061613
self.slashdelete(tmp_name)
16071614
self.slashdelete(tmp_out)
1615+
if filename in self.list_files() and delete_uploaded_files:
1616+
self.slashdelete(filename)
16081617

16091618
return output
16101619

tests/test_mapdl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1416,13 +1416,13 @@ def test_mpfunctions(mapdl, cube_solve, capsys):
14161416
assert "PROPERTY TEMPERATURE TABLE NUM. TEMPS= 1" in output
14171417
assert "TEMPERATURE TABLE ERASED." in output
14181418
assert "0.4000000" in output
1419-
assert fname_ in mapdl.list_files()
14201419
# check if materials are read into the db
14211420
assert mapdl.get_value("NUXY", "1", "TEMP", 0) == nuxy
14221421
assert np.allclose(mapdl.get_value("EX", 1, "TEMP", 0), ex)
14231422

14241423
# Reding file in remote
14251424
fname_ = f"{fname}.{ext}"
1425+
mapdl.upload(fname_)
14261426
os.remove(fname_)
14271427
assert not os.path.exists(fname_)
14281428
assert f"{fname}.{ext}" in mapdl.list_files()

0 commit comments

Comments
 (0)