Fixed string formatting styles

adflow/pyADflow.py

@@ -1306,7 +1306,7 @@
 
         if self.adflow.killsignals.fatalfail:
             numDigits = self.getOption("writeSolutionDigits")
-            fileName = f"failed_mesh_{self.curAP.name}_{self.curAP.adflowData.callCounter:0{numDigits}}.cgns"
+            fileName = f"failed_mesh_{self.curAP.name}_{self.curAP.adflowData.callCounter:0{numDigits}d}.cgns"
             self.pp(f"Fatal failure during mesh warp! Bad mesh is written in output directory as {fileName}")
             self.writeMeshFile(os.path.join(self.getOption("outputDirectory"), fileName))
             self.curAP.fatalFail = True
@@ -2742,12 +2742,12 @@
         numDigits = self.getOption("writeSolutionDigits")
         if number is not None:
             # We need number based on the provided number:
-            baseName = baseName + f"_%.{numDigits}d" % number
+            baseName = f"{baseName}_{number:0{numDigits}d}"
         else:
             # if number is none, i.e. standalone, but we need to
             # number solutions, use internal counter
             if self.getOption("numberSolutions"):
-                baseName = baseName + f"_%.{numDigits}d" % self.curAP.adflowData.callCounter
+                baseName = f"{baseName}_{self.curAP.adflowData.callCounter:0{numDigits}d}"
 
         # Join to get the actual filename root
         base = os.path.join(outputDir, baseName)

tests/reg_tests/test_solve.py

@@ -122,33 +122,5 @@ def test_solve(self):
         utils.assert_residuals_allclose(self.handler, self.CFDSolver, self.ap, tol=1e-10)
 
 
-class TestFailedMesh(unittest.TestCase):
-    N_PROCS = 1
-
-    def test_failed_mesh(self):
-        options = copy.copy(adflowDefOpts)
-        options.update(
-            {
-                "outputdirectory": os.path.join(baseDir, options["outputdirectory"]),
-                "gridFile": os.path.join(baseDir, "../../input_files/mdo_tutorial_euler_scalar_jst.cgns"),
-                "mgcycle": "sg",
-            }
-        )
-
-        # Create the solver
-        CFDSolver = ADFLOW(options=options)
-        ap = copy.copy(ap_tutorial_wing)
-        # pretend mesh warping failed
-        CFDSolver.adflow.killsignals.fatalfail = True
-        # Solve
-        CFDSolver(ap)
-        self.failed_mesh = os.path.join(options["outputDirectory"], f"failed_mesh_{ap.name}_000.cgns")
-        self.assertTrue(os.path.isfile(self.failed_mesh))
-
-    def tearDown(self):
-        if os.path.isfile(self.failed_mesh):
-            os.remove(self.failed_mesh)
-
-
 if __name__ == "__main__":
     unittest.main()

tests/unit_tests/test_files.py

@@ -0,0 +1,82 @@
+import copy
+import os
+import sys
+import unittest
+from parameterized import parameterized_class
+from adflow import ADFLOW
+
+
+baseDir = os.path.dirname(os.path.abspath(__file__))
+sys.path.append(os.path.join(baseDir, "../reg_tests"))
+
+from reg_aeroproblems import ap_tutorial_wing  # noqa E402
+
+
+@parameterized_class(
+    [
+        {
+            "name": "three_digits",
+            "writeSolutionDigits": 3,
+        },
+        {
+            "name": "five_digits",
+            "writeSolutionDigits": 5,
+        },
+    ]
+)
+class TestSolutionFileNames(unittest.TestCase):
+    N_PROCS = 1
+
+    def setUp(self):
+        self.options = {
+            "outputDirectory": os.path.join(baseDir, "../output_files"),
+            "writeSolutionDigits": self.writeSolutionDigits,
+            "gridFile": os.path.join(baseDir, "../../input_files/mdo_tutorial_euler_scalar_jst.cgns"),
+            "writeSurfaceSolution": False,
+        }
+
+    def test_failed_mesh(self):
+        # Create the solver
+        CFDSolver = ADFLOW(options=self.options)
+        ap = copy.copy(ap_tutorial_wing)
+
+        # Pretend mesh warping failed
+        CFDSolver.adflow.killsignals.fatalfail = True
+
+        # Solve
+        CFDSolver(ap)
+
+        if self.writeSolutionDigits == 3:
+            self.mesh_file = os.path.join(self.options["outputDirectory"], f"failed_mesh_{ap.name}_000.cgns")
+        elif self.writeSolutionDigits == 5:
+            self.mesh_file = os.path.join(self.options["outputDirectory"], f"failed_mesh_{ap.name}_00000.cgns")
+
+        # Check that a mesh file with this name exists
+        self.assertTrue(os.path.isfile(self.mesh_file))
+
+    def test_volume_solution(self):
+        # Create the solver
+        CFDSolver = ADFLOW(options=self.options)
+
+        # Set the AeroProblem and call counter
+        ap = copy.copy(ap_tutorial_wing)
+        CFDSolver.setAeroProblem(ap)
+        CFDSolver.curAP.adflowData.callCounter = 5
+
+        CFDSolver.writeSolution()
+
+        if self.writeSolutionDigits == 3:
+            self.mesh_file = os.path.join(self.options["outputDirectory"], f"{ap.name}_005_vol.cgns")
+        elif self.writeSolutionDigits == 5:
+            self.mesh_file = os.path.join(self.options["outputDirectory"], f"{ap.name}_00005_vol.cgns")
+
+        # Check that a mesh file with this name exists
+        self.assertTrue(os.path.isfile(self.mesh_file))
+
+    def tearDown(self):
+        if os.path.isfile(self.mesh_file):
+            os.remove(self.mesh_file)
+
+
+if __name__ == "__main__":
+    unittest.main()