From c3c80f79fb83d59bbe8051758383be3d9401bcc3 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Mon, 27 Jul 2015 17:41:21 -0400 Subject: [PATCH] Remove extraneous parentheses --- include/cantera/base/Array.h | 4 +- include/cantera/base/utilities.h | 2 +- include/cantera/numerics/Func1.h | 26 ++++---- src/base/xml.cpp | 2 +- src/equil/vcs_MultiPhaseEquil.cpp | 4 +- src/equil/vcs_VolPhase.cpp | 2 +- src/equil/vcs_elem_rearrange.cpp | 4 +- src/equil/vcs_inest.cpp | 4 +- src/equil/vcs_phaseStability.cpp | 4 +- src/equil/vcs_report.cpp | 6 +- src/equil/vcs_rxnadj.cpp | 4 +- src/equil/vcs_solve.cpp | 2 +- src/equil/vcs_solve_TP.cpp | 62 +++++++++---------- src/kinetics/solveSP.cpp | 2 +- src/numerics/BandMatrix.cpp | 10 +-- src/numerics/DenseMatrix.cpp | 12 ++-- src/numerics/Func1.cpp | 2 +- src/numerics/SquareMatrix.cpp | 18 +++--- src/oneD/boundaries1D.cpp | 2 +- src/thermo/HMWSoln_input.cpp | 6 +- src/thermo/IdealGasPhase.cpp | 2 +- src/thermo/IonsFromNeutralVPSSTP.cpp | 2 +- src/thermo/LatticeSolidPhase.cpp | 10 +-- src/thermo/MargulesVPSSTP.cpp | 2 +- src/thermo/MixtureFugacityTP.cpp | 2 +- src/thermo/PDSS.cpp | 22 +++---- src/thermo/PDSS_ConstVol.cpp | 2 +- src/thermo/PDSS_HKFT.cpp | 2 +- src/thermo/PDSS_IonsFromNeutral.cpp | 2 +- src/thermo/PDSS_SSVol.cpp | 12 ++-- src/thermo/Phase.cpp | 20 +++--- src/thermo/RedlichKwongMFTP.cpp | 2 +- src/thermo/SpeciesThermoFactory.cpp | 2 +- src/thermo/SurfPhase.cpp | 2 +- src/thermo/WaterSSTP.cpp | 4 +- src/transport/LiquidTransport.cpp | 2 +- src/transport/SimpleTransport.cpp | 4 +- .../cathermo/HMW_graph_GvT/Gex_standalone.cpp | 2 +- 38 files changed, 137 insertions(+), 137 deletions(-) diff --git a/include/cantera/base/Array.h b/include/cantera/base/Array.h index cc075c85c..177b4ec6d 100644 --- a/include/cantera/base/Array.h +++ b/include/cantera/base/Array.h @@ -344,7 +344,7 @@ public: * @return Returns a pointer to the top of the column */ doublereal* ptrColumn(size_t j) { - return &(m_data[m_nrows*j]); + return &m_data[m_nrows*j]; } //! Return a const pointer to the top of column j, columns are contiguous @@ -355,7 +355,7 @@ public: * @return Returns a const pointer to the top of the column */ const doublereal* ptrColumn(size_t j) const { - return &(m_data[m_nrows*j]); + return &m_data[m_nrows*j]; } protected: diff --git a/include/cantera/base/utilities.h b/include/cantera/base/utilities.h index 8ba3b5545..986852729 100644 --- a/include/cantera/base/utilities.h +++ b/include/cantera/base/utilities.h @@ -512,7 +512,7 @@ void deepStdVectorPointerCopy(const std::vector &fromVec, std::vector &t toVec.resize(is); for (size_t i = 0; i < is; i++) { if (fromVec[i]) { - toVec[i] = new D(*(fromVec[i])); + toVec[i] = new D(*fromVec[i]); } else { toVec[i] = 0; } diff --git a/include/cantera/numerics/Func1.h b/include/cantera/numerics/Func1.h index 9b2535cdb..672a5d92c 100644 --- a/include/cantera/numerics/Func1.h +++ b/include/cantera/numerics/Func1.h @@ -350,8 +350,8 @@ public: return *this; } Func1::operator=(right); - m_f1 = &(m_f1->duplicate()); - m_f2 = &(m_f2->duplicate()); + m_f1 = &m_f1->duplicate(); + m_f2 = &m_f2->duplicate(); m_f1->setParent(this); m_f2->setParent(this); m_parent = 0; @@ -413,8 +413,8 @@ public: return *this; } Func1::operator=(right); - m_f1 = &(m_f1->duplicate()); - m_f2 = &(m_f2->duplicate()); + m_f1 = &m_f1->duplicate(); + m_f2 = &m_f2->duplicate(); m_f1->setParent(this); m_f2->setParent(this); m_parent = 0; @@ -475,8 +475,8 @@ public: return *this; } Func1::operator=(right); - m_f1 = &(m_f1->duplicate()); - m_f2 = &(m_f2->duplicate()); + m_f1 = &m_f1->duplicate(); + m_f2 = &m_f2->duplicate(); m_f1->setParent(this); m_f2->setParent(this); m_parent = 0; @@ -538,7 +538,7 @@ public: return *this; } Func1::operator=(right); - m_f1 = &(m_f1->duplicate()); + m_f1 = &m_f1->duplicate(); m_f1->setParent(this); m_parent = 0; return *this; @@ -614,7 +614,7 @@ public: return *this; } Func1::operator=(right); - m_f1 = &(m_f1->duplicate()); + m_f1 = &m_f1->duplicate(); m_f1->setParent(this); m_parent = 0; return *this; @@ -675,8 +675,8 @@ public: return *this; } Func1::operator=(right); - m_f1 = &(m_f1->duplicate()); - m_f2 = &(m_f2->duplicate()); + m_f1 = &m_f1->duplicate(); + m_f2 = &m_f2->duplicate(); m_f1->setParent(this); m_f2->setParent(this); m_parent = 0; @@ -743,8 +743,8 @@ public: return *this; } Func1::operator=(right); - m_f1 = &(m_f1->duplicate()); - m_f2 = &(m_f2->duplicate()); + m_f1 = &m_f1->duplicate(); + m_f2 = &m_f2->duplicate(); m_f1->setParent(this); m_f2->setParent(this); m_parent = 0; @@ -1038,7 +1038,7 @@ public: return *this; } Func1::operator=(right); - m_func = &(right.m_func->duplicate()); + m_func = &right.m_func->duplicate(); return *this; } diff --git a/src/base/xml.cpp b/src/base/xml.cpp index 7be7e9656..28f9668f6 100644 --- a/src/base/xml.cpp +++ b/src/base/xml.cpp @@ -329,7 +329,7 @@ XML_Node::XML_Node(const std::string& nm, XML_Node* const parent_) : if (!parent_) { m_root = this; } else { - m_root = &(parent_->root()); + m_root = &parent_->root(); } } diff --git a/src/equil/vcs_MultiPhaseEquil.cpp b/src/equil/vcs_MultiPhaseEquil.cpp index 32cde8b5a..f03727243 100644 --- a/src/equil/vcs_MultiPhaseEquil.cpp +++ b/src/equil/vcs_MultiPhaseEquil.cpp @@ -786,7 +786,7 @@ int vcs_Cantera_to_vprob(MultiPhase* mphase, VCS_PROB* vprob) /* * Get the ThermoPhase object - assume volume phase */ - ThermoPhase* tPhase = &(mphase->phase(iphase)); + ThermoPhase* tPhase = &mphase->phase(iphase); size_t nelem = tPhase->nElements(); /* @@ -1146,7 +1146,7 @@ int vcs_Cantera_update_vprob(MultiPhase* mphase, VCS_PROB* vprob) vprob->Vol = mphase->volume(); for (size_t iphase = 0; iphase < totNumPhases; iphase++) { - ThermoPhase* tPhase = &(mphase->phase(iphase)); + ThermoPhase* tPhase = &mphase->phase(iphase); vcs_VolPhase* volPhase = vprob->VPhaseList[iphase]; /* * Set the electric potential of the volume phase from the diff --git a/src/equil/vcs_VolPhase.cpp b/src/equil/vcs_VolPhase.cpp index 624e90cf6..6a227a88f 100644 --- a/src/equil/vcs_VolPhase.cpp +++ b/src/equil/vcs_VolPhase.cpp @@ -359,7 +359,7 @@ void vcs_VolPhase::setMoleFractions(const double* const xmol) void vcs_VolPhase::_updateMoleFractionDependencies() { if (TP_ptr) { - TP_ptr->setState_PX(Pres_, &(Xmol_[m_MFStartIndex])); + TP_ptr->setState_PX(Pres_, &Xmol_[m_MFStartIndex]); } if (!m_isIdealSoln) { m_UpToDate_AC = false; diff --git a/src/equil/vcs_elem_rearrange.cpp b/src/equil/vcs_elem_rearrange.cpp index 71c11c558..da4c06f68 100644 --- a/src/equil/vcs_elem_rearrange.cpp +++ b/src/equil/vcs_elem_rearrange.cpp @@ -152,9 +152,9 @@ int VCS_SOLVE::vcs_elem_rearrange(double* const aw, double* const sa, if (jr != k) { if (DEBUG_MODE_ENABLED && m_debug_print_lvl >= 2) { plogf(" --- "); - plogf("%-2.2s", (m_elementName[k]).c_str()); + plogf("%-2.2s", m_elementName[k].c_str()); plogf("(%9.2g) replaces ", m_elemAbundancesGoal[k]); - plogf("%-2.2s", (m_elementName[jr]).c_str()); + plogf("%-2.2s", m_elementName[jr].c_str()); plogf("(%9.2g) as element %3d", m_elemAbundancesGoal[jr], jr); plogendl(); } diff --git a/src/equil/vcs_inest.cpp b/src/equil/vcs_inest.cpp index fa5d35223..d2b756a07 100644 --- a/src/equil/vcs_inest.cpp +++ b/src/equil/vcs_inest.cpp @@ -53,7 +53,7 @@ void VCS_SOLVE::vcs_inest(double* const aw, double* const sa, double* const sm, tmp += m_formulaMatrix(kspec,j) * m_molNumSpecies_old[kspec]; } plogf("%s ", pprefix); - plogf(" %-9.9s", (m_elementName[j]).c_str()); + plogf(" %-9.9s", m_elementName[j].c_str()); plogf(" %12.3g %12.3g\n", m_elemAbundancesGoal[j], tmp); } } @@ -436,7 +436,7 @@ int VCS_SOLVE::vcs_inest_TP() * Record time */ m_VCount->T_Time_inest += tickTock.secondsWC(); - (m_VCount->T_Calls_Inest)++; + m_VCount->T_Calls_Inest++; return retn; } diff --git a/src/equil/vcs_phaseStability.cpp b/src/equil/vcs_phaseStability.cpp index 01bdfb56b..f9ef32241 100644 --- a/src/equil/vcs_phaseStability.cpp +++ b/src/equil/vcs_phaseStability.cpp @@ -752,7 +752,7 @@ double VCS_SOLVE::vcs_phaseStabilityTest(const size_t iph) } if (delFrac[k] < 0.0) { if (2.0 * damp * (-delFrac[k]) > fracDelta_old[k]) { - damp = fracDelta_old[k] / (2.0 * (-delFrac[k])); + damp = fracDelta_old[k] / (2.0 * -delFrac[k]); } } if (delFrac[k] > 0.0) { @@ -763,7 +763,7 @@ double VCS_SOLVE::vcs_phaseStabilityTest(const size_t iph) } damp = std::max(damp, 0.000001); for (size_t k = 0; k < nsp; k++) { - fracDelta_new[k] = fracDelta_old[k] + damp * (delFrac[k]); + fracDelta_new[k] = fracDelta_old[k] + damp * delFrac[k]; } if (DEBUG_MODE_ENABLED && m_debug_print_lvl >= 2) { diff --git a/src/equil/vcs_report.cpp b/src/equil/vcs_report.cpp index 2240e157e..3dcb392cf 100644 --- a/src/equil/vcs_report.cpp +++ b/src/equil/vcs_report.cpp @@ -127,7 +127,7 @@ int VCS_SOLVE::vcs_report(int iconv) plogf(" Inert Gas Species "); } else { plogf(" Inert Species in phase %16s ", - (m_VolPhaseList[i])->PhaseName.c_str()); + m_VolPhaseList[i]->PhaseName.c_str()); } plogf("%14.7E %14.7E %12.4E\n", TPhInertMoles[i] * molScale, TPhInertMoles[i] / m_tPhaseMoles_old[i], 0.0); @@ -207,7 +207,7 @@ int VCS_SOLVE::vcs_report(int iconv) plogf(" | |\n"); plogf(" | Element |"); for (size_t j = 0; j < m_numElemConstraints; j++) { - plogf(" %10.10s", (m_elementName[j]).c_str()); + plogf(" %10.10s", m_elementName[j].c_str()); } plogf(" | |\n"); plogf(" PhaseName |KMolTarget |"); @@ -268,7 +268,7 @@ int VCS_SOLVE::vcs_report(int iconv) plogf(" Actual Target Type ElActive\n"); for (size_t i = 0; i < m_numElemConstraints; ++i) { writeline(' ', 26, false); - plogf("%-2.2s", (m_elementName[i]).c_str()); + plogf("%-2.2s", m_elementName[i].c_str()); plogf("%20.12E %20.12E", m_elemAbundances[i]*molScale, m_elemAbundancesGoal[i]*molScale); plogf(" %3d %3d\n", m_elType[i], m_elementActive[i]); } diff --git a/src/equil/vcs_rxnadj.cpp b/src/equil/vcs_rxnadj.cpp index c9f89fe97..2464d5e0e 100644 --- a/src/equil/vcs_rxnadj.cpp +++ b/src/equil/vcs_rxnadj.cpp @@ -406,7 +406,7 @@ int VCS_SOLVE::vcs_rxn_adj_cg() } m_deltaMolNumSpecies[kspec] = 1.0e-10; m_speciesStatus[kspec] = VCS_SPECIES_MAJOR; - --(m_numRxnMinorZeroed); + --m_numRxnMinorZeroed; } else { if (DEBUG_MODE_ENABLED) { sprintf(ANOTE, "MultSpec: still dead DG = %11.3E", m_deltaGRxn_new[irxn]); @@ -463,7 +463,7 @@ int VCS_SOLVE::vcs_rxn_adj_cg() } } for (size_t j = 0; j < m_numPhases; j++) { - if (!(m_VolPhaseList[j])->m_singleSpecies) { + if (!m_VolPhaseList[j]->m_singleSpecies) { if (m_tPhaseMoles_old[j] > 0.0) { s -= pow(m_deltaMolNumPhase(j,irxn), 2) / m_tPhaseMoles_old[j]; } diff --git a/src/equil/vcs_solve.cpp b/src/equil/vcs_solve.cpp index ccb36ee26..0ef0a3e00 100644 --- a/src/equil/vcs_solve.cpp +++ b/src/equil/vcs_solve.cpp @@ -688,7 +688,7 @@ int VCS_SOLVE::vcs_prob_specifyFully(const VCS_PROB* pub) * Use the object's assignment operator */ for (size_t iph = 0; iph < nph; iph++) { - *(m_VolPhaseList[iph]) = *(pub->VPhaseList[iph]); + *m_VolPhaseList[iph] = *pub->VPhaseList[iph]; /* * Fix up the species thermo pointer in the vcs_SpeciesThermo object * It should point to the species thermo pointer in the private diff --git a/src/equil/vcs_solve_TP.cpp b/src/equil/vcs_solve_TP.cpp index fbf9d28ba..d867f944c 100644 --- a/src/equil/vcs_solve_TP.cpp +++ b/src/equil/vcs_solve_TP.cpp @@ -125,7 +125,7 @@ int VCS_SOLVE::vcs_solve_TP(int print_lvl, int printDetails, int maxit) plogf(" FROM ESTIMATE Type\n\n"); for (size_t i = 0; i < m_numElemConstraints; ++i) { writeline(' ', 26, false); - plogf("%-2.2s", (m_elementName[i]).c_str()); + plogf("%-2.2s", m_elementName[i].c_str()); plogf("%20.12E%20.12E %3d\n", m_elemAbundancesGoal[i], m_elemAbundances[i], m_elType[i]); } @@ -357,7 +357,7 @@ int VCS_SOLVE::vcs_solve_TP(int print_lvl, int printDetails, int maxit) double tsecond = ticktock.secondsWC(); m_VCount->Time_vcs_TP = tsecond; m_VCount->T_Time_vcs_TP += m_VCount->Time_vcs_TP; - (m_VCount->T_Calls_vcs_TP)++; + m_VCount->T_Calls_vcs_TP++; m_VCount->T_Its += m_VCount->Its; m_VCount->T_Basis_Opts += m_VCount->Basis_Opts; m_VCount->T_Time_basopt += m_VCount->Time_basopt; @@ -853,7 +853,7 @@ void VCS_SOLVE::solve_tp_inner(size_t& iti, size_t& it1, * species is in a single species phase or in * a multispecies phase. */ - if (!(m_SSPhase[kspec])) { + if (!m_SSPhase[kspec]) { /* * Section for multispecies phases: * - Cut reaction adjustment for positive kmoles of @@ -1151,7 +1151,7 @@ void VCS_SOLVE::solve_tp_inner(size_t& iti, size_t& it1, l2normdg(&m_deltaGRxn_old[0]), l2normdg(&m_deltaGRxn_new[0])); plogf(" Total kmoles of gas = %15.7E\n", m_tPhaseMoles_old[0]); - if ((m_numPhases > 1) && (!(m_VolPhaseList[1])->m_singleSpecies)) { + if ((m_numPhases > 1) && (!m_VolPhaseList[1]->m_singleSpecies)) { plogf(" Total kmoles of liquid = %15.7E\n", m_tPhaseMoles_old[1]); } else { plogf(" Total kmoles of liquid = %15.7E\n", 0.0); @@ -1259,7 +1259,7 @@ void VCS_SOLVE::solve_tp_inner(size_t& iti, size_t& it1, /* * Increment the iteration counters */ - ++(m_VCount->Its); + ++m_VCount->Its; ++it1; if (DEBUG_MODE_ENABLED && m_debug_print_lvl >= 2) { plogf(" --- Increment counter increased, step is accepted: %4d", @@ -1346,14 +1346,14 @@ void VCS_SOLVE::solve_tp_inner(size_t& iti, size_t& it1, doSwap = (m_molNumSpecies_old[l] * m_spSize[l]) > (m_molNumSpecies_old[j] * m_spSize[j] * 1.01); if (!m_SSPhase[l] && doSwap) { - doSwap = (m_molNumSpecies_old[l]) > (m_molNumSpecies_old[j] * 1.01); + doSwap = m_molNumSpecies_old[l] > (m_molNumSpecies_old[j] * 1.01); } } else { if (m_SSPhase[l]) { doSwap = (m_molNumSpecies_old[l] * m_spSize[l]) > (m_molNumSpecies_old[j] * m_spSize[j] * 1.01); if (!doSwap) { - doSwap = (m_molNumSpecies_old[l]) > (m_molNumSpecies_old[j] * 1.01); + doSwap = m_molNumSpecies_old[l] > (m_molNumSpecies_old[j] * 1.01); } } else { doSwap = (m_molNumSpecies_old[l] * m_spSize[l]) > @@ -1702,7 +1702,7 @@ double VCS_SOLVE::vcs_minor_alt_calc(size_t kspec, size_t irxn, bool* do_delete, /* * get the diagonal of the activity coefficient Jacobian */ - s = m_np_dLnActCoeffdMolNum(kspec,kspec) / (m_tPhaseMoles_old[iph]); + s = m_np_dLnActCoeffdMolNum(kspec,kspec) / m_tPhaseMoles_old[iph]; /* * We fit it to a power law approximation of the activity coefficient * @@ -1831,7 +1831,7 @@ int VCS_SOLVE::vcs_zero_species(const size_t kspec) * Calculate a delta that will eliminate the species. */ if (m_speciesUnknownType[kspec] != VCS_SPECIES_TYPE_INTERFACIALVOLTAGE) { - double dx = -(m_molNumSpecies_old[kspec]); + double dx = -m_molNumSpecies_old[kspec]; if (dx != 0.0) { retn = delta_species(kspec, &dx); if (DEBUG_MODE_ENABLED && !retn && m_debug_print_lvl >= 1) { @@ -1865,7 +1865,7 @@ int VCS_SOLVE::vcs_delete_species(const size_t kspec) * a minor species */ if (m_speciesStatus[kspec] != VCS_SPECIES_MAJOR) { - --(m_numRxnMinorZeroed); + --m_numRxnMinorZeroed; } m_speciesStatus[kspec] = VCS_SPECIES_DELETED; m_deltaGRxn_new[irxn] = 0.0; @@ -1889,8 +1889,8 @@ int VCS_SOLVE::vcs_delete_species(const size_t kspec) /* * Adjust the current number of active species and reactions counters */ - --(m_numRxnRdc); - --(m_numSpeciesRdc); + --m_numRxnRdc; + --m_numSpeciesRdc; /* * Check to see whether we have just annihilated a multispecies phase. @@ -1938,7 +1938,7 @@ void VCS_SOLVE::vcs_reinsert_deleted(size_t kspec) if (m_SSPhase[kspec]) { m_speciesStatus[kspec] = VCS_SPECIES_MAJOR; - --(m_numRxnMinorZeroed); + --m_numRxnMinorZeroed; } vcs_VolPhase* Vphase = m_VolPhaseList[iph]; @@ -1969,9 +1969,9 @@ void VCS_SOLVE::vcs_reinsert_deleted(size_t kspec) Vphase->setExistence(VCS_PHASE_EXIST_YES); } - ++(m_numRxnRdc); - ++(m_numSpeciesRdc); - ++(m_numRxnMinorZeroed); + ++m_numRxnRdc; + ++m_numSpeciesRdc; + ++m_numRxnMinorZeroed; if (kspec != (m_numSpeciesRdc - 1)) { /* @@ -2002,7 +2002,7 @@ bool VCS_SOLVE::vcs_delete_multiphase(const size_t iph) /* * calculate an extent of rxn, dx, that zeroes out the species. */ - double dx = - (m_molNumSpecies_old[kspec]); + double dx = - m_molNumSpecies_old[kspec]; double dxTent = dx; int retn = delta_species(kspec, &dxTent); @@ -2104,8 +2104,8 @@ bool VCS_SOLVE::vcs_delete_multiphase(const size_t iph) m_deltaMolNumSpecies[kspec] = 0.0; m_speciesStatus[kspec] = VCS_SPECIES_ZEROEDMS; - ++(m_numRxnRdc); - ++(m_numSpeciesRdc); + ++m_numRxnRdc; + ++m_numSpeciesRdc; if (DEBUG_MODE_ENABLED && m_debug_print_lvl >= 2) { plogf(" --- Make %s", m_speciesName[kspec].c_str()); plogf(" an active but zeroed species because its phase " @@ -2739,7 +2739,7 @@ int VCS_SOLVE::vcs_basopt(const bool doJustComponents, double aw[], double sa[], /* ****************************************** */ if (jr != k) { if (DEBUG_MODE_ENABLED && m_debug_print_lvl >= 2) { - plogf(" --- %-12.12s", (m_speciesName[k]).c_str()); + plogf(" --- %-12.12s", m_speciesName[k].c_str()); if (m_speciesUnknownType[k] == VCS_SPECIES_TYPE_INTERFACIALVOLTAGE) { plogf("(Volts = %9.2g)", m_molNumSpecies_old[k]); } else { @@ -2841,8 +2841,8 @@ L_END_LOOP: juse = npos; jlose = npos; for (size_t j = 0; j < m_numElemConstraints; j++) { - if (!(m_elementActive[j])) { - if (!strcmp((m_elementName[j]).c_str(), "E")) { + if (!m_elementActive[j]) { + if (!strcmp(m_elementName[j].c_str(), "E")) { juse = j; } } @@ -3025,7 +3025,7 @@ L_CLEANUP: ; double tsecond = tickTock.secondsWC(); m_VCount->Time_basopt += tsecond; - (m_VCount->Basis_Opts)++; + m_VCount->Basis_Opts++; return VCS_SUCCESS; } @@ -3060,20 +3060,20 @@ size_t VCS_SOLVE::vcs_basisOptMax(const double* const molNum, const size_t j, } bool doSwap = false; if (m_SSPhase[j]) { - doSwap = (molNum[i] * m_spSize[i]) > (big); + doSwap = (molNum[i] * m_spSize[i]) > big; if (!m_SSPhase[i]) { if (doSwap) { - doSwap = (molNum[i]) > (molNum[largest] * 1.001); + doSwap = molNum[i] > (molNum[largest] * 1.001); } } } else { if (m_SSPhase[i]) { - doSwap = (molNum[i] * m_spSize[i]) > (big); + doSwap = (molNum[i] * m_spSize[i]) > big; if (!doSwap) { - doSwap = (molNum[i]) > (molNum[largest] * 1.001); + doSwap = molNum[i] > (molNum[largest] * 1.001); } } else { - doSwap = (molNum[i] * m_spSize[i]) > (big); + doSwap = (molNum[i] * m_spSize[i]) > big; } } if (doSwap) { @@ -3124,7 +3124,7 @@ int VCS_SOLVE::vcs_species_type(const size_t kspec) const if (DEBUG_MODE_ENABLED && m_debug_print_lvl >= 2) { plogf(" --- %s can not be nonzero because" " needed element %s is zero\n", - m_speciesName[kspec].c_str(), (m_elementName[j]).c_str()); + m_speciesName[kspec].c_str(), m_elementName[j].c_str()); } if (m_SSPhase[kspec]) { return VCS_SPECIES_ZEROEDSS; @@ -3265,7 +3265,7 @@ int VCS_SOLVE::vcs_species_type(const size_t kspec) const } else { double szAdj = m_scSize[irxn] * std::sqrt((double)m_numRxnTot); for (size_t k = 0; k < m_numComponents; ++k) { - if (!(m_SSPhase[k])) { + if (!m_SSPhase[k]) { if (m_stoichCoeffRxnMatrix(k,irxn) != 0.0) { if (m_molNumSpecies_old[kspec] * szAdj >= m_molNumSpecies_old[k] * 0.01) { return VCS_SPECIES_MAJOR; @@ -3659,7 +3659,7 @@ void VCS_SOLVE::prneav() const plogf(" Element Now Orignal Deviation Type\n"); for (size_t j = 0; j < m_numElemConstraints; ++j) { plogf(" "); - plogf("%-2.2s", (m_elementName[j]).c_str()); + plogf("%-2.2s", m_elementName[j].c_str()); plogf(" = %15.6E %15.6E %15.6E %3d\n", eav[j], m_elemAbundancesGoal[j], eav[j] - m_elemAbundancesGoal[j], m_elType[j]); if (m_elemAbundancesGoal[j] != 0.) { diff --git a/src/kinetics/solveSP.cpp b/src/kinetics/solveSP.cpp index 50765511b..99a36a31e 100644 --- a/src/kinetics/solveSP.cpp +++ b/src/kinetics/solveSP.cpp @@ -57,7 +57,7 @@ solveSP::solveSP(ImplicitSurfChem* surfChemPtr, int bulkFunc) : throw CanteraError("solveSP", "InterfaceKinetics object has no surface phase"); } - ThermoPhase* tp = &(m_kin->thermo(surfPhaseIndex)); + ThermoPhase* tp = &m_kin->thermo(surfPhaseIndex); SurfPhase* sp = dynamic_cast(tp); if (!sp) { throw CanteraError("solveSP", diff --git a/src/numerics/BandMatrix.cpp b/src/numerics/BandMatrix.cpp index 814d09df8..a4039eae4 100644 --- a/src/numerics/BandMatrix.cpp +++ b/src/numerics/BandMatrix.cpp @@ -43,7 +43,7 @@ BandMatrix::BandMatrix(size_t n, size_t kl, size_t ku, doublereal v) : m_colPtrs.resize(n); size_t ldab = (2*kl + ku + 1); for (size_t j = 0; j < n; j++) { - m_colPtrs[j] = &(data[ldab * j]); + m_colPtrs[j] = &data[ldab * j]; } } @@ -63,7 +63,7 @@ BandMatrix::BandMatrix(const BandMatrix& y) : m_colPtrs.resize(m_n); size_t ldab = (2 *m_kl + m_ku + 1); for (size_t j = 0; j < m_n; j++) { - m_colPtrs[j] = &(data[ldab * j]); + m_colPtrs[j] = &data[ldab * j]; } } @@ -82,7 +82,7 @@ BandMatrix& BandMatrix::operator=(const BandMatrix& y) m_colPtrs.resize(m_n); size_t ldab = (2 * m_kl + m_ku + 1); for (size_t j = 0; j < m_n; j++) { - m_colPtrs[j] = &(data[ldab * j]); + m_colPtrs[j] = &data[ldab * j]; } return *this; } @@ -99,7 +99,7 @@ void BandMatrix::resize(size_t n, size_t kl, size_t ku, doublereal v) m_colPtrs.resize(m_n); size_t ldab = (2 * m_kl + m_ku + 1); for (size_t j = 0; j < n; j++) { - m_colPtrs[j] = &(data[ldab * j]); + m_colPtrs[j] = &data[ldab * j]; } m_factored = false; } @@ -420,7 +420,7 @@ doublereal* BandMatrix::ptrColumn(size_t j) doublereal* const* BandMatrix::colPts() { - return &(m_colPtrs[0]); + return &m_colPtrs[0]; } } diff --git a/src/numerics/DenseMatrix.cpp b/src/numerics/DenseMatrix.cpp index 911f87215..af7ea43c8 100644 --- a/src/numerics/DenseMatrix.cpp +++ b/src/numerics/DenseMatrix.cpp @@ -26,7 +26,7 @@ DenseMatrix::DenseMatrix(size_t n, size_t m, doublereal v) : m_colPts.resize(m); if (!m_data.empty()) { for (size_t j = 0; j < m; j++) { - m_colPts[j] = &(m_data[m_nrows*j]); + m_colPts[j] = &m_data[m_nrows*j]; } } } @@ -40,7 +40,7 @@ DenseMatrix::DenseMatrix(const DenseMatrix& y) : m_colPts.resize(m_ncols); if (!m_data.empty()) { for (size_t j = 0; j < m_ncols; j++) { - m_colPts[j] = &(m_data[m_nrows*j]); + m_colPts[j] = &m_data[m_nrows*j]; } } } @@ -54,7 +54,7 @@ DenseMatrix& DenseMatrix::operator=(const DenseMatrix& y) m_ipiv = y.ipiv(); m_colPts.resize(m_ncols); for (size_t j = 0; j < m_ncols; j++) { - m_colPts[j] = &(m_data[m_nrows*j]); + m_colPts[j] = &m_data[m_nrows*j]; } m_useReturnErrorCode = y.m_useReturnErrorCode; m_printLevel = y.m_printLevel; @@ -68,19 +68,19 @@ void DenseMatrix::resize(size_t n, size_t m, doublereal v) m_colPts.resize(m_ncols); if (!m_data.empty()) { for (size_t j = 0; j < m_ncols; j++) { - m_colPts[j] = &(m_data[m_nrows*j]); + m_colPts[j] = &m_data[m_nrows*j]; } } } doublereal* const* DenseMatrix::colPts() { - return &(m_colPts[0]); + return &m_colPts[0]; } const doublereal* const* DenseMatrix::const_colPts() const { - return &(m_colPts[0]); + return &m_colPts[0]; } void DenseMatrix::mult(const double* b, double* prod) const diff --git a/src/numerics/Func1.cpp b/src/numerics/Func1.cpp index aab98e39b..0520acaf5 100644 --- a/src/numerics/Func1.cpp +++ b/src/numerics/Func1.cpp @@ -67,7 +67,7 @@ Func1& Func1::derivative() const bool Func1::isIdentical(Func1& other) const { - if ((ID() != other.ID()) || (m_c != other.m_c)) { + if (ID() != other.ID() || m_c != other.m_c) { return false; } if (m_f1) { diff --git a/src/numerics/SquareMatrix.cpp b/src/numerics/SquareMatrix.cpp index d8d97a9ae..b35ab1f9b 100644 --- a/src/numerics/SquareMatrix.cpp +++ b/src/numerics/SquareMatrix.cpp @@ -76,7 +76,7 @@ int SquareMatrix::solve(doublereal* b, size_t nrhs, size_t ldb) * Solve the factored system */ ct_dgetrs(ctlapack::NoTranspose, static_cast(nRows()), - nrhs, &(*(begin())), static_cast(nRows()), + nrhs, &*begin(), static_cast(nRows()), DATA_PTR(ipiv()), b, ldb, info); if (info != 0) { if (m_printLevel) { @@ -128,11 +128,11 @@ int SquareMatrix::factor() if (useQR_) { return factorQR(); } - a1norm_ = ct_dlange('1', m_nrows, m_nrows, &(*(begin())), m_nrows, 0); + a1norm_ = ct_dlange('1', m_nrows, m_nrows, &*begin(), m_nrows, 0); integer n = static_cast(nRows()); int info=0; m_factored = 1; - ct_dgetrf(n, n, &(*(begin())), static_cast(nRows()), DATA_PTR(ipiv()), info); + ct_dgetrf(n, n, &*begin(), static_cast(nRows()), DATA_PTR(ipiv()), info); if (info != 0) { if (m_printLevel) { writelogf("SquareMatrix::factor(): DGETRS returned INFO = %d\n", info); @@ -155,11 +155,11 @@ int SquareMatrix::factorQR() tau.resize(m_nrows, 0.0); work.resize(8 * m_nrows, 0.0); } - a1norm_ = ct_dlange('1', m_nrows, m_nrows, &(*(begin())), m_nrows, DATA_PTR(work)); + a1norm_ = ct_dlange('1', m_nrows, m_nrows, &*begin(), m_nrows, DATA_PTR(work)); int info = 0; m_factored = 2; size_t lwork = work.size(); - ct_dgeqrf(m_nrows, m_nrows, &(*(begin())), m_nrows, DATA_PTR(tau), DATA_PTR(work), lwork, info); + ct_dgeqrf(m_nrows, m_nrows, &*begin(), m_nrows, DATA_PTR(tau), DATA_PTR(work), lwork, info); if (info != 0) { if (m_printLevel) { writelogf("SquareMatrix::factorQR(): DGEQRF returned INFO = %d\n", info); @@ -199,7 +199,7 @@ int SquareMatrix::solveQR(doublereal* b) /* * Solve the factored system */ - ct_dormqr(ctlapack::Left, ctlapack::Transpose, m_nrows, 1, m_nrows, &(*(begin())), m_nrows, DATA_PTR(tau), b, m_nrows, + ct_dormqr(ctlapack::Left, ctlapack::Transpose, m_nrows, 1, m_nrows, &*begin(), m_nrows, DATA_PTR(tau), b, m_nrows, DATA_PTR(work), lwork, info); if (info != 0) { if (m_printLevel) { @@ -216,7 +216,7 @@ int SquareMatrix::solveQR(doublereal* b) char dd = 'N'; - ct_dtrtrs(ctlapack::UpperTriangular, ctlapack::NoTranspose, &dd, m_nrows, 1, &(*(begin())), m_nrows, b, + ct_dtrtrs(ctlapack::UpperTriangular, ctlapack::NoTranspose, &dd, m_nrows, 1, &*begin(), m_nrows, b, m_nrows, info); if (info != 0) { if (m_printLevel) { @@ -245,7 +245,7 @@ doublereal SquareMatrix::rcond(doublereal anorm) } int rinfo = 0; - rcond = ct_dgecon('1', m_nrows, &(*(begin())), m_nrows, anorm, DATA_PTR(work), + rcond = ct_dgecon('1', m_nrows, &*begin(), m_nrows, anorm, DATA_PTR(work), DATA_PTR(iwork_), rinfo); if (rinfo != 0) { if (m_printLevel) { @@ -278,7 +278,7 @@ doublereal SquareMatrix::rcondQR() } int rinfo = 0; - rcond = ct_dtrcon(0, ctlapack::UpperTriangular, 0, m_nrows, &(*(begin())), m_nrows, DATA_PTR(work), + rcond = ct_dtrcon(0, ctlapack::UpperTriangular, 0, m_nrows, &*begin(), m_nrows, DATA_PTR(work), DATA_PTR(iwork_), rinfo); if (rinfo != 0) { if (m_printLevel) { diff --git a/src/oneD/boundaries1D.cpp b/src/oneD/boundaries1D.cpp index c00db6562..c9800ba63 100644 --- a/src/oneD/boundaries1D.cpp +++ b/src/oneD/boundaries1D.cpp @@ -216,7 +216,7 @@ void Inlet1D::eval(size_t jg, doublereal* xg, doublereal* rg, rb[2] -= x[1]; // T rb[0] += x[0]; // u for (size_t k = 1; k < m_nsp; k++) { - rb[4+k] += x[0]*(m_yin[k]); + rb[4+k] += x[0]*m_yin[k]; } } } diff --git a/src/thermo/HMWSoln_input.cpp b/src/thermo/HMWSoln_input.cpp index ebc217082..894acdc20 100644 --- a/src/thermo/HMWSoln_input.cpp +++ b/src/thermo/HMWSoln_input.cpp @@ -1644,7 +1644,7 @@ void HMWSoln::calcIMSCutoffParams_() (IMS_X_o_cutoff_*IMS_X_o_cutoff_/IMS_cCut_ - 2.0 * IMS_X_o_cutoff_)); double tmp = IMS_afCut_ + IMS_X_o_cutoff_*(IMS_bfCut_ + IMS_dfCut_ *IMS_X_o_cutoff_); double eterm = std::exp(-IMS_X_o_cutoff_/IMS_cCut_); - IMS_efCut_ = - eterm * (tmp); + IMS_efCut_ = - eterm * tmp; if (fabs(IMS_efCut_ - oldV) < 1.0E-14) { converged = true; } @@ -1667,7 +1667,7 @@ void HMWSoln::calcIMSCutoffParams_() (IMS_X_o_cutoff_*IMS_X_o_cutoff_/IMS_cCut_ - 2.0 * IMS_X_o_cutoff_)); double tmp = IMS_agCut_ + IMS_X_o_cutoff_*(IMS_bgCut_ + IMS_dgCut_ *IMS_X_o_cutoff_); double eterm = std::exp(-IMS_X_o_cutoff_/IMS_cCut_); - IMS_egCut_ = - eterm * (tmp); + IMS_egCut_ = - eterm * tmp; if (fabs(IMS_egCut_ - oldV) < 1.0E-14) { converged = true; } @@ -1702,7 +1702,7 @@ void HMWSoln::calcMCCutoffParams_() MC_dpCut_ = damp * MC_dpCutNew + (1-damp) * MC_dpCut_; double tmp = MC_apCut_ + MC_X_o_cutoff_*(MC_bpCut_ + MC_dpCut_ * MC_X_o_cutoff_); double eterm = std::exp(- MC_X_o_cutoff_ / MC_cpCut_); - MC_epCut_ = - eterm * (tmp); + MC_epCut_ = - eterm * tmp; double diff = MC_epCut_ - oldV; if (fabs(diff) < 1.0E-14) { converged = true; diff --git a/src/thermo/IdealGasPhase.cpp b/src/thermo/IdealGasPhase.cpp index 82ea38bbd..32e58ad2d 100644 --- a/src/thermo/IdealGasPhase.cpp +++ b/src/thermo/IdealGasPhase.cpp @@ -113,7 +113,7 @@ void IdealGasPhase::getChemPotentials(doublereal* mu) const doublereal rt = temperature() * GasConstant; for (size_t k = 0; k < m_kk; k++) { double xx = std::max(SmallNumber, moleFraction(k)); - mu[k] += rt * (log(xx)); + mu[k] += rt * log(xx); } } diff --git a/src/thermo/IonsFromNeutralVPSSTP.cpp b/src/thermo/IonsFromNeutralVPSSTP.cpp index 1d97d5ca5..86f366b58 100644 --- a/src/thermo/IonsFromNeutralVPSSTP.cpp +++ b/src/thermo/IonsFromNeutralVPSSTP.cpp @@ -1274,7 +1274,7 @@ void IonsFromNeutralVPSSTP::s_update_dlnActCoeff_dlnN() const throw CanteraError("IonsFromNeutralVPSSTP::s_update_dlnActCoeff_dlnN()", "dynamic cast failed"); } size_t nsp_ge = geThermo->nSpecies(); - geThermo->getdlnActCoeffdlnN(nsp_ge, &(dlnActCoeffdlnN_NeutralMolecule_(0,0))); + geThermo->getdlnActCoeffdlnN(nsp_ge, &dlnActCoeffdlnN_NeutralMolecule_(0,0)); switch (ionSolnType_) { case cIonSolnType_PASSTHROUGH: diff --git a/src/thermo/LatticeSolidPhase.cpp b/src/thermo/LatticeSolidPhase.cpp index bc19cc86e..67118d1dd 100644 --- a/src/thermo/LatticeSolidPhase.cpp +++ b/src/thermo/LatticeSolidPhase.cpp @@ -69,13 +69,13 @@ doublereal LatticeSolidPhase::minTemp(size_t k) const if (k != npos) { for (size_t n = 0; n < m_nlattice; n++) { if (lkstart_[n+1] < k) { - return (m_lattice[n])->minTemp(k-lkstart_[n]); + return m_lattice[n]->minTemp(k-lkstart_[n]); } } } doublereal mm = 1.0E300; for (size_t n = 0; n < m_nlattice; n++) { - double ml = (m_lattice[n])->minTemp(); + double ml = m_lattice[n]->minTemp(); mm = std::min(mm, ml); } return mm; @@ -92,7 +92,7 @@ doublereal LatticeSolidPhase::maxTemp(size_t k) const } doublereal mm = -1.0E300; for (size_t n = 0; n < m_nlattice; n++) { - double ml = (m_lattice[n])->maxTemp(); + double ml = m_lattice[n]->maxTemp(); mm = std::max(mm, ml); } return mm; @@ -233,7 +233,7 @@ void LatticeSolidPhase::getMoleFractions(doublereal* const x) const * get the same answer. */ if (DEBUG_MODE_ENABLED) { - m_lattice[n]->getMoleFractions(&(m_x[strt])); + m_lattice[n]->getMoleFractions(&m_x[strt]); for (size_t k = 0; k < nsp; k++) { if (fabs((x + strt)[k] - m_x[strt+k]) > 1.0E-14) { throw CanteraError("LatticeSolidPhase::getMoleFractions()", @@ -440,7 +440,7 @@ void LatticeSolidPhase::setParametersFromXML(const XML_Node& eosdata) double val = fpValueCheck(pval[i]); bool found = false; for (size_t j = 0; j < m_nlattice; j++) { - ThermoPhase& tp = *(m_lattice[j]); + ThermoPhase& tp = *m_lattice[j]; string idj = tp.id(); if (idj == pnam[i]) { theta_[j] = val; diff --git a/src/thermo/MargulesVPSSTP.cpp b/src/thermo/MargulesVPSSTP.cpp index b801d8d50..1071034bb 100644 --- a/src/thermo/MargulesVPSSTP.cpp +++ b/src/thermo/MargulesVPSSTP.cpp @@ -374,7 +374,7 @@ void MargulesVPSSTP::s_update_lnActCoeff() const void MargulesVPSSTP::s_update_dlnActCoeff_dT() const { doublereal invT = 1.0 / temperature(); - doublereal invRTT = 1.0 / (GasConstant)*invT*invT; + doublereal invRTT = 1.0 / GasConstant*invT*invT; dlnActCoeffdT_Scaled_.assign(m_kk, 0.0); d2lnActCoeffdT2_Scaled_.assign(m_kk, 0.0); for (size_t i = 0; i < numBinaryInteractions_; i++) { diff --git a/src/thermo/MixtureFugacityTP.cpp b/src/thermo/MixtureFugacityTP.cpp index 675ac924d..55b176d99 100644 --- a/src/thermo/MixtureFugacityTP.cpp +++ b/src/thermo/MixtureFugacityTP.cpp @@ -717,7 +717,7 @@ int MixtureFugacityTP::phaseState(bool checkState) const double pp = psatEst(tmid); double mmw = meanMolecularWeight(); double molVolLiqTmid = liquidVolEst(tmid, pp); - double molVolGasTmid = GasConstant * tmid / (pp); + double molVolGasTmid = GasConstant * tmid / pp; double densLiqTmid = mmw / molVolLiqTmid; double densGasTmid = mmw / molVolGasTmid; double densMidTmid = 0.5 * (densLiqTmid + densGasTmid); diff --git a/src/thermo/PDSS.cpp b/src/thermo/PDSS.cpp index 260b4b28f..481cf242d 100644 --- a/src/thermo/PDSS.cpp +++ b/src/thermo/PDSS.cpp @@ -64,7 +64,7 @@ PDSS::PDSS(VPStandardStateTP* tp, size_t spindex) : m_Vss_ptr(0) { if (tp) { - m_spthermo = &(tp->speciesThermo()); + m_spthermo = &tp->speciesThermo(); } if (tp) { m_vpssmgr_ptr = tp->provideVPSSMgr(); @@ -191,17 +191,17 @@ void PDSS::initAllPtrs(VPStandardStateTP* tp, VPSSMgr* vpssmgr_ptr, void PDSS::initPtrs() { AssertThrow(m_vpssmgr_ptr->mPDSS_h0_RT.size() != 0, "PDSS::initPtrs()"); - m_h0_RT_ptr = &(m_vpssmgr_ptr->mPDSS_h0_RT[0]); - m_cp0_R_ptr = &(m_vpssmgr_ptr->mPDSS_cp0_R[0]); - m_s0_R_ptr = &(m_vpssmgr_ptr->mPDSS_s0_R[0]); - m_g0_RT_ptr = &(m_vpssmgr_ptr->mPDSS_g0_RT[0]); - m_V0_ptr = &(m_vpssmgr_ptr->mPDSS_V0[0]); + m_h0_RT_ptr = &m_vpssmgr_ptr->mPDSS_h0_RT[0]; + m_cp0_R_ptr = &m_vpssmgr_ptr->mPDSS_cp0_R[0]; + m_s0_R_ptr = &m_vpssmgr_ptr->mPDSS_s0_R[0]; + m_g0_RT_ptr = &m_vpssmgr_ptr->mPDSS_g0_RT[0]; + m_V0_ptr = &m_vpssmgr_ptr->mPDSS_V0[0]; - m_hss_RT_ptr = &(m_vpssmgr_ptr->mPDSS_hss_RT[0]); - m_cpss_R_ptr = &(m_vpssmgr_ptr->mPDSS_cpss_R[0]); - m_sss_R_ptr = &(m_vpssmgr_ptr->mPDSS_sss_R[0]); - m_gss_RT_ptr = &(m_vpssmgr_ptr->mPDSS_gss_RT[0]); - m_Vss_ptr = &(m_vpssmgr_ptr->mPDSS_Vss[0]); + m_hss_RT_ptr = &m_vpssmgr_ptr->mPDSS_hss_RT[0]; + m_cpss_R_ptr = &m_vpssmgr_ptr->mPDSS_cpss_R[0]; + m_sss_R_ptr = &m_vpssmgr_ptr->mPDSS_sss_R[0]; + m_gss_RT_ptr = &m_vpssmgr_ptr->mPDSS_gss_RT[0]; + m_Vss_ptr = &m_vpssmgr_ptr->mPDSS_Vss[0]; } doublereal PDSS::enthalpy_mole() const diff --git a/src/thermo/PDSS_ConstVol.cpp b/src/thermo/PDSS_ConstVol.cpp index a0d590b48..13abf0fad 100644 --- a/src/thermo/PDSS_ConstVol.cpp +++ b/src/thermo/PDSS_ConstVol.cpp @@ -121,7 +121,7 @@ void PDSS_ConstVol::constructPDSSFile(VPStandardStateTP* tp, size_t spindex, XML_Node& speciesList = fxml_phase->child("speciesArray"); XML_Node* speciesDB = get_XML_NameID("speciesData", speciesList["datasrc"], - &(fxml_phase->root())); + &fxml_phase->root()); const XML_Node* s = speciesDB->findByAttr("name", tp->speciesName(spindex)); constructPDSSXML(tp, spindex, *s, *fxml_phase, true); diff --git a/src/thermo/PDSS_HKFT.cpp b/src/thermo/PDSS_HKFT.cpp index c242dec39..3212b8170 100644 --- a/src/thermo/PDSS_HKFT.cpp +++ b/src/thermo/PDSS_HKFT.cpp @@ -690,7 +690,7 @@ void PDSS_HKFT::constructPDSSFile(VPStandardStateTP* tp, size_t spindex, XML_Node& speciesList = fxml_phase->child("speciesArray"); XML_Node* speciesDB = get_XML_NameID("speciesData", speciesList["datasrc"], - &(fxml_phase->root())); + &fxml_phase->root()); const XML_Node* s = speciesDB->findByAttr("name", tp->speciesName(spindex)); constructPDSSXML(tp, spindex, *s, *fxml_phase, true); diff --git a/src/thermo/PDSS_IonsFromNeutral.cpp b/src/thermo/PDSS_IonsFromNeutral.cpp index 189a4b899..fe1f4b592 100644 --- a/src/thermo/PDSS_IonsFromNeutral.cpp +++ b/src/thermo/PDSS_IonsFromNeutral.cpp @@ -192,7 +192,7 @@ void PDSS_IonsFromNeutral::constructPDSSFile(VPStandardStateTP* tp, size_t spind XML_Node& speciesList = fxml_phase->child("speciesArray"); XML_Node* speciesDB = get_XML_NameID("speciesData", speciesList["datasrc"], - &(fxml_phase->root())); + &fxml_phase->root()); const XML_Node* s = speciesDB->findByAttr("name", tp->speciesName(spindex)); constructPDSSXML(tp, spindex, *s, *fxml_phase, id); diff --git a/src/thermo/PDSS_SSVol.cpp b/src/thermo/PDSS_SSVol.cpp index fb5dce9b7..4b168bb1e 100644 --- a/src/thermo/PDSS_SSVol.cpp +++ b/src/thermo/PDSS_SSVol.cpp @@ -150,7 +150,7 @@ void PDSS_SSVol::constructPDSSFile(VPStandardStateTP* tp, size_t spindex, XML_Node& speciesList = fxml_phase->child("speciesArray"); XML_Node* speciesDB = get_XML_NameID("speciesData", speciesList["datasrc"], - &(fxml_phase->root())); + &fxml_phase->root()); const XML_Node* s = speciesDB->findByAttr("name", tp->speciesName(spindex)); constructPDSSXML(tp, spindex, *s, *fxml_phase, true); @@ -262,7 +262,7 @@ void PDSS_SSVol::calcMolarVolume() const doublereal dens2 = dens * dens; doublereal ddensdT = TCoeff_[1] + 2.0 * m_temp * TCoeff_[2] + 3.0 * m_temp * m_temp * TCoeff_[3]; doublereal d2densdT2 = 2.0 * TCoeff_[2] + 6.0 * m_temp * TCoeff_[3]; - dVdT_ = - m_mw / (dens2) * (ddensdT); + dVdT_ = - m_mw / dens2 * ddensdT; d2VdT2_ = 2.0 * m_mw / (dens2 * dens) * ddensdT * ddensdT - m_mw / dens2 * d2densdT2; } else { throw CanteraError("PDSS_SSVol::calcMolarVolume", "unimplemented"); @@ -280,8 +280,8 @@ void PDSS_SSVol::setPressure(doublereal p) m_cpss_R_ptr[m_spindex] = m_cp0_R_ptr[m_spindex]; } else { doublereal del_pRT = deltaP / (GasConstant * m_temp); - doublereal sV_term = - deltaP / (GasConstant) * dVdT_; - m_hss_RT_ptr[m_spindex] = m_h0_RT_ptr[m_spindex] + sV_term + del_pRT * (m_Vss_ptr[m_spindex]); + doublereal sV_term = - deltaP / GasConstant * dVdT_; + m_hss_RT_ptr[m_spindex] = m_h0_RT_ptr[m_spindex] + sV_term + del_pRT * m_Vss_ptr[m_spindex]; m_sss_R_ptr[m_spindex] = m_s0_R_ptr[m_spindex] + sV_term; m_gss_RT_ptr[m_spindex] = m_hss_RT_ptr[m_spindex] - m_sss_R_ptr[m_spindex]; m_cpss_R_ptr[m_spindex] = m_cp0_R_ptr[m_spindex] - m_temp * deltaP * d2VdT2_; @@ -302,8 +302,8 @@ void PDSS_SSVol::setTemperature(doublereal temp) m_cpss_R_ptr[m_spindex] = m_cp0_R_ptr[m_spindex]; } else { doublereal del_pRT = deltaP / (GasConstant * m_temp); - doublereal sV_term = - deltaP / (GasConstant) * dVdT_; - m_hss_RT_ptr[m_spindex] = m_h0_RT_ptr[m_spindex] + sV_term + del_pRT * (m_Vss_ptr[m_spindex]); + doublereal sV_term = - deltaP / GasConstant * dVdT_; + m_hss_RT_ptr[m_spindex] = m_h0_RT_ptr[m_spindex] + sV_term + del_pRT * m_Vss_ptr[m_spindex]; m_sss_R_ptr[m_spindex] = m_s0_R_ptr[m_spindex] + sV_term; m_gss_RT_ptr[m_spindex] = m_hss_RT_ptr[m_spindex] - m_sss_R_ptr[m_spindex]; m_cpss_R_ptr[m_spindex] = m_cp0_R_ptr[m_spindex] - m_temp * deltaP * d2VdT2_; diff --git a/src/thermo/Phase.cpp b/src/thermo/Phase.cpp index c7f220665..640fa04f5 100644 --- a/src/thermo/Phase.cpp +++ b/src/thermo/Phase.cpp @@ -86,19 +86,19 @@ Phase& Phase::operator=(const Phase& right) * in each object */ if (m_xml) { - XML_Node* rroot = &(m_xml->root()); + XML_Node* rroot = &m_xml->root(); delete rroot; m_xml = 0; } if (right.m_xml) { - XML_Node *rroot = &(right.m_xml->root()); + XML_Node *rroot = &right.m_xml->root(); XML_Node *root_xml = new XML_Node(); - (rroot)->copy(root_xml); + rroot->copy(root_xml); m_xml = findXMLPhase(root_xml, right.m_xml->id()); if (!m_xml) { throw CanteraError("Phase::operator=()", "Confused: Couldn't find original phase " + right.m_xml->id()); } - if (&(m_xml->root()) != root_xml) { + if (&m_xml->root() != root_xml) { throw CanteraError("Phase::operator=()", "confused: root changed"); } } @@ -110,7 +110,7 @@ Phase& Phase::operator=(const Phase& right) Phase::~Phase() { if (m_xml) { - XML_Node* xroot = &(m_xml->root()); + XML_Node* xroot = &m_xml->root(); delete xroot; } m_xml = 0; @@ -123,11 +123,11 @@ XML_Node& Phase::xml() const void Phase::setXMLdata(XML_Node& xmlPhase) { - XML_Node* xroot = &(xmlPhase.root()); + XML_Node* xroot = &xmlPhase.root(); XML_Node *root_xml = new XML_Node(); - (xroot)->copy(root_xml); + xroot->copy(root_xml); if (m_xml) { - XML_Node *rOld = &(m_xml->root()); + XML_Node *rOld = &m_xml->root(); delete rOld; m_xml = 0; } @@ -135,7 +135,7 @@ void Phase::setXMLdata(XML_Node& xmlPhase) if (!m_xml) { throw CanteraError("Phase::setXMLdata()", "XML 'phase' node not found"); } - if (&(m_xml->root()) != root_xml) { + if (&m_xml->root() != root_xml) { throw CanteraError("Phase::setXMLdata()", "Root XML node not found"); } } @@ -298,7 +298,7 @@ std::string Phase::speciesSPName(int k) const void Phase::saveState(vector_fp& state) const { state.resize(nSpecies() + 2); - saveState(state.size(),&(state[0])); + saveState(state.size(), &state[0]); } void Phase::saveState(size_t lenstate, doublereal* state) const { diff --git a/src/thermo/RedlichKwongMFTP.cpp b/src/thermo/RedlichKwongMFTP.cpp index 3ea893e94..a072c33e4 100644 --- a/src/thermo/RedlichKwongMFTP.cpp +++ b/src/thermo/RedlichKwongMFTP.cpp @@ -1130,7 +1130,7 @@ void RedlichKwongMFTP::pressureDerivatives() const doublereal dadt = da_dt(); doublereal fac = dadt - m_a_current/(2.0 * TKelvin); - dpdT_ = (GasConstant / (vmb) - fac / (sqt * mv * vpb)); + dpdT_ = (GasConstant / vmb - fac / (sqt * mv * vpb)); } void RedlichKwongMFTP::updateMixingExpressions() diff --git a/src/thermo/SpeciesThermoFactory.cpp b/src/thermo/SpeciesThermoFactory.cpp index c44db0436..8b174d0cc 100644 --- a/src/thermo/SpeciesThermoFactory.cpp +++ b/src/thermo/SpeciesThermoFactory.cpp @@ -393,7 +393,7 @@ SpeciesThermoInterpType* newSpeciesThermoInterpType(const XML_Node& thermo) const std::vector& tpWC = thermo.children(); std::vector tp; for (size_t i = 0; i < tpWC.size(); i++) { - if (!(tpWC[i])->isComment()) { + if (!tpWC[i]->isComment()) { tp.push_back(tpWC[i]); } } diff --git a/src/thermo/SurfPhase.cpp b/src/thermo/SurfPhase.cpp index 074fbd198..f10bba876 100644 --- a/src/thermo/SurfPhase.cpp +++ b/src/thermo/SurfPhase.cpp @@ -304,7 +304,7 @@ void SurfPhase::setCoverages(const doublereal* theta) void SurfPhase::setCoveragesNoNorm(const doublereal* theta) { for (size_t k = 0; k < m_kk; k++) { - m_work[k] = m_n0*theta[k]/(size(k)); + m_work[k] = m_n0*theta[k]/size(k); } /* * Call the Phase:: class function diff --git a/src/thermo/WaterSSTP.cpp b/src/thermo/WaterSSTP.cpp index a1c92e291..7655058a4 100644 --- a/src/thermo/WaterSSTP.cpp +++ b/src/thermo/WaterSSTP.cpp @@ -304,7 +304,7 @@ void WaterSSTP::getEntropy_R_ref(doublereal* sr) const m_sub->setState_TR(T, dd); doublereal s = m_sub->entropy(); - *sr = (s + SW_Offset)/ (GasConstant); + *sr = (s + SW_Offset)/ GasConstant; dd = m_sub->density(T, p, waterState, dens); } @@ -325,7 +325,7 @@ void WaterSSTP::getCp_R_ref(doublereal* cpr) const throw CanteraError("setPressure", "error"); } doublereal cp = m_sub->cp(); - *cpr = cp / (GasConstant); + *cpr = cp / GasConstant; dd = m_sub->density(T, p, waterState, dens); } diff --git a/src/transport/LiquidTransport.cpp b/src/transport/LiquidTransport.cpp index e8e7721ec..81d45cf79 100644 --- a/src/transport/LiquidTransport.cpp +++ b/src/transport/LiquidTransport.cpp @@ -933,7 +933,7 @@ void LiquidTransport::update_Grad_lnAC() for (size_t k = 0; k < m_nDim; k++) { grad_T = m_Grad_T[k]; size_t start = m_nsp*k; - m_thermo->getdlnActCoeffds(grad_T, &(m_Grad_X[start]), &(m_Grad_lnAC[start])); + m_thermo->getdlnActCoeffds(grad_T, &m_Grad_X[start], &m_Grad_lnAC[start]); for (size_t i = 0; i < m_nsp; i++) if (m_molefracs[i] < 1.e-15) { m_Grad_lnAC[start+i] = 0; diff --git a/src/transport/SimpleTransport.cpp b/src/transport/SimpleTransport.cpp index 831a38787..0eb99a9ae 100644 --- a/src/transport/SimpleTransport.cpp +++ b/src/transport/SimpleTransport.cpp @@ -226,11 +226,11 @@ bool SimpleTransport::initLiquid(LiquidTransportParams& tr) m_coeffDiff_Ns[k] = ltd.speciesDiffusivity; ltd.speciesDiffusivity = 0; - if (!(m_coeffDiff_Ns[k])) { + if (!m_coeffDiff_Ns[k]) { if (ltd.hydroRadius) { m_coeffHydroRadius_Ns[k] = (ltd.hydroRadius)->duplMyselfAsLTPspecies(); } - if (!(m_coeffHydroRadius_Ns[k])) { + if (!m_coeffHydroRadius_Ns[k]) { throw CanteraError("SimpleTransport::initLiquid", "Neither diffusivity nor hydroradius is set for species " + spName); } diff --git a/test_problems/cathermo/HMW_graph_GvT/Gex_standalone.cpp b/test_problems/cathermo/HMW_graph_GvT/Gex_standalone.cpp index f71481d6c..a250531a0 100644 --- a/test_problems/cathermo/HMW_graph_GvT/Gex_standalone.cpp +++ b/test_problems/cathermo/HMW_graph_GvT/Gex_standalone.cpp @@ -119,7 +119,7 @@ void calc(double temp, double Iionic) printf(" diff = %20.14g\n", diff); double xo = 1.0 / (molecWeight/1000. * 2 * m + 1.0); printf(" no = %g\n", xo); - double tmp = diff / (RT); + double tmp = diff / RT; double actCoefWater = exp(tmp) / xo; printf("actCoefWater = %g\n", actCoefWater); }