fixed logic for xyce creation

sandialabs · Aug 9, 2018 · 6ec346f · 6ec346f
1 parent cc5349c
commit 6ec346f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/agent/slycat-xyce-timeseries-to-hdf5.py b/agent/slycat-xyce-timeseries-to-hdf5.py
@@ -32,8 +32,8 @@ def _isNumeric(j):
   return True
 
 parser = argparse.ArgumentParser()
-parser.add_argument("--input_directory", help="Input directory containing XYCE data (a dakota_tabular.dat file and multiple workdirN/*.prn files).")
-parser.add_argument("--output_directory", help="Output directory containing hdf5 files.")
+parser.add_argument("--input-directory", help="Input directory containing XYCE data (a dakota_tabular.dat file and multiple workdirN/*.prn files).")
+parser.add_argument("--output-directory", help="Output directory containing hdf5 files.")
 parser.add_argument("--id-column", default="%eval_id", help="Inputs file id column name.  Default: %(default)s")
 parser.add_argument("--inputs-file", default=None, help="The name of the delimited text file containing input data.  By default, dakota_tabular.dat will be loaded from the input directory.")
 parser.add_argument("--inputs-file-delimiter", default=None, help="Field delimiter.  By default, fields will be delimited with any whitespace except a newline.")

diff --git a/web-server/js/slycat-remote-interface.js b/web-server/js/slycat-remote-interface.js
@@ -353,7 +353,11 @@ define('slycat-remote-interface', ['knockout', 'knockout-mapping', 'slycat-serve
                       "value": fn_params.xyce_timeseries_file
                   },
                   {
-                      "name": "--inputs-directory",
+                      "name": "--inputs-file",
+                      "value": fn_params.inputs_file
+                  },
+                  {
+                      "name": "--input-directory",
                       "value": fn_params.input_directory
                   },
                   {
@@ -367,7 +371,7 @@ define('slycat-remote-interface', ['knockout', 'knockout-mapping', 'slycat-serve
             // if "hdf5_directory" in params and params["hdf5_directory"] != "":
             //     hdf5_dir = params["hdf5_directory"]
 
-        if (fn_params.timeseries_name !== "")
+        if (fn_params.timeseries_name !== "" && fn_params.timeseries_type === "csv")
         {
           json_payload.scripts.push({
               "name": "compute_timeseries",