Allow for model-differentiated tasks

src/swell/tasks/base/task_base.py

@@ -292,8 +292,26 @@ def create_task(
         # Convert camel case string to snake case
         task_lower = camel_case_to_snake_case(task)
 
-        # Import class based on user selected task
-        task_class = getattr(importlib.import_module('swell.tasks.' + task_lower), task)
+        task_class = None
+
+        factory_logger = get_logger('TaskFactory')
+
+        # Try to use the model-specific task if it exists
+        if model is not None:
+            try:
+                task_class = getattr(importlib.import_module(f'swell.tasks.{model}.{task_lower}'),
+                                     task)
+                factory_logger.info(f'Using model-specific version of {task} in '
+                                    f'<swell.tasks.{model}.{task_lower}>')
+            except ModuleNotFoundError:
+                factory_logger.info(f'Could not find model-specific version of {task}.'
+                                    ' Looking for generic version.')
+
+        # Try to import model-independent task
+        if task_class is None:
+
+            # Import class based on user selected task
+            task_class = getattr(importlib.import_module('swell.tasks.'+task_lower), task)
 
         # Return task object
         return task_class(config, datetime, model, ensemblePacket, task)

src/swell/utilities/run_jedi_executables.py

@@ -15,7 +15,7 @@
 
 from swell.utilities.shell_commands import run_track_log_subprocess
 from swell.utilities.logger import Logger
-from swell.tasks.base.task_base import JediConfigRendering
+from swell.utilities.render_jedi_interface_files import JediConfigRendering
 
 # --------------------------------------------------------------------------------------------------