Fix up python import paths.

Code/Source/sv4gui/Plugins/org.sv.gui.qt.simulation1d/sv4gui_SimulationPythonConvert1d.h

@@ -59,9 +59,14 @@ class sv4guiSimulationPythonConvert1dParamNames
     sv4guiSimulationPythonConvert1dParamNames() {
       allNames.insert(OUTPUT_DIRECTORY);
     }
+    const std::string DATA_NAMES = "data_names";
     const std::string OUTPUT_DIRECTORY = "output_directory";
+    const std::string OUTPUT_FILE_NAME = "output_file_name";
+    const std::string OUTPUT_FORMAT = "output_format";
     const std::string OUTLET_SEGMENTS = "outlet_segments";
     const std::string RESULTS_DIRECTORY = "results_directory";
+    const std::string SOLVER_FILE_NAME = "solver_file_name";
+    const std::string TIME_RANGE = "time_range";
     std::set<std::string> allNames;
 };
 

Code/Source/sv4gui/Plugins/org.sv.gui.qt.simulation1d/sv4gui_SimulationView1d.cxx

@@ -4432,9 +4432,17 @@ void sv4guiSimulationView1d::ExportResults()
    auto params = pythonInterface.m_ParameterNames;
 
    pythonInterface.AddParameter(params.RESULTS_DIRECTORY, resultDir.toStdString());
+   pythonInterface.AddParameter(params.SOLVER_FILE_NAME, "solver.in");
+
    pythonInterface.AddParameter(params.OUTPUT_DIRECTORY, exportDir.toStdString());
+   pythonInterface.AddParameter(params.OUTPUT_FILE_NAME, jobName.toStdString());
+
+   pythonInterface.AddParameter(params.DATA_NAMES, "flow"); 
+
+   pythonInterface.AddParameter(params.TIME_RANGE, "0.0,0.8"); 
 
-   pythonInterface.AddParameter(params.OUTLET_SEGMENTS); 
+   // Convert resuls for all outlet segments.
+   pythonInterface.AddParameter(params.OUTLET_SEGMENTS, "true"); 
 
    // Execute the Python script to generate the 1D solver input file.
    auto statusMsg = "Converting simulation files ..."; 

Python/site-packages/sv_1d_extract_results/__init__.py

@@ -34,8 +34,13 @@
 import site
 import sys
 
-#from .manage import *
-#from .parameters import *
-#import vtk
+from .extract_results import *
+from .node import *
+from .segment import *
+from .solver import *
+from .manage import *
+from .parameters import *
+
+import vtk
 
 

Python/site-packages/sv_1d_extract_results/extract_results.py

@@ -37,9 +37,9 @@
 import sys
 import logging
 
-from manage import get_logger_name, init_logging
-from parameters import Parameters
-from solver import Solver
+from .manage import get_logger_name, init_logging, get_log_file_name
+from .parameters import Parameters
+from .solver import Solver
 
 try:
     import vtk
@@ -155,8 +155,9 @@ def set_parameters(**kwargs):
     params.solver_file_name = kwargs.get(Args.SOLVER_FILE)
     logger.info("Solver file name: %s" % params.solver_file_name)
 
-    params.data_names = kwargs.get(Args.DATA_NAMES).split(",")
-    logger.info("Data names: %s" % ','.join(params.data_names))
+    if kwargs.get(Args.DATA_NAMES):
+        params.data_names = kwargs.get(Args.DATA_NAMES).split(",")
+        logger.info("Data names: %s" % ','.join(params.data_names))
 
     if kwargs.get(Args.OUTLET_SEGMENTS):
         params.outlet_segments = True 
@@ -221,6 +222,7 @@ def run_from_c(*args, **kwargs):
 
     The '*args' argument contains the directory to write the log file.
     """
+    print(kwargs)
     output_dir = args[0]
     init_logging(output_dir)
     msg = "Status: OK\n"
@@ -236,7 +238,7 @@ def run_from_c(*args, **kwargs):
     ## Attach log file to returned result.
     #
     msg += "Log:\n"
-    log_file_name = path.join(output_dir, get_log_file_name())
+    log_file_name = os.path.join(output_dir, get_log_file_name())
 
     with open(log_file_name, 'r') as file:
         msg += file.read()

Python/site-packages/sv_1d_extract_results/graphics.py

@@ -2,7 +2,7 @@
 
 from os import path
 import logging
-from manage import get_logger_name
+from .manage import get_logger_name
 
 try:
     import vtk

Python/site-packages/sv_1d_extract_results/node.py

@@ -2,7 +2,7 @@
 
 from os import path
 import logging
-from manage import get_logger_name
+from .manage import get_logger_name
 
 class Node(object):
     def __init__(self, id, x, y, z):

Python/site-packages/sv_1d_extract_results/parameters.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 
 class Parameters():
     """ The Parameter class stores the input parameters.
@@ -28,7 +27,7 @@ def __init__(self):
         self.select_segment_names = False
 
         self.output_file_name = None
-        self.output_format = None 
+        self.output_format = "csv"
 
         self.display_geometry = False
         self.node_sphere_radius = 0.1

Python/site-packages/sv_1d_extract_results/segment.py

@@ -1,8 +1,6 @@
-#!/usr/bin/env python
-
 from os import path
 import logging
-from manage import get_logger_name
+from .manage import get_logger_name
 
 class Segment(object):
     def __init__(self, id, name, node1, node2, bc_type):

Python/site-packages/sv_1d_extract_results/solver.py

@@ -1,11 +1,9 @@
-#!/usr/bin/env python
-
 from os import path
 import logging
-from manage import get_logger_name
-from node import Node
-from segment import Segment 
-from parameters import Parameters
+from .manage import get_logger_name
+from .node import Node
+from .segment import Segment 
+from .parameters import Parameters
 from collections import namedtuple
 
 try:
@@ -216,6 +214,7 @@ def read_segment_data(self):
             self.logger.warning("No segment names given for reading data.")
             return
 
+        self.logger.info("Read data for segment names: %s" % ','.join(self.read_segment_names))
         data_names = self.params.data_names
         for segment_name in self.read_segment_names:
             self.read_segment_data_file(segment_name, data_names)
@@ -291,21 +290,23 @@ def write_segment_data(self, segment_names=None):
         output_file_name = self.params.output_file_name 
         ext = "." + file_format 
         sep = "_"
+        self.logger.info("File format: %s" % file_format) 
 
         for data_name in self.params.data_names:
-            #self.logger.info("Data name: %s" % data_name) 
+            self.logger.info("Data name: %s" % data_name) 
             file_name = output_dir + "/" + output_file_name + sep + data_name + ext
             times = self.params.times
 
             with open(file_name, "w") as fp:
                 for i,name in enumerate(segment_names):
-                    #self.logger.info("Segment name: %s" % name) 
+                    self.logger.info("Segment name: %s" % name) 
                     fp.write(name)
                     if i != len(segment_names)-1:
                         fp.write(",")
                 fp.write("\n")
 
                 for i,time in enumerate(times):
+                    self.logger.info("time: %g" % time) 
                     fp.write(str(time) + ",")
                     for j,name in enumerate(segment_names):
                         segment = self.segments[name]