integrate over non-mesh dimension

jacobmerson · jacobmerson · commit ee1683772e49 · 2018-10-18T14:26:25.000-04:00
closes #190
diff --git a/apf/apf.h b/apf/apf.h
@@ -411,8 +411,13 @@ class Integrator
     /** \brief Construct an Integrator given an order of accuracy. */
     Integrator(int o);
     virtual ~Integrator();
-    /** \brief Run the Integrator over the local Mesh. */
-    void process(Mesh* m);
+    /** \brief Run the Integrator over the local Mesh.
+     * \param m mesh to integrate over
+     * \param dim optional dimension to integrate over. This defaults to
+     * integration over the mesh dimesion which may not be correct e.g. in the case
+     * of a 1D element embeded in 3D space.
+     * */
+    void process(Mesh* m, int dim=-1);
     /** \brief Run the Integrator over a Mesh Element. */
     void process(MeshElement* e);
     /** \brief User callback: element entry.
diff --git a/apf/apfIntegrate.cc b/apf/apfIntegrate.cc
@@ -8,6 +8,7 @@
 #include "apfIntegrate.h"
 #include "apfMesh.h"
 #include "apf.h"
+#include "pcu_util.h"
 
 namespace apf {
 
@@ -640,9 +641,11 @@ void Integrator::parallelReduce()
 {
 }
 
-void Integrator::process(Mesh* m)
+void Integrator::process(Mesh* m, int d)
 {
-  int d = m->getDimension();
+  if(d<0)
+    d = m->getDimension();
+  PCU_DEBUG_ASSERT(d<=m->getDimension());
   MeshEntity* entity;
   MeshIterator* elements = m->begin(d);
   while ((entity = m->iterate(elements)))

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`#include "apfIntegrate.h"`
`9`	`9`	`#include "apfMesh.h"`
`10`	`10`	`#include "apf.h"`
	`11`	`+#include "pcu_util.h"`
`11`	`12`
`12`	`13`	`namespace apf {`
`13`	`14`
`@@ -640,9 +641,11 @@ void Integrator::parallelReduce()`
`640`	`641`	`{`
`641`	`642`	`}`
`642`	`643`
`643`		`-void Integrator::process(Mesh* m)`
	`644`	`+void Integrator::process(Mesh* m, int d)`
`644`	`645`	`{`
`645`		`- int d = m->getDimension();`
	`646`	`+ if(d<0)`
	`647`	`+ d = m->getDimension();`
	`648`	`+ PCU_DEBUG_ASSERT(d<=m->getDimension());`
`646`	`649`	`MeshEntity* entity;`
`647`	`650`	`MeshIterator* elements = m->begin(d);`
`648`	`651`	`while ((entity = m->iterate(elements)))`