Merge branch 'feat/adding-opened-attribute-to-xpl-and-small-fixes' in…

…to ci/testing-improvements

doc/changelog.d/3730.fixed.md

@@ -0,0 +1 @@
+fix: ram units

doc/changelog.d/3731.miscellaneous.md

@@ -0,0 +1 @@
+feat: adding opened attribute

src/ansys/mapdl/core/launcher.py

@@ -383,8 +383,8 @@ def generate_mapdl_launch_command(
     cpu_sw = "-np %d" % nproc
 
     if ram:
-        ram_sw = "-m %d" % int(1024 * ram)
-        LOG.debug(f"Setting RAM: {ram_sw}")
+        ram_sw = "-m %d" % int(ram)
+        LOG.debug(f"Setting RAM: {ram_sw} MB")
     else:
         ram_sw = ""
 
@@ -1990,7 +1990,7 @@ def get_value(
                 ram = SLURM_MEM_PER_NODE
 
             if not units:
-                args["ram"] = int(ram)
+                args["ram"] = int(ram)  # Assuming in MB
             elif units == "T":  # tera
                 args["ram"] = int(ram) * (2**10) ** 2
             elif units == "G":  # giga

src/ansys/mapdl/core/xpl.py

@@ -124,6 +124,7 @@ def close(self):
         """
         response = self._mapdl.run("*XPL,CLOSE")
         self._check_ignored(response)
+        self._filename = None
         self._open = False
         return response
 
@@ -373,6 +374,8 @@ def save(self):
         """Save the current file, ignoring the marked records."""
         response = self._mapdl.run("*XPL,SAVE").strip()
         self._check_ignored(response)
+        self._open = False
+        self._filename = None
         return response
 
     def extract(self, recordname, sets="ALL", asarray=False):
@@ -550,8 +553,15 @@ def write(self, recordname, vecname):
     def __repr__(self):
         txt = "MAPDL File Explorer\n"
         if self._open:
-            txt += "\tOpen file:%s" % self._filename
+            txt += f"\tOpen file : {self._filename}"
             txt += "\n".join(self.where().splitlines()[1:])
         else:
             txt += "\tNo open file"
         return txt
+
+    @property
+    def opened(self):
+        if self._open:
+            return self._filename
+        else:
+            return None

tests/test_launcher.py

@@ -1002,7 +1002,7 @@ def test_generate_mapdl_launch_command_windows():
     jobname = "myjob"
     nproc = 10
     port = 1000
-    ram = 2
+    ram = 2024
     additional_switches = "-my_add=switch"
 
     cmd = generate_mapdl_launch_command(
@@ -1022,7 +1022,7 @@ def test_generate_mapdl_launch_command_windows():
     assert "-port" in cmd
     assert f"{port}" in cmd
     assert "-m" in cmd
-    assert f"{ram*1024}" in cmd
+    assert f"{ram}" in cmd
     assert "-np" in cmd
     assert f"{nproc}" in cmd
     assert "-grpc" in cmd
@@ -1037,7 +1037,7 @@ def test_generate_mapdl_launch_command_windows():
     assert f"{exec_file}" in cmd
     assert f" -j {jobname} " in cmd
     assert f" -port {port} " in cmd
-    assert f" -m {ram*1024} " in cmd
+    assert f" -m {ram} " in cmd
     assert f" -np {nproc} " in cmd
     assert " -grpc" in cmd
     assert f" {additional_switches} " in cmd
@@ -1053,7 +1053,7 @@ def test_generate_mapdl_launch_command_linux():
     jobname = "myjob"
     nproc = 10
     port = 1000
-    ram = 2
+    ram = 2024
     additional_switches = "-my_add=switch"
 
     cmd = generate_mapdl_launch_command(
@@ -1075,7 +1075,7 @@ def test_generate_mapdl_launch_command_linux():
     assert "-port" in cmd
     assert f"{port}" in cmd
     assert "-m" in cmd
-    assert f"{ram*1024}" in cmd
+    assert f"{ram}" in cmd
     assert "-np" in cmd
     assert f"{nproc}" in cmd
     assert "-grpc" in cmd
@@ -1091,7 +1091,7 @@ def test_generate_mapdl_launch_command_linux():
     assert f"{exec_file} " in cmd
     assert f" -j {jobname} " in cmd
     assert f" -port {port} " in cmd
-    assert f" -m {ram*1024} " in cmd
+    assert f" -m {ram} " in cmd
     assert f" -np {nproc} " in cmd
     assert " -grpc" in cmd
     assert f" {additional_switches} " in cmd

tests/test_xpl.py

@@ -86,11 +86,13 @@ def xpl(self, mapdl, cube_solve):
             self.create_cube(mapdl)
 
         xpl.open(self.full_file)
+
         yield xpl
-        xpl.close()
 
-    @staticmethod
-    def test_close(xpl):
+        if xpl.opened:
+            xpl.close()
+
+    def test_close(self, xpl):
         xpl.close()
         with pytest.raises(MapdlCommandIgnoredError):
             xpl.list()
@@ -197,3 +199,10 @@ def test_extract(self, xpl):
 
         mat = xpl.extract("NSL")
         assert mat.shape == (243, 10)
+
+    def test_opened(self, xpl):
+        assert xpl.opened
+        xpl.close()
+        assert not xpl.opened
+        xpl.open(self.full_file)
+        assert xpl.opened