add box sample

Author: nicolemarsaglia

src/libs/ascent/runtimes/flow_filters/ascent_runtime_vtkh_filters.cpp

@@ -3858,20 +3858,11 @@ VTKHUniformGrid::execute()
     std::string topo_name = collection->field_topology(field);
     vtkh::DataSet &data = collection->dataset_by_topology(topo_name);
     vtkm::Id global_cells = data.GetGlobalNumberOfCells();
-    std::cerr << "global number of cells: " << global_cells << std::endl;
-    std::cerr << "print data: " <<std::endl;
-    data.PrintSummary(std::cerr);
-    std::cerr << "print data ENDDDDDDDDDDDDD" <<std::endl;
 
     vtkm::Bounds d_bounds = data.GetGlobalBounds();
     vtkm::Float64 x_extents = d_bounds.X.Length() + 1; //add one b/c we are
     vtkm::Float64 y_extents = d_bounds.Y.Length() + 1; //setting num points
     vtkm::Float64 z_extents = d_bounds.Z.Length() + 1; //(not cells) in each dim
-    std::cerr << " x cells: " << global_cells/((z_extents-1)*(y_extents-1)) << std::endl;
-    std::cerr << " y cells: " << global_cells/((z_extents-1)*(x_extents-1)) << std::endl;
-    std::cerr << " z cells: " << global_cells/((x_extents-1)*(y_extents-1)) << std::endl;
-    std::cerr << "extents: " << x_extents << " " << y_extents << " " << z_extents << std::endl;
-    std::cerr << "extents: " << x_extents << " " << y_extents << " " << z_extents << std::endl;
 
     vtkm::Float64 invalid_value = 0.0;
 

src/libs/vtkh/filters/Sample.cpp

@@ -781,10 +781,6 @@ Sample::DoExecute()
   const int num_domains = domain_ids.size();
 
 #if _DEBUG 
-  std::cerr << "m_dims: " << m_dims[0] << " " << m_dims[1] << " " << m_dims[2] << std::endl;
-  std::cerr << "m_origin: " << m_origin[0] << " " << m_origin[1] << " " << m_origin[2] << std::endl;
-  std::cerr << "m_spacing: " << m_spacing[0] << " " << m_spacing[1] << " " << m_spacing[2] << std::endl;
-  std::cerr << "input num cells: " << m_input->GetGlobalNumberOfCells() << std::endl; 
 #ifdef VTKH_PARALLEL
   std::cerr << "par rank " << par_rank << " num domains: " << num_domains << std::endl;
 #endif
@@ -964,7 +960,6 @@ Sample::Box(int *dims,
 
 {
   int num_samples = dims[0]*dims[1]*dims[2];
-  std::cerr << "num_samples: "  << num_samples << std::endl;
 
   // alloc array handles to hold num_samples
   // alloc xs, ys, zs
@@ -979,16 +974,19 @@ Sample::Box(int *dims,
   const int Nx = dims[0];
   const int Ny = dims[1];
   const int Nz = dims[2];
+  //unset *_start&*_end are both set to (max-min)/2
+  const double dx = (Nx > 1) ? (x_end - x_start) / double(Nx - 1) : 0.0;
+  const double dy = (Ny > 1) ? (y_end - y_start) / double(Ny - 1) : 0.0;
+  const double dz = (Nz > 1) ? (z_end - z_start) / double(Nz - 1) : 0.0;
+
+#if _DEBUG 
   std::cerr << "Nx: " << Nx << " Ny: " << Ny << " Nz: " << Nz << std::endl;
 
   std::cerr << "x_start: " << x_start << " x_end: " << x_end << std::endl;
   std::cerr << "y_start: " << y_start << " y_end: " << y_end << std::endl;
   std::cerr << "z_start: " << z_start << " z_end: " << z_end << std::endl;
-  //unset *_start&*_end are both set to (max-min)/2
-  const double dx = (Nx > 1) ? (x_end - x_start) / double(Nx - 1) : 0.0;
-  const double dy = (Ny > 1) ? (y_end - y_start) / double(Ny - 1) : 0.0;
-  const double dz = (Nz > 1) ? (z_end - z_start) / double(Nz - 1) : 0.0;
   std::cerr << "dx: " << dx << " dy: " << dy << " dz: " << dz << std::endl;
+#endif
 
   int idx = 0;
   for (int i = 0; i < Nx; ++i)
@@ -1003,8 +1001,10 @@ Sample::Box(int *dims,
         x_portal.Set(idx, x);
         y_portal.Set(idx, y);
         z_portal.Set(idx, z);
+#if _DEBUG 
         std::cerr << "i: " << i << " j: " << j << " k: " << k << " x: " << x << " y: " << y << " z: " << z << std::endl;
         std::cerr << "idx: " << idx << std::endl;
+#endif
         idx++;
       }
     }

src/libs/vtkh/vtkm_filters/vtkmProbe.cpp

@@ -103,7 +103,7 @@ vtkmProbe::Run(vtkm::cont::DataSet &input)
           ds_probe.AddCoordinateSystem(vtkm::cont::CoordinateSystem("coords",
                                        make_ArrayHandleSOA(m_points_xs,
                                                            m_points_ys,
-                                                           m_points_xs)));
+                                                           m_points_zs)));
       }
       else if(spatial_dims == 2)
       {

src/tests/ascent/t_ascent_sample.cpp

@@ -401,9 +401,9 @@ TEST(ascent_sample, box_3d)
           fields: ["braid"]
           box:
             dims:
-              i: 10.0
-              j: 10.0
-              k: 10.0
+              i: 5.0
+              j: 5.0
+              k: 5.0
             max:
               x: max 
               y: max 
@@ -413,6 +413,15 @@ TEST(ascent_sample, box_3d)
               y: 0.0
               z: 0.0
           invalid_value: -10.0
+- 
+  action: "add_scenes"
+  scenes: 
+    s1:
+      plots:
+        p1:
+          type: "pseudocolor"
+          field: "braid"
+          pipeline: pl1
 - 
   action: "add_extracts"
   extracts: 
@@ -424,7 +433,8 @@ TEST(ascent_sample, box_3d)
 )xyzxyz";
     conduit::Node actions;
     actions.parse(acts_str,"yaml");
-    actions[1]["extracts/e1/params/path"] = output_file;
+    actions[1]["scenes/s1/image_prefix"] = output_file;
+    actions[2]["extracts/e1/params/path"] = output_file;
     //actions.print();
 
     //