Fix/bounds (#59)

* fixing bug in finding pipeline names and removing extra debug statements
Alpine-DAV · Dec 20, 2017 · 3a04c4a · 3a04c4a
1 parent e9ec1ac
commit 3a04c4a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/src/ascent/runtimes/ascent_main_runtime.cpp b/src/ascent/runtimes/ascent_main_runtime.cpp
@@ -354,7 +354,7 @@ AscentRuntime::ConvertToFlowGraph(const conduit::Node &pipeline,
     // can connect to the end result by pipeline name
     w.graph().add_filter("alias",
                          pipeline_name);
-
+    
     w.graph().connect(prev_name,     // src
                       pipeline_name, // dest
                       0);            // default port
@@ -436,7 +436,7 @@ AscentRuntime::ConvertExtractToFlow(const conduit::Node &extract,
     // this is the blueprint mesh 
     extract_source = "source";
   }
-  std::cout<<"***** extract source :  "<<extract_source<<"\n";
+
   m_connections[ensure_name] = extract_source;
   m_connections[extract_name] = ensure_name;
 
@@ -531,9 +531,9 @@ AscentRuntime::GetPipelines(const conduit::Node &plots)
   {
     conduit::Node plot = plots.child(i);
     std::string pipeline;
-    if(plot.has_path("params/pipeline"))
+    if(plot.has_path("pipeline"))
     {
-      pipeline = plot["params/pipeline"].as_string();
+      pipeline = plot["pipeline"].as_string();
     }
     else
     {
@@ -617,7 +617,7 @@ AscentRuntime::CreateScenes(const conduit::Node &scenes)
                       1);             // default port
 
     // ------------ NEW -----------------
-
+    
     std::vector<std::string> pipelines = GetPipelines(scene["plots"]); 
     std::vector<std::string> plot_names = scene["plots"].child_names();
 
@@ -775,7 +775,7 @@ AscentRuntime::CreateScenes(const conduit::Node &scenes)
       bounds_output = union_bounds_names[union_size-1];
       domain_ids_output = union_domain_ids_names[union_size-1];
     }
-
+      
     w.graph().connect(bounds_output, // src
                       renders_name,  // dest
                       0);            // default port

diff --git a/src/ascent/runtimes/flow_filters/ascent_runtime_vtkh_filters.cpp b/src/ascent/runtimes/flow_filters/ascent_runtime_vtkh_filters.cpp
@@ -871,7 +871,7 @@ VTKHSlice::verify_params(const conduit::Node &params,
 {
     info.reset();
     bool res = true;
-    params.print(); 
+
     if(! params.has_path("point/x") ||
        ! params["point/y"].dtype().is_number() )
     {
@@ -945,7 +945,7 @@ VTKHSlice::execute()
     slicer.Update();
 
     vtkh::DataSet *slice_output = slicer.GetOutput();
-    
+
     set_output<vtkh::DataSet>(slice_output);
 }
 
@@ -1102,7 +1102,7 @@ DefaultRender::execute()
     std::copy(domain_ids->begin(), domain_ids->end(), v_domain_ids.begin()); 
 
     std::vector<vtkh::Render> *renders = new std::vector<vtkh::Render>();
-
+    
     if(params().has_path("renders"))
     {
       const conduit::Node renders_node = params()["renders"];
@@ -1356,7 +1356,6 @@ VTKHBounds::execute()
 
     vtkh::DataSet *data = input<vtkh::DataSet>(0);
     bounds->Include(data->GetGlobalBounds());
-
     set_output<vtkm::Bounds>(bounds);
 }
 
@@ -1404,7 +1403,6 @@ VTKHUnionBounds::execute()
     vtkm::Bounds *bounds_a = input<vtkm::Bounds>(0);
     vtkm::Bounds *bounds_b = input<vtkm::Bounds>(1);
 
-
     result->Include(*bounds_a);
     result->Include(*bounds_a);
 
@@ -1678,7 +1676,7 @@ CreatePlot::verify_params(const conduit::Node &params,
         info["errors"].append() = "Missing required string parameter 'type'";
         res = false;
     }
-    params.print();
+
     if(! params.has_child("params") )
     {
         info["errors"].append() = "Missing required parameter 'params'";