encap: Change set_q to set_state, get_pg to get_saved_state etc.

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

Author: memmett

include/pfasst/encap/encapsulation.hpp

@@ -61,51 +61,63 @@ namespace pfasst {
       shared_ptr<EncapsulationFactory<scalar,time>> factory;
 
     public:
-      void set_nodes(vector<time> nodes) {
+
+      void set_nodes(vector<time> nodes)
+      {
 	this->nodes = nodes;
       }
 
-      const vector<time> get_nodes() const {
+      const vector<time> get_nodes() const
+      {
 	return nodes;
       }
 
-      void set_factory(EncapsulationFactory<scalar,time>* factory) {
+      void set_factory(EncapsulationFactory<scalar,time>* factory)
+      {
 	this->factory = shared_ptr<EncapsulationFactory<scalar,time>>(factory);
       }
 
-      EncapsulationFactory<scalar,time>* get_factory() const {
+      EncapsulationFactory<scalar,time>* get_factory() const
+      {
 	return factory.get();
       }
 
-      virtual void set_q(const Encapsulation<scalar,time>* q0, unsigned int m) {
-	throw NotImplementedYet("sweeper");
+      virtual void set_state(const Encapsulation<scalar,time>* q0, unsigned int m)
+      {
+      	throw NotImplementedYet("sweeper");
       }
 
-      virtual Encapsulation<scalar,time>* get_state(unsigned int m) const {
+      virtual Encapsulation<scalar,time>* get_state(unsigned int m) const
+      {
 	throw NotImplementedYet("sweeper");
 	return NULL;
       }
 
-      virtual Encapsulation<scalar,time>* get_tau(unsigned int m) const {
+      virtual Encapsulation<scalar,time>* get_tau(unsigned int m) const
+      {
 	throw NotImplementedYet("sweeper");
 	return NULL;
       }
 
-      virtual Encapsulation<scalar,time>* get_pq(unsigned int m) const {
+      virtual Encapsulation<scalar,time>* get_saved_state(unsigned int m) const
+      {
 	throw NotImplementedYet("sweeper");
 	return NULL;
       }
 
-      virtual Encapsulation<scalar,time>* get_qend() {
+      virtual Encapsulation<scalar,time>* get_end_state()
+      {
 	return this->get_state(this->get_nodes().size()-1);
       }
 
-      virtual void evaluate(int m) {
+      virtual void evaluate(int m)
+      {
 	throw NotImplementedYet("sweeper");
       }
 
-      virtual void advance() {
-	this->set_q(this->get_qend(), 0);
+      virtual void advance()
+      {
+	this->set_state(this->get_end_state(), 0);
       }
 
       virtual void integrate(Encapsulation<scalar,time>* dst, time dt) {
@@ -147,7 +159,7 @@ namespace pfasst {
 	  if (initial)
 	    crse_tmp->saxpy(-1.0, src->get_state(0));
 	  else
-	    crse_tmp->saxpy(-1.0, src->get_pq(m));
+	    crse_tmp->saxpy(-1.0, src->get_saved_state(m));
 	  interpolate(fine_tmp[m], crse_tmp);
 	}
 	delete crse_tmp;

include/pfasst/encap/imex.hpp

@@ -20,15 +20,16 @@ namespace pfasst {
 
     public:
 
-      ~IMEX() {
+      ~IMEX()
+      {
 	for (int m=0; m<Q.size(); m++) delete Q[m];
 	for (int m=0; m<pQ.size(); m++) delete pQ[m];
 	for (int m=0; m<S.size(); m++) delete S[m];
 	for (int m=0; m<Fe.size(); m++) delete Fe[m];
 	for (int m=0; m<Fi.size(); m++) delete Fi[m];
       }
 
-      void set_q(const Encapsulation<scalar,time> *q0, unsigned int m)
+      void set_state(const Encapsulation<scalar,time> *q0, unsigned int m)
       {
 	Q[m]->copy(q0);
       }
@@ -43,16 +44,13 @@ namespace pfasst {
 	return T[m];
       }
 
-      Encapsulation<scalar,time>* get_pq(unsigned int m) const
+      Encapsulation<scalar,time>* get_saved_state(unsigned int m) const
       {
 	return pQ[m];
       }
 
-      void advance() const {
-	set_q(get_state(Q.size()-1), 0);
-      }
-
-      void setup(bool coarse) {
+      void setup(bool coarse)
+      {
 	auto nodes = this->get_nodes();
 
 	Smat = compute_quadrature(nodes, nodes, 's');
@@ -115,7 +113,8 @@ namespace pfasst {
 	delete rhs;
       }
 
-      virtual void predict(time t0, time dt) {
+      virtual void predict(time t0, time dt)
+      {
 	const auto nodes  = this->get_nodes();
 	const int  nnodes = nodes.size();