Revert "Merge pull request #161 from JaredCrean2/jc_generalize_accumulate2"

This reverts commit 70d9f1c, reversing
changes made to 06f2b77.

Author: cwsmith

apf/apf.cc

@@ -424,16 +424,11 @@ void synchronize(Field* f, Sharing* shr)
   synchronizeFieldData<double>(f->getData(), shr);
 }
 
-void accumulate(Field* f, Sharing* shr, bool delete_shr)
+void accumulate(Field* f, Sharing* shr)
 {
-  sharedReduction(f, shr, delete_shr, ReductionSum<double>() );
+  accumulateFieldData(f->getData(), shr);
 }
 
-void sharedReduction(Field* f, Sharing* shr, bool delete_shr, 
-            const ReductionOp<double>& reduce_op )
-{
-  reduceFieldData(f->getData(), shr, delete_shr, reduce_op);
-}
 void fail(const char* why)
 {
   fprintf(stderr,"APF FAILED: %s\n",why);

apf/apf.h

@@ -37,50 +37,6 @@ class VectorElement;
 typedef VectorElement MeshElement;
 class FieldShape;
 struct Sharing;
-template <class T> class ReductionOp;
-template <class T> class ReductionSum;
-
-/** \brief Base class for applying operations to make a Field consistent
-  * in parallel 
-  * \details This function gets applied pairwise to the Field values
-  * from every partition, resulting in a single unique value.  No guarantees
-  * are made about the order in which this function is applied to the
-  * values.
-  */
-template <class T>
-class ReductionOp
-{
-  public:
-    /* \brief apply operation, returning a single value */
-    virtual T apply(T val1, T val2) const = 0;
-};
-
-template <class T>
-class ReductionSum : public ReductionOp<T>
-{
-  T apply(T val1, T val2) const { return val1 + val2; };
-};
-
-template <class T>
-class ReductionMin : public ReductionOp<T>
-{
-  T apply(T val1, T val2) const { return ( (val1 < val2) ? val1 : val2 ); };
-};
-
-template <class T>
-class ReductionMax : public ReductionOp<T>
-{
-  T apply(T val1, T val2) const { return ( (val1 < val2) ? val2 : val1 ); };
-};
-
-
-/* instantiate (is this necessary with the global consts below?) */
-template class ReductionSum<double>;
-template class ReductionMin<double>;
-template class ReductionMax<double>;
-
-
-
 
 /** \brief Destroys an apf::Mesh.
   *
@@ -669,16 +625,7 @@ void synchronize(Field* f, Sharing* shr = 0);
   all copies of an entity and assign the sum as the
   value for all copies.
   */
-void accumulate(Field* f, Sharing* shr = 0, bool delete_shr = false);
-
-/** \brief Apply a reduction operator along a partition boundary
-  \details Using the copies described by an apf::Sharing object, applies
-  the specified operation pairwise to the values of the field on each
-  partition.  No guarantee is made about the order of the pairwise
-  application.
-  */
-void sharedReduction(Field* f, Sharing* shr = 0, bool delete_shr=false,
-            const ReductionOp<double>& reduce_op = ReductionSum<double>());
+void accumulate(Field* f, Sharing* shr = 0);
 
 /** \brief Declare failure of code inside APF.
   \details This function prints the string as an APF

apf/apfFieldData.cc

@@ -81,7 +81,7 @@ template void synchronizeFieldData<int>(FieldDataOf<int>*, Sharing*, bool);
 template void synchronizeFieldData<double>(FieldDataOf<double>*, Sharing*, bool);
 template void synchronizeFieldData<long>(FieldDataOf<long>*, Sharing*, bool);
 
-void reduceFieldData(FieldDataOf<double>* data, Sharing* shr, bool delete_shr, const ReductionOp<double>& reduce_op /* =ReductionSum<double>() */)
+void accumulateFieldData(FieldDataOf<double>* data, Sharing* shr, bool delete_shr)
 {
   FieldBase* f = data->getField();
   Mesh* m = f->getMesh();
@@ -91,26 +91,26 @@ void reduceFieldData(FieldDataOf<double>* data, Sharing* shr, bool delete_shr, c
     shr = getSharing(m);
     delete_shr=true;
   }
-
   for (int d=0; d < 4; ++d)
   {
     if ( ! s->hasNodesIn(d))
       continue;
-
     MeshEntity* e;
     MeshIterator* it = m->begin(d);
     PCU_Comm_Begin();
     while ((e = m->iterate(it)))
     {
-      if (( ! data->hasEntity(e)) || m->isGhost(e) )
-        continue; /* send to all parts that can see this entity */
+      if (( ! data->hasEntity(e)) || m->isGhost(e) ||
+          (shr->isOwned(e)))
+        continue; /* non-owners send to owners */
 
       CopyArray copies;
       shr->getCopies(e, copies);
       int n = f->countValuesOn(e);
       NewArray<double> values(n);
       data->get(e,&(values[0]));
-
+      /* actually, non-owners send to all others,
+         since apf::Sharing doesn't identify the owner */
       for (size_t i = 0; i < copies.getSize(); ++i)
       {
         PCU_COMM_PACK(copies[i].peer, copies[i].entity);
@@ -121,7 +121,8 @@ void reduceFieldData(FieldDataOf<double>* data, Sharing* shr, bool delete_shr, c
     PCU_Comm_Send();
     while (PCU_Comm_Listen())
       while ( ! PCU_Comm_Unpacked())
-      { /* receive and apply reduction */
+      { /* receive and add. we only care about correctness
+           on the owners */
         MeshEntity* e;
         PCU_COMM_UNPACK(e);
         int n = f->countValuesOn(e);
@@ -130,15 +131,11 @@ void reduceFieldData(FieldDataOf<double>* data, Sharing* shr, bool delete_shr, c
         PCU_Comm_Unpack(&(inValues[0]),n*sizeof(double));
         data->get(e,&(values[0]));
         for (int i = 0; i < n; ++i)
-        {
-          values[i] = reduce_op.apply(values[i], inValues[i]);
-        }
+          values[i] += inValues[i];
         data->set(e,&(values[0]));
       }
-  }
-
-  // every partition did the reduction, so no need to broadcast result 
-  if (delete_shr) delete shr;
+  } /* broadcast back out to non-owners */
+  synchronizeFieldData(data, shr, delete_shr);
 }
 
 template <class T>

apf/apfFieldData.h

@@ -11,10 +11,7 @@
 #include <string>
 #include "apfField.h"
 #include "apfShape.h"
-#include "apf.h"  // needed for ReductionOp
 
-#include <fstream>  // DEBUGGING
-#include <iostream>
 namespace apf {
 
 class FieldData
@@ -38,7 +35,7 @@ class FieldDataOf;
 template <class T>
 void synchronizeFieldData(FieldDataOf<T>* data, Sharing* shr, bool delete_shr=false);
 
-void reduceFieldData(FieldDataOf<double>* data, Sharing* shr, bool delete_shr=false, const ReductionOp<double>& reduce_op=ReductionSum<double>());
+void accumulateFieldData(FieldDataOf<double>* data, Sharing* shr, bool delete_shr=false);
 
 template <class T>
 void copyFieldData(FieldDataOf<T>* from, FieldDataOf<T>* to);
@@ -60,7 +57,6 @@ class FieldDataOf : public FieldData
     int getElementData(MeshEntity* entity, NewArray<T>& data);
 };
 
-
 } //namespace apf
 
 #endif

pumi/pumi_field.cc

@@ -135,7 +135,7 @@ void pumi_field_synchronize(pField f, pOwnership o)
 
 void pumi_field_accumulate(pField f, pOwnership o)
 {  
-  apf::reduceFieldData(f->getData(), o, false);
+  apf::accumulateFieldData(f->getData(), o, false);
 }
 
 void pumi_field_freeze(pField f)

test/CMakeLists.txt

@@ -165,7 +165,6 @@ test_exe_func(poisson poisson.cc)
 test_exe_func(ph_adapt ph_adapt.cc)
 test_exe_func(assert_timing assert_timing.cc)
 test_exe_func(create_mis create_mis.cc)
-test_exe_func(fieldReduce fieldReduce.cc)
 if(ENABLE_DSP)
   test_exe_func(graphdist graphdist.cc)
   test_exe_func(moving moving.cc)