scalar: Update to new naming convention.

Matthew Emmett · Matthew Emmett · commit ed178fbe0090 · 2014-08-06T09:57:09.000-07:00
diff --git a/examples/scalar/scalar_sweeper.hpp b/examples/scalar/scalar_sweeper.hpp
@@ -75,8 +75,10 @@ class ScalarSweeper : public pfasst::encap::IMEXSweeper<time>
       exact(q, t);
     }
 
-    void f1eval(shared_ptr<Encapsulation> f_encap, shared_ptr<Encapsulation> q_encap, time) override
+    void f_expl_eval(shared_ptr<Encapsulation> f_encap,
+                     shared_ptr<Encapsulation> q_encap, time t) override
     {
+      UNUSED(t);
       auto& f = pfasst::encap::as_vector<complex<double>,time>(f_encap);
       auto& q = pfasst::encap::as_vector<complex<double>,time>(q_encap);
 
@@ -85,8 +87,10 @@ class ScalarSweeper : public pfasst::encap::IMEXSweeper<time>
       this->_nf1eval++;
     }
 
-    void f2eval(shared_ptr<Encapsulation> f_encap, shared_ptr<Encapsulation> q_encap, time) override
+    void f_impl_eval(shared_ptr<Encapsulation> f_encap,
+                     shared_ptr<Encapsulation> q_encap, time t) override
     {
+      UNUSED(t);
       auto& f = pfasst::encap::as_vector<complex<double>,time>(f_encap);
       auto& q = pfasst::encap::as_vector<complex<double>,time>(q_encap);
 
@@ -95,9 +99,11 @@ class ScalarSweeper : public pfasst::encap::IMEXSweeper<time>
       this->_nf2eval++;
     }
 
-    void f2comp(shared_ptr<Encapsulation> f_encap, shared_ptr<Encapsulation> q_encap, time, time dt,
-                shared_ptr<Encapsulation> rhs_encap) override
+    void impl_solve(shared_ptr<Encapsulation> f_encap,
+                    shared_ptr<Encapsulation> q_encap, time t, time dt,
+                    shared_ptr<Encapsulation> rhs_encap) override
     {
+      UNUSED(t);
       auto& f = pfasst::encap::as_vector<complex<double>,time>(f_encap);
       auto& q = pfasst::encap::as_vector<complex<double>,time>(q_encap);
       auto& rhs = pfasst::encap::as_vector<complex<double>,time>(rhs_encap);

Original file line number	Diff line number	Diff line change
`@@ -75,8 +75,10 @@ class ScalarSweeper : public pfasst::encap::IMEXSweeper<time>`
`75`	`75`	`exact(q, t);`
`76`	`76`	`}`
`77`	`77`
`78`		`- void f1eval(shared_ptr<Encapsulation> f_encap, shared_ptr<Encapsulation> q_encap, time) override`
	`78`	`+ void f_expl_eval(shared_ptr<Encapsulation> f_encap,`
	`79`	`+ shared_ptr<Encapsulation> q_encap, time t) override`
`79`	`80`	`{`
	`81`	`+ UNUSED(t);`
`80`	`82`	`auto& f = pfasst::encap::as_vector<complex<double>,time>(f_encap);`
`81`	`83`	`auto& q = pfasst::encap::as_vector<complex<double>,time>(q_encap);`
`82`	`84`
`@@ -85,8 +87,10 @@ class ScalarSweeper : public pfasst::encap::IMEXSweeper<time>`
`85`	`87`	`this->_nf1eval++;`
`86`	`88`	`}`
`87`	`89`
`88`		`- void f2eval(shared_ptr<Encapsulation> f_encap, shared_ptr<Encapsulation> q_encap, time) override`
	`90`	`+ void f_impl_eval(shared_ptr<Encapsulation> f_encap,`
	`91`	`+ shared_ptr<Encapsulation> q_encap, time t) override`
`89`	`92`	`{`
	`93`	`+ UNUSED(t);`
`90`	`94`	`auto& f = pfasst::encap::as_vector<complex<double>,time>(f_encap);`
`91`	`95`	`auto& q = pfasst::encap::as_vector<complex<double>,time>(q_encap);`
`92`	`96`
`@@ -95,9 +99,11 @@ class ScalarSweeper : public pfasst::encap::IMEXSweeper<time>`
`95`	`99`	`this->_nf2eval++;`
`96`	`100`	`}`
`97`	`101`
`98`		`- void f2comp(shared_ptr<Encapsulation> f_encap, shared_ptr<Encapsulation> q_encap, time, time dt,`
`99`		`- shared_ptr<Encapsulation> rhs_encap) override`
	`102`	`+ void impl_solve(shared_ptr<Encapsulation> f_encap,`
	`103`	`+ shared_ptr<Encapsulation> q_encap, time t, time dt,`
	`104`	`+ shared_ptr<Encapsulation> rhs_encap) override`
`100`	`105`	`{`
	`106`	`+ UNUSED(t);`
`101`	`107`	`auto& f = pfasst::encap::as_vector<complex<double>,time>(f_encap);`
`102`	`108`	`auto& q = pfasst::encap::as_vector<complex<double>,time>(q_encap);`
`103`	`109`	`auto& rhs = pfasst::encap::as_vector<complex<double>,time>(rhs_encap);`