Tidy VectorEncapsulation, remove nbytes().

Author: memmett

examples/ad/main.cpp

@@ -56,13 +56,8 @@ class ADIMEX : public pfasst::imex::IMEX<time> {
 
 public:
 
-  ADIMEX(vector<time> nodes, pfasst::encap::VectorFactory<time> *factory)
+  ADIMEX(int nvars)
   {
-    this->set_nodes(nodes);
-    this->set_factory(factory);
-
-    int nvars = factory->dofs();
-
     // XXX: this fft stuff almost certainly DOES NOT work when 'scalar' is not 'double'
     wk   = fftw_alloc_complex(nvars);
     ffft = fftw_plan_dft_1d(nvars, wk, wk, FFTW_FORWARD, FFTW_ESTIMATE);
@@ -115,7 +110,7 @@ class ADIMEX : public pfasst::imex::IMEX<time> {
       if (d > max)
 	max = d;
     }
-    cout << "err: " << max << endl;
+    cout << "err: " << scientific << max << endl;
   }
 
   void f1eval(Encapsulation *F, Encapsulation *Q, time t)
@@ -192,7 +187,10 @@ int main(int argc, char **argv)
 
     auto  nodes   = pfasst::compute_nodes<scalar>(nnodes, "gauss-lobatto");
     auto* factory = new pfasst::encap::VectorFactory<scalar>(ndofs);
-    auto* sweeper = new ADIMEX<scalar>(nodes, factory);
+    auto* sweeper = new ADIMEX<scalar>(ndofs);
+
+    sweeper->set_nodes(nodes);
+    sweeper->set_factory(factory);
 
     sdc.add_level(sweeper);
     sdc.set_duration(dt, nsteps, 4);

src/pfasst-encapsulated.hpp

@@ -34,9 +34,6 @@ namespace pfasst {
       }
 
       // required for time-parallel communications
-      virtual unsigned int nbytes() {
-	throw NotImplementedYet("pfasst");
-      }
       virtual void send() {
 	throw NotImplementedYet("pfasst");
       }

src/pfasst-vector.hpp

@@ -18,22 +18,18 @@ namespace pfasst {
     template<typename scalar>
     struct VectorEncapsulation : public vector<scalar>, public Encapsulation {
       VectorEncapsulation(int size) : vector<scalar>(size) { }
-      virtual unsigned int nbytes() const {
-	return sizeof(scalar) * this->size();
-      }
       void setval(scalar v) {
-	for (int i=0; i<this->size(); i++)
-	  (*this)[i] = v;
+	std::fill(this->begin(), this->end(), v);
       }
       void copy(const Encapsulation* X) {
 	const auto* x = dynamic_cast<const VectorEncapsulation*>(X);
-	for (int i=0; i<this->size(); i++)
-	  (*this)[i] = (*x)[i];
+	std::copy(x->begin(), x->end(), this->begin());
       }
       void saxpy(double a, const Encapsulation *X) {
-	const auto* x = dynamic_cast<const VectorEncapsulation*>(X);
-	for (int i=0; i<this->size(); i++)
-	  (*this)[i] += a * (*x)[i];
+	const auto& x = *dynamic_cast<const VectorEncapsulation*>(X);
+	auto&       y = *this;
+	for (int i=0; i<y.size(); i++)
+	  y[i] += a * x[i];
       }
     };