Pass plugin_name through PluginGeneric.__init__

Author: paulromano

src/watts/plugin_abce.py

@@ -51,9 +51,8 @@ def __init__(
         execute_command = [sys.executable, '{self.executable}', '--settings_file', '{self.input_name}']
         super().__init__(
             executable, execute_command, template_file, extra_inputs,
-            extra_template_inputs, show_stdout, show_stderr)
+            extra_template_inputs, 'ABCE', show_stdout, show_stderr)
         self.input_name = 'settings.yml'
-        self.plugin_name = 'ABCE'
 
 
 class ResultsABCE(Results):

src/watts/plugin_accert.py

@@ -45,9 +45,8 @@ def __init__(self, template_file: str,
         executable = _find_executable(executable, 'ACCERT_DIR')
         execute_command = [sys.executable, '{self.executable}', '-i', '{self.input_name}']
         super().__init__(executable, execute_command, template_file, extra_inputs,
-                         extra_template_inputs, show_stdout, show_stderr)
+                         extra_template_inputs, "ACCERT", show_stdout, show_stderr)
         self.input_name = "ACCERT_input.son"
-        self.plugin_name = "ACCERT"
 
     @PluginGeneric.executable.setter
     def executable(self, exe: PathLike):

src/watts/plugin_dakota.py

@@ -118,10 +118,9 @@ def __init__(
         execute_command = ['{self.executable}', '-i', '{self.input_name}']
         super().__init__(
             executable, execute_command, template_file, extra_inputs,
-            extra_template_inputs, show_stdout, show_stderr)
+            extra_template_inputs, "Dakota", show_stdout, show_stderr)
 
         self.input_name = template_file
-        self.plugin_name = "Dakota"
         self._auto_link_files = auto_link_files
 
         # Setup to automatically include all 'extra_inputs' and 'extra_template_inputs'

src/watts/plugin_mcnp.py

@@ -91,7 +91,6 @@ def __init__(
         executable = _find_executable(executable, 'MCNP_DIR')
         super().__init__(
             executable, ['{self.executable}', 'i={self.input_name}'],
-            template_file, extra_inputs, extra_template_inputs,
+            template_file, extra_inputs, extra_template_inputs, "MCNP",
             show_stdout, show_stderr, unit_system='cgs')
         self.input_name = "mcnp_input"
-        self.plugin_name = "MCNP"

src/watts/plugin_moose.py

@@ -113,6 +113,5 @@ def __init__(
         execute_command = ['{self.executable}', '-i', '{self.input_name}']
         super().__init__(
             executable, execute_command, template_file, extra_inputs,
-            extra_template_inputs, show_stdout, show_stderr)
+            extra_template_inputs, "MOOSE", show_stdout, show_stderr)
         self.input_name = "MOOSE.i"
-        self.plugin_name = "MOOSE"

src/watts/plugin_pyarc.py

@@ -73,9 +73,8 @@ def __init__(
     ):
         executable = _find_executable(executable, 'PyARC_DIR')
         super().__init__(executable, None, template_file, extra_inputs,
-                         extra_template_inputs, show_stdout, show_stderr)
+                         extra_template_inputs, "PyARC", show_stdout, show_stderr)
         self.input_name = "pyarc_input.son"
-        self.plugin_name = "PyARC"
 
     @PluginGeneric.executable.setter
     def executable(self, exe: PathLike):

src/watts/plugin_relap5.py

@@ -92,9 +92,8 @@ def  __init__(
         execute_command = ['{self.executable}', '-i', '{self.input_name}']
         super().__init__(
             executable, execute_command, template_file, extra_inputs,
-            extra_template_inputs, show_stdout, show_stderr)
+            extra_template_inputs, "RELAP5", show_stdout, show_stderr)
         self.input_name = "RELAP5.i"
-        self.plugin_name = "RELAP5"
         self.plotfl_to_csv = plotfl_to_csv
 
     def run(self, extra_args: Optional[List[str]] = None):

src/watts/plugin_sas.py

@@ -106,9 +106,8 @@ def  __init__(
         execute_command = ['{self.executable}', '-i', '{self.input_name}',
                            '-o', 'out.txt']
         super().__init__(executable, execute_command, template_file, extra_inputs,
-                         extra_template_inputs, show_stdout, show_stderr)
+                         extra_template_inputs, "SAS", show_stdout, show_stderr)
         self.input_name = "SAS.inp"
-        self.plugin_name = "SAS"
 
         # Set other executables based on the main SAS executable
         suffix = executable.suffix

src/watts/plugin_serpent.py

@@ -68,8 +68,7 @@ def __init__(
         executable = _find_executable(executable, 'SERPENT_DIR')
         super().__init__(
             executable, ['{self.executable}', '{self.input_name}'],
-            template_file, extra_inputs, extra_template_inputs,
+            template_file, extra_inputs, extra_template_inputs, "Serpent",
             show_stdout, show_stderr, unit_system='cgs'
         )
         self.input_name = "serpent_input"
-        self.plugin_name = "Serpent"