Merge pull request #423 from zsarnoczay/master

feat: add ATC-138 backend support and clean up sWHALE perf dispatch

Author: fmckenna

modules/Workflow/WorkflowApplications.json

@@ -1341,17 +1341,33 @@
         "Name": "REDi",
         "ExecutablePath": "applications/performanceAssessment/REDi/REDiWrapper.py",
         "ApplicationSpecificInputs": [
-          {
-            "id": "dirnameOutput",
-            "type": "string",
-            "description": "Path to the working directory containing the Pelicun results."
-          },
           {
             "id": "riskParametersPath",
-            "type": "string",
+            "type": "path",
             "description": "Path to the risk parameters json file ."
           }
         ]
+      },
+      {
+        "Name": "ATC138",
+        "ExecutablePath": "applications/performanceAssessment/ATC138/ATC138Wrapper.py",
+        "ApplicationSpecificInputs": [
+          {
+            "id": "generalInputsPath",
+            "type": "path",
+            "description": "Path to the json file with mandatory input parameters."
+          },
+          {
+            "id": "tenantUnitsListPath",
+            "type": "path",
+            "description": "Path to the csv file with tenant unit information."
+          },
+          {
+            "id": "optionalInputsPath",
+            "type": "path",
+            "description": "Path to the json file with optional input parameters."
+          }
+        ]
       }
     ]
   },

modules/Workflow/whale/main.py

@@ -612,9 +612,10 @@ def set_pref(self, preferences, ref_path):
                     if 'PelicunDefault' in self.pref[preference]:
                         continue
 
-                    self.pref[preference] = resolve_path(
-                        self.pref[preference], ref_path
-                    )
+                    if ref_path:
+                        self.pref[preference] = resolve_path(
+                            self.pref[preference], ref_path
+                        )
 
     def get_command_list(self, app_path, force_posix=False):  # noqa: FBT002, C901
         """Short description
@@ -2934,14 +2935,6 @@ def estimate_performance(  # noqa: D102
 
         command_list = workflow_app.get_command_list(app_path=self.app_dir_local)
 
-        command_list.append('--dirnameOutput')
-
-        # Only add asset id if we are running a regional assessment
-        if asst_id != None:  # noqa: E711
-            command_list.append(f'{aimDir}/{asst_id}')
-        else:
-            command_list.append(f'{aimDir}')
-
         command = create_command(command_list)
 
         log_msg('Performance assessment command:', prepend_timestamp=False)