From cc693c93f5eeb39ae9748409333739adf9f9edb6 Mon Sep 17 00:00:00 2001 From: Zhe Li Date: Tue, 12 Apr 2022 12:49:28 +1000 Subject: [PATCH] fix a few syntax bugs and build passed --- models/MultiPhysController.cpp | 13 +++++++------ tests/lbpm_nernst_planck_simulator.cpp | 6 +++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/models/MultiPhysController.cpp b/models/MultiPhysController.cpp index 9120471b..dc361717 100644 --- a/models/MultiPhysController.cpp +++ b/models/MultiPhysController.cpp @@ -154,20 +154,21 @@ vector ScaLBL_Multiphys_Controller::getIonNumIter_PNP_coupling( vector ScaLBL_Multiphys_Controller::getIonNumIter_NernstPlanck_coupling( const vector &IonTimeConv) { //Return number of internal iterations for the Ion transport solver + vector TimeConv; + TimeConv.assign(IonTimeConv.begin(), IonTimeConv.end()); vector num_iter_ion; - vector::iterator it_max = - max_element(IonTimeConv.begin(), IonTimeConv.end()); - unsigned int idx_max = distance(IonTimeConv.begin(), it_max); + vector::iterator it_max = max_element(TimeConv.begin(), TimeConv.end()); + unsigned int idx_max = distance(TimeConv.begin(), it_max); if (idx_max == 0) { num_iter_ion.push_back(2); - for (unsigned int idx = 1; idx < IonTimeConv.size(); idx++) { + for (unsigned int idx = 1; idx < TimeConv.size(); idx++) { double temp = 2 * TimeConv[idx_max] / TimeConv [idx]; //the factor 2 is the number of iterations for the element has max time_conv num_iter_ion.push_back(int(round(temp / 2) * 2)); } - } else if (idx_max == IonTimeConv.size() - 1) { + } else if (idx_max == TimeConv.size() - 1) { for (unsigned int idx = 0; idx < TimeConv.size() - 1; idx++) { double temp = 2 * TimeConv[idx_max] / @@ -185,7 +186,7 @@ vector ScaLBL_Multiphys_Controller::getIonNumIter_NernstPlanck_coupling( num_iter_ion.push_back(int(round(temp / 2) * 2)); } num_iter_ion.push_back(2); - for (unsigned int idx = idx_max + 1; idx < IonTimeConv.size(); idx++) { + for (unsigned int idx = idx_max + 1; idx < TimeConv.size(); idx++) { double temp = 2 * TimeConv[idx_max] / TimeConv diff --git a/tests/lbpm_nernst_planck_simulator.cpp b/tests/lbpm_nernst_planck_simulator.cpp index bc697bd9..8ded39e1 100644 --- a/tests/lbpm_nernst_planck_simulator.cpp +++ b/tests/lbpm_nernst_planck_simulator.cpp @@ -72,8 +72,8 @@ int main(int argc, char **argv) //----------------------------------- print out for debugging ------------------------------------------// if (rank==0){ - for (size_t i=0;i