Similar for C++ implementation

smiths · Feb 21, 2020 · 3c402d1 · 3c402d1
1 parent cd7e842
commit 3c402d1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/CaseStudies/noPCM/src/Cpp/Calculations.cpp b/CaseStudies/noPCM/src/Cpp/Calculations.cpp
@@ -10,9 +10,11 @@ using std::vector;
 
 vector<double> func_T_W(InputParameters inParams) {
  NoPCMODE ode = NoPCMODE(inParams.T_C, inParams.tau_W);
- vector<double> T_W(0);
+ vector<double> T_W;
  vector<double> init {inParams.T_init};
- boost::numeric::odeint::integrate_const(boost::numeric::odeint::make_controlled(inParams.A_tol, inParams.R_tol, boost::numeric::odeint::runge_kutta_dopri5<vector<double>>()), ode, init, 0.0, inParams.t_final, inParams.t_step, Populate_T_W(T_W));
+ boost::numeric::odeint::runge_kutta_dopri5<vector<double>> rk = boost::numeric::odeint::runge_kutta_dopri5<vector<double>>();
+ auto stepper = boost::numeric::odeint::make_controlled(inParams.A_tol, inParams.R_tol, rk);
+ boost::numeric::odeint::integrate_const(stepper, ode, init, 0.0, inParams.t_final, inParams.t_step, Populate_T_W(T_W));
 
  return T_W;
 }
diff --git a/CaseStudies/noPCM/src/Cpp/NoPCMODE.cpp b/CaseStudies/noPCM/src/Cpp/NoPCMODE.cpp
@@ -9,12 +9,12 @@ NoPCMODE::NoPCMODE(double T_C, double tau_W) {
  this->tau_W = tau_W;
 }
 
-void NoPCMODE::operator()(vector<double> T_W , vector<double> &dT_Wdt , double t) {
+void NoPCMODE::operator()(vector<double> T_W, vector<double> &dT_Wdt, double t) {
  dT_Wdt.at(0) = (1/tau_W) * (T_C - T_W.at(0));
 }
 
 Populate_T_W::Populate_T_W(vector<double> &T_W) : T_W(T_W) {}
 
-void Populate_T_W::operator() (vector<double> &T_W , double t) {
- this->T_W.push_back(T_W.at(0));
+void Populate_T_W::operator() (vector<double> &y , double t) {
+ this->T_W.push_back(y.at(0));
 }
diff --git a/CaseStudies/noPCM/src/Cpp/NoPCMODE.hpp b/CaseStudies/noPCM/src/Cpp/NoPCMODE.hpp
@@ -25,7 +25,7 @@ class Populate_T_W {
 
  Populate_T_W(vector<double> &T_W);
 
- void operator() (vector<double> &T_W, double t);
+ void operator() (vector<double> &y, double t);
 };
 
 #endif