Fix/ use cdread inside input (#671)

* Added swtich to modify the input function input file.

* Updated test case to reflect CDB format properly instead of input format.

* Passing also CDREAD options as kwargs

* Modifying the CDREAD test cases to include the new type of CDB.

* Fixing style.

Author: germa89

ansys/mapdl/core/mapdl_grpc.py

@@ -1009,6 +1009,9 @@ def cdread(self, *args, **kwargs):
 
         kwargs.setdefault("verbose", False)
         kwargs.setdefault("progress_bar", False)
+        kwargs.setdefault("orig_cmd", 'CDREAD')
+        kwargs.setdefault("cd_read_option", option.upper())
+
         self.input(fname, **kwargs)
 
     @protect_grpc
@@ -1019,6 +1022,7 @@ def input(
         progress_bar=False,
         time_step_stream=None,
         chunk_size=512,
+        orig_cmd='/INP',
         **kwargs,
     ):
         """Stream a local input file to a remote mapdl instance.
@@ -1045,6 +1049,12 @@ def input(
             These defaults will be ignored if ``time_step_stream`` is
             manually set.
 
+        orig_cmd : str
+            Original command. There are some cases, were input is
+            used to send the file to the grpc server but then we want
+            to run something different than ``/INPUT``, for example
+            ``CDREAD``.
+
         Returns
         -------
         str
@@ -1133,7 +1143,14 @@ def input(
         # file.
         tmp_name = "_input_tmp_.inp"
         tmp_out = "_input_tmp_.out"
-        tmp_dat = f"/OUT,{tmp_out}\n/INP,'{filename}'\n"
+        if 'CDRE' in orig_cmd.upper():
+            # Using CDREAD
+            option = kwargs.get("cd_read_option", 'COMB')
+            tmp_dat = f"/OUT,{tmp_out}\n{orig_cmd},'{option}','{filename}'\n"
+        else:
+            # Using default INPUT
+            tmp_dat = f"/OUT,{tmp_out}\n{orig_cmd},'{filename}'\n"
+
         if self._local:
             local_path = self.directory
             with open(os.path.join(local_path, tmp_name), "w") as f:

tests/test_mapdl.py

@@ -47,10 +47,20 @@
 # Many of the commands could be deleted, but for the sake of good
 # testing we are going to leave them.
 
-CDB_FILE = """/COM,ANSYS RELEASE 2021 R2           BUILD 21.2
+CDB_FILE = """                                                                        S      1
+/COM,ANSYS RELEASE 12.1BETAUP20090531       10:26:32    06/01/2009      S      2
+/NOPR                                                                   S      3
+/PREP7                                                                  S      4
+/TITLE,                                                                 S      5
+1H,,1H;,,18Hdisc_pad_model.cdb,                                         G      1
+5HANSYS,22H  12.1BETA  UP20090531,,,,,,,1.0,,,,,13H000601.102632,       G      2
+1.0000E-04,,,,9,,;                                                      G      3
+S     29G      3D      0P      0                                        T      1
+:CDWRITE      ! START OF CDWRITE DATA
+/COM,ANSYS RELEASE 2021 R2           BUILD 21.2
 /PREP7
 /NOPR
-/TITLE,'CDREAD and CDWRITE tests
+/TITLE,'CDREAD and CDWRITE tests'
 *IF,_CDRDOFF,EQ,1,THEN     !if solid model was read in
 _CDRDOFF=             !reset flag, numoffs already performed
 *ELSE              !offset database for the following FE model
@@ -103,6 +113,25 @@ def asserting_cdread_cdwrite_tests(mapdl):
     return 'asdf1234' in mapdl.parameters['T_PAR']
 
 
+def warns_in_cdread_error_log(mapdl):
+    """Check for specific warns in the error log associated with using /INPUT with CDB files
+    instead of CDREAD command."""
+    error_files = [each for each in os.listdir(mapdl.directory) if each.endswith('.err')]
+
+    # "S 1", "1 H" and "5 H Ansys" are character at the end of lines in the CDB_FILE variable.
+    # They are allowed in the CDREAD command, but it gives warnings in the /INPUT command.
+    warn_cdread_1 = "S1 is not a recognized"
+    warn_cdread_2 = "1H is not a recognized"
+    warn_cdread_3 = "5HANSYS is not a recognized"
+
+    warns = []
+    for each in error_files:
+        with open(os.path.join(mapdl.directory, each)) as fid:
+            error_log = ''.join(fid.readlines())
+        warns.append((warn_cdread_1 in error_log) or (warn_cdread_2 in error_log) or (warn_cdread_3 in error_log))
+        return any(warns)
+
+
 @pytest.fixture(scope="function")
 def make_block(mapdl, cleared):
     mapdl.block(0, 1, 0, 1, 0, 1)
@@ -696,15 +725,15 @@ def test_title(mapdl, cleared):
 
 
 def test_cdread(mapdl, cleared):
-    random_letters = mapdl.directory.split('/')[0][-3:0]
+    random_letters = random_string(4)
 
-    mapdl.run(f"parmtest='{random_letters}'")
+    mapdl.run(f"PARMTEST='{random_letters}'")
     mapdl.cdwrite('all', 'model2', 'cdb')
 
     mapdl.clear()
     mapdl.cdread("db", 'model2', 'cdb')
 
-    assert random_letters == mapdl.parameters['parmtest']
+    assert random_letters in mapdl.parameters['PARMTEST']
 
 
 # CDREAD tests are actually a good way to test 'input' command.
@@ -738,35 +767,38 @@ def test_cdread_in_python_directory(mapdl, cleared, tmpdir):
     # the archive from the current working directory.
     old_cwd = os.getcwd()
     try:
+        # We are not checking yet if the file is read correctly, just if the file
+        # can be read.
         os.chdir(tmpdir)
-        mapdl.cdread('db', 'model', 'cdb')
-        assert asserting_cdread_cdwrite_tests(mapdl)
+        mapdl.cdread('COMB', 'model', 'cdb') # 'COMB' is needed since we use the CDB with the strange line endings.
+        assert asserting_cdread_cdwrite_tests(mapdl) and not warns_in_cdread_error_log(mapdl)
 
         clearing_cdread_cdwrite_tests(mapdl)
-        mapdl.cdread('db', 'model.cdb')
-        assert asserting_cdread_cdwrite_tests(mapdl)
+        mapdl.cdread('COMB', 'model.cdb')
+        assert asserting_cdread_cdwrite_tests(mapdl) and not warns_in_cdread_error_log(mapdl)
 
         clearing_cdread_cdwrite_tests(mapdl)
-        mapdl.cdread('db', 'model')
-        assert asserting_cdread_cdwrite_tests(mapdl)
+        mapdl.cdread('COMB', 'model')
+        assert asserting_cdread_cdwrite_tests(mapdl) and not warns_in_cdread_error_log(mapdl)
+
     finally:
         # always change back to the previous directory
         os.chdir(old_cwd)
 
     clearing_cdread_cdwrite_tests(mapdl)
     fullpath = str(tmpdir.join('model.cdb'))
-    mapdl.cdread('db', fullpath)
-    assert asserting_cdread_cdwrite_tests(mapdl)
+    mapdl.cdread('COMB', fullpath)
+    assert asserting_cdread_cdwrite_tests(mapdl) and not warns_in_cdread_error_log(mapdl)
 
     clearing_cdread_cdwrite_tests(mapdl)
     fullpath = str(tmpdir.join('model'))
-    mapdl.cdread('db', fullpath, 'cdb')
-    assert asserting_cdread_cdwrite_tests(mapdl)
+    mapdl.cdread('COMB', fullpath, 'cdb')
+    assert asserting_cdread_cdwrite_tests(mapdl) and not warns_in_cdread_error_log(mapdl)
 
     clearing_cdread_cdwrite_tests(mapdl)
     fullpath = str(tmpdir.join('model'))
-    mapdl.cdread('db', fullpath)
-    assert asserting_cdread_cdwrite_tests(mapdl)
+    mapdl.cdread('COMB', fullpath)
+    assert asserting_cdread_cdwrite_tests(mapdl) and not warns_in_cdread_error_log(mapdl)
 
 
 def test_cdread_in_apdl_directory(mapdl, cleared):