Commits

Matt Knepley committed 538eb95

Fixed some problems with Queue evaluator

Comments (0)

Files changed (1)

src/Evaluator_Queue.hh

         const typename tree_type::CenterSection      *centers                 = tree.getCenters(l);
         const typename tree_type::CenterSection      *parentCenters           = tree.getCenters(l-1);
         const typename tree_type::InteractionSection *interactionValue        = tree.getInteractionValue(l);
-        typename tree_type::MultipoleSection         *multipoleCoefficients   = tree.getMultipoleCoefficients(l);
+        //typename tree_type::MultipoleSection         *multipoleCoefficients   = tree.getMultipoleCoefficients(l);
         typename tree_type::MultipoleSection         *tempCoefficients        = tree.getTempCoefficients(l);
         typename tree_type::MultipoleSection         *localCoefficients       = tree.getLocalCoefficients(l);
         typename tree_type::MultipoleSection         *parentLocalCoefficients = tree.getLocalCoefficients(l-1);
         for(int b = 0; b < numBoxes; ++b) {
           if (!activeBoxes->restrictPoint(b)) continue;
           const typename tree_type::CenterSection::value_type      *center = centers->restrictPoint(b);
+#if 0
           const typename tree_type::MultipoleSection::value_type   *C      = multipoleCoefficients->restrictPoint(b);
 
-#if 0
           InteractionListGenerator<dim, neighborRadius> boxes(l, b);
           int        me_box_number = b;
           point_type me_center     = center;
       const typename tree_type::CenterSection    *centers           = tree.getCenters(maxLevel);
       const typename tree_type::MultipoleSection *localCoefficients = tree.getLocalCoefficients(maxLevel);
       const typename tree_type::BlobSection      *blobs             = tree.getBlobs();
-      const typename tree_type::NeighborSection  *neighbors         = tree.getNeighbors();
+      typename tree_type::NeighborSection        *neighbors         = tree.getNeighbors();
       InPlaceQueue<l2p_task_type>                 l2p_queue;
       PetscErrorCode                              ierr;
 
       this->evaluateBlobs(tree);
       ierr = PetscLogEventEnd(this->evaluateEvent,0,0,0,0);CHKERRXX(ierr);
     };
+    template<typename BlobIterator, typename FieldIterator>
+    void evaluate(tree_type& tree, const BlobIterator& blobsBegin, const BlobIterator& blobsEnd, FieldIterator& fieldsBegin, FieldIterator& fieldsEnd) {
+      throw PETSc::Exception("Do not support different source and target points yet");
+    };
   };
 }