cli: added indexs to Run hooks

Author: BitterB0NG0

src/pymcnp/Inp.py

@@ -131,8 +131,7 @@ def to_mcnp(self):
         # source += DELIMITER
 
         return f"""
-{self.message or ""}
-{self.title}
+{self.message + "\n" if self.message else ""}{self.title}
 {'\n'.join(map(str, self.cells))}
 
 {'\n'.join(map(str, self.surfaces))}

src/pymcnp/cli/run.py

@@ -46,22 +46,24 @@ def __init__(self, inps: Inp, command='mcnp6'):
         self.inps = inps
         self.command = command
 
-    def prehook_file(self, path: pathlib.Path):
+    def prehook_file(self, path: pathlib.Path, index: int):
         """
         Runs before a file.
 
         Parameters:
             path: Path to run directory.
+            index: Run number.
         """
 
         pass
 
-    def posthook_file(self, path: pathlib.Path):
+    def posthook_file(self, path: pathlib.Path, index: int):
         """
         Runs after a file.
 
         Parameters:
             path: Path to run directory.
+            index: Run number.
         """
 
         pass
@@ -110,13 +112,13 @@ def run(self, path: str | pathlib.Path):
             with path_input.open('w') as file:
                 file.write(inp.to_mcnp())
 
-            self.prehook_file(subdirectory)
+            self.prehook_file(subdirectory, i)
             process = subprocess.Popen([f'{self.command}', f'inp={path_input} outp={path_output} ptrac={path_ptrac}'])
             processes.append((process, subdirectory))
 
-        for process, subdirectory in processes:
+        for i, (process, subdirectory) in enumerate(processes):
             process.wait()
-            self.posthook_file(subdirectory)
+            self.posthook_file(subdirectory, i)
 
         self.posthook_batch(directory)
 

src/pymcnp/inp/Cell.py

@@ -26,8 +26,8 @@ def __init__(
         self,
         number: types.Integer,
         material: types.Integer,
-        density: types.Integer,
         geometry: types.Geometry,
+        density: types.Real = None,
         options: types.Tuple[cell.CellOption] = None,
     ):
         """
@@ -46,7 +46,7 @@ def __init__(
 
         self.number: types.Integer = number
         self.material: types.Integer = material
-        self.density: types.Integer = density
+        self.density: types.Real = density
         self.geometry: types.Geometry = geometry
         self.options: types.Tuple[cell.CellOption] = options
 

tests/test_pymcnp/test_cli/test_Run.py

@@ -24,12 +24,12 @@ class Test_Methods:
         def test_prehook_file(self):
             for example in self.EXAMPLES:
                 element = self.element(**example)
-                element.prehook_file(self.PATH)
+                element.prehook_file(self.PATH, 0)
 
         def test_posthook_file(self):
             for example in self.EXAMPLES:
                 element = self.element(**example)
-                element.prehook_file(self.PATH)
+                element.posthook_file(self.PATH, 0)
 
         def test_prehook_batch(self):
             for example in self.EXAMPLES:
@@ -39,7 +39,7 @@ def test_prehook_batch(self):
         def test_posthook_batch(self):
             for example in self.EXAMPLES:
                 element = self.element(**example)
-                element.prehook_batch(self.PATH)
+                element.posthook_batch(self.PATH)
 
         def test_run(self):
             for example in self.EXAMPLES: