encap: Rename EncapsulatedSweeperMixin to EncapSweeper.

Signed-off-by: Matthew Emmett <[email protected]>

Author: memmett

examples/advection_diffusion/ex3.cpp

@@ -53,7 +53,7 @@ int main(int argc, char **argv)
    * the 'initial' function is called once for each level to set the
    * intial conditions.
    */
-  auto initial = [] (EncapsulatedSweeperMixin<double,double> *sweeper, Encapsulation<double,double> *q0) {
+  auto initial = [] (EncapSweeper<double,double> *sweeper, Encapsulation<double,double> *q0) {
     auto* ad = dynamic_cast<AdvectionDiffusionSweeper<double,double>*>(sweeper);
     ad->exact(q0, 0.0);
   };

include/pfasst/encap/automagic.hpp

@@ -13,9 +13,9 @@ namespace pfasst {
   namespace encap {
 
     template<typename scalar, typename time>
-    using auto_build_tuple = tuple<pfasst::encap::EncapsulatedSweeperMixin<scalar,time>*,
+    using auto_build_tuple = tuple<pfasst::encap::EncapSweeper<scalar,time>*,
 				   pfasst::ITransfer*,
-				   pfasst::encap::EncapsulationFactory<scalar,time>*>;
+				   pfasst::encap::EncapFactory<scalar,time>*>;
 
     template<typename scalar, typename time, typename controllerT, typename buildT>
     void auto_build(controllerT& c, vector<pair<int,string>> nodes, buildT build) {
@@ -35,12 +35,10 @@ namespace pfasst {
     void auto_setup(controllerT& c, initialT initial) {
       c.setup();
       for (int l=0; l<c.nlevels(); l++) {
-	//	auto* sweeper = c.get_level<pfasst::encap::EncapsulatedSweeperMixin<scalar,time>>(l);
 	auto* isweeper = c.get_level(l);
-	auto* sweeper = dynamic_cast<pfasst::encap::EncapsulatedSweeperMixin<scalar,time>*>(isweeper);
+	auto* sweeper = dynamic_cast<pfasst::encap::EncapSweeper<scalar,time>*>(isweeper);
 	auto* q0 = sweeper->get_state(0);
 	initial(sweeper, q0);
-	// sweeper->exact(q0, 0.0);
       }
     }
 

include/pfasst/encap/encapsulation.hpp

@@ -50,15 +50,15 @@ namespace pfasst {
     };
 
     template<typename scalar, typename time>
-    class EncapsulationFactory {
+    class EncapFactory {
     public:
       virtual Encapsulation<scalar,time>* create(const EncapType) = 0;
     };
 
     template<typename scalar, typename time>
-    class EncapsulatedSweeperMixin : public ISweeper {
+    class EncapSweeper : public ISweeper {
       vector<scalar> nodes;
-      shared_ptr<EncapsulationFactory<scalar,time>> factory;
+      shared_ptr<EncapFactory<scalar,time>> factory;
 
     public:
 
@@ -72,12 +72,12 @@ namespace pfasst {
 	return nodes;
       }
 
-      void set_factory(EncapsulationFactory<scalar,time>* factory)
+      void set_factory(EncapFactory<scalar,time>* factory)
       {
-	this->factory = shared_ptr<EncapsulationFactory<scalar,time>>(factory);
+	this->factory = shared_ptr<EncapFactory<scalar,time>>(factory);
       }
 
-      EncapsulationFactory<scalar,time>* get_factory() const
+      EncapFactory<scalar,time>* get_factory() const
       {
 	return factory.get();
       }
@@ -132,10 +132,12 @@ namespace pfasst {
 
     public:
 
+      virtual ~PolyInterpMixin() { }
+
       virtual void interpolate(ISweeper *DST, const ISweeper *SRC, bool initial)
       {
-	auto* dst = dynamic_cast<EncapsulatedSweeperMixin<scalar,time>*>(DST);
-	auto* src = dynamic_cast<const EncapsulatedSweeperMixin<scalar,time>*>(SRC);
+	auto* dst = dynamic_cast<EncapSweeper<scalar,time>*>(DST);
+	auto* src = dynamic_cast<const EncapSweeper<scalar,time>*>(SRC);
 
 	if (tmat.size1() == 0)
 	  tmat = pfasst::compute_interp<time>(dst->get_nodes(), src->get_nodes());
@@ -174,8 +176,8 @@ namespace pfasst {
 
       virtual void restrict(ISweeper *DST, const ISweeper *SRC)
       {
-	auto* dst = dynamic_cast<EncapsulatedSweeperMixin<scalar,time>*>(DST);
-	auto* src = dynamic_cast<const EncapsulatedSweeperMixin<scalar,time>*>(SRC);
+	auto* dst = dynamic_cast<EncapSweeper<scalar,time>*>(DST);
+	auto* src = dynamic_cast<const EncapSweeper<scalar,time>*>(SRC);
 
 	auto dnodes = dst->get_nodes();
 	auto snodes = src->get_nodes();
@@ -196,8 +198,8 @@ namespace pfasst {
 
       virtual void fas(time dt, ISweeper *dst, const ISweeper *src)
       {
-	auto* crse = dynamic_cast<EncapsulatedSweeperMixin<scalar,time>*>(dst);
-	auto* fine = dynamic_cast<const EncapsulatedSweeperMixin<scalar,time>*>(src);
+	auto* crse = dynamic_cast<EncapSweeper<scalar,time>*>(dst);
+	auto* fine = dynamic_cast<const EncapSweeper<scalar,time>*>(src);
 
 	int ncrse = crse->get_nodes().size();
 	int nfine = fine->get_nodes().size();

include/pfasst/encap/imex.hpp

@@ -14,7 +14,7 @@ namespace pfasst {
     using pfasst::encap::Encapsulation;
 
     template<typename scalar, typename time>
-    class IMEX : public pfasst::encap::EncapsulatedSweeperMixin<scalar,time> {
+    class IMEX : public pfasst::encap::EncapSweeper<scalar,time> {
       vector<Encapsulation<scalar,time>*> Q, pQ, S, T, Fe, Fi;
       matrix<time> Smat, SEmat, SImat;
 

include/pfasst/encap/vector.hpp

@@ -92,7 +92,7 @@ namespace pfasst {
     };
 
     template<typename scalar, typename time>
-    class VectorFactory : public EncapsulationFactory<scalar,time> {
+    class VectorFactory : public EncapFactory<scalar,time> {
       int size;
     public:
       int dofs() { return size; }