From afdf3fb2d1f054b456386e1e3991ef70333ed94e Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Thu, 19 Jan 2012 20:30:04 +0000 Subject: [PATCH] Removed some empty comment lines --- Cantera/cxx/demos/flamespeed/flamespeed.cpp | 1 - Cantera/src/base/misc.cpp | 1 - Cantera/src/base/xml.cpp | 3 --- Cantera/src/equil/ChemEquil.cpp | 3 --- Cantera/src/equil/MultiPhaseEquil.cpp | 3 --- Cantera/src/equil/vcs_VolPhase.cpp | 12 ------------ Cantera/src/equil/vcs_phaseStability.cpp | 3 --- Cantera/src/equil/vcs_rxnadj.cpp | 3 --- Cantera/src/equil/vcs_solve.cpp | 3 --- Cantera/src/equil/vcs_solve_TP.cpp | 6 ------ Cantera/src/kinetics/ImplicitSurfChem.cpp | 3 --- Cantera/src/thermo/AdsorbateThermo.h | 2 -- Cantera/src/thermo/DebyeHuckel.cpp | 3 --- Cantera/src/thermo/DebyeHuckel.h | 3 --- Cantera/src/thermo/HMWSoln.cpp | 3 --- Cantera/src/thermo/HMWSoln.h | 3 --- Cantera/src/thermo/IdealMolalSoln.cpp | 3 --- Cantera/src/thermo/MargulesVPSSTP.cpp | 3 --- Cantera/src/thermo/PDSS_IonsFromNeutral.cpp | 3 --- Cantera/src/thermo/StoichSubstance.cpp | 16 ---------------- .../cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp | 5 ----- test_problems/cathermo/HMW_test_1/HMW_test_1.cpp | 10 ---------- test_problems/cathermo/HMW_test_3/HMW_test_3.cpp | 10 ---------- test_problems/cathermo/ims/IMSTester.cpp | 1 - 24 files changed, 106 deletions(-) diff --git a/Cantera/cxx/demos/flamespeed/flamespeed.cpp b/Cantera/cxx/demos/flamespeed/flamespeed.cpp index 65d5a396d..90e07c0ee 100644 --- a/Cantera/cxx/demos/flamespeed/flamespeed.cpp +++ b/Cantera/cxx/demos/flamespeed/flamespeed.cpp @@ -202,7 +202,6 @@ int flamespeed(int np, void* p) { cout << "Flame speed with multicomponent transport + Soret: " << flame.value(flowdomain,flow.componentIndex("u"),0) << " m/s" << endl; - // int np=flow.nPoints(); vector zvec,Tvec,COvec,CO2vec,Uvec; diff --git a/Cantera/src/base/misc.cpp b/Cantera/src/base/misc.cpp index 1b1e60a4d..0634d511b 100644 --- a/Cantera/src/base/misc.cpp +++ b/Cantera/src/base/misc.cpp @@ -1027,7 +1027,6 @@ protected: // file is not found. But I (dgg) don't think it makes much sense, // so it is replaced by: path = findInputFile(file); - // #ifdef WIN32 // RFB: For Windows make the path POSIX compliant so code looking for directory // separators is simpler. Just look for '/' not both '/' and '\\' diff --git a/Cantera/src/base/xml.cpp b/Cantera/src/base/xml.cpp index e1141ecd2..315df3250 100644 --- a/Cantera/src/base/xml.cpp +++ b/Cantera/src/base/xml.cpp @@ -821,9 +821,6 @@ namespace Cantera { } // return the number of children - /* - * - */ size_t XML_Node::nChildren() const { return m_nchildren; } diff --git a/Cantera/src/equil/ChemEquil.cpp b/Cantera/src/equil/ChemEquil.cpp index 2e6c2d185..9685927b1 100755 --- a/Cantera/src/equil/ChemEquil.cpp +++ b/Cantera/src/equil/ChemEquil.cpp @@ -1892,9 +1892,6 @@ namespace Cantera { } - /* - * - */ void ChemEquil::adjustEloc(thermo_t &s, vector_fp & elMolesGoal) { if (m_eloc == npos) return; if (fabs(elMolesGoal[m_eloc]) > 1.0E-20) return; diff --git a/Cantera/src/equil/MultiPhaseEquil.cpp b/Cantera/src/equil/MultiPhaseEquil.cpp index 7f2475b6a..868232e2d 100644 --- a/Cantera/src/equil/MultiPhaseEquil.cpp +++ b/Cantera/src/equil/MultiPhaseEquil.cpp @@ -863,9 +863,6 @@ namespace Cantera { } #include - /* - * - */ void MultiPhaseEquil::reportCSV(const std::string &reportFile) { size_t k; size_t istart; diff --git a/Cantera/src/equil/vcs_VolPhase.cpp b/Cantera/src/equil/vcs_VolPhase.cpp index 0dd3fa0c3..0c35faca1 100644 --- a/Cantera/src/equil/vcs_VolPhase.cpp +++ b/Cantera/src/equil/vcs_VolPhase.cpp @@ -385,8 +385,6 @@ namespace VCSnonideal { // Gibbs free energy calculation at a temperature for the reference state // of each species - /* - */ void vcs_VolPhase::_updateG0() const { if (m_useCanteraCalls) { TP_ptr->getGibbs_ref(VCS_DATA_PTR(SS0ChemicalPotential)); @@ -513,10 +511,6 @@ namespace VCSnonideal { /***************************************************************************/ // Set the moles and/or mole fractions within the phase - /* - * - * - */ void vcs_VolPhase::setMoleFractionsState(const double totalMoles, const double * const moleFractions, const int vcsStateStatus) { @@ -1207,9 +1201,6 @@ namespace VCSnonideal { /***************************************************************************/ // Sets the mole flag within the object to be current - /* - * - */ void vcs_VolPhase::setMolesCurrent(int stateCalc) { m_UpToDate = true; m_vcsStateStatus = stateCalc; @@ -1469,9 +1460,6 @@ namespace VCSnonideal { size_t e, k, eT; std::string ename; size_t eFound = npos; - /* - * - */ size_t nebase = tPhase->nElements(); size_t ne = nebase; size_t ns = tPhase->nSpecies(); diff --git a/Cantera/src/equil/vcs_phaseStability.cpp b/Cantera/src/equil/vcs_phaseStability.cpp index 6e6f0d532..891bf73bd 100644 --- a/Cantera/src/equil/vcs_phaseStability.cpp +++ b/Cantera/src/equil/vcs_phaseStability.cpp @@ -237,7 +237,6 @@ namespace VCSnonideal { } #endif // Section for a single-species phase - // if (Vphase->m_singleSpecies) { s = 0.0; double *dnPhase_irxn = m_deltaMolNumPhase[irxn]; @@ -405,8 +404,6 @@ namespace VCSnonideal { } - // - double VCS_SOLVE::vcs_phaseStabilityTest(const int iph) { /* diff --git a/Cantera/src/equil/vcs_rxnadj.cpp b/Cantera/src/equil/vcs_rxnadj.cpp index f4c4ace7b..0ccd3cf82 100644 --- a/Cantera/src/equil/vcs_rxnadj.cpp +++ b/Cantera/src/equil/vcs_rxnadj.cpp @@ -220,9 +220,6 @@ namespace VCSnonideal { m_deltaMolNumSpecies[kspec] = -m_deltaGRxn_new[irxn] / s; // New section to do damping of the m_deltaMolNumSpecies[] - /* - * - */ for (j = 0; j < m_numComponents; ++j) { double stoicC = m_stoichCoeffRxnMatrix[irxn][j]; if (stoicC != 0.0) { diff --git a/Cantera/src/equil/vcs_solve.cpp b/Cantera/src/equil/vcs_solve.cpp index 45ee8e3e5..ae8f282c9 100644 --- a/Cantera/src/equil/vcs_solve.cpp +++ b/Cantera/src/equil/vcs_solve.cpp @@ -238,9 +238,6 @@ namespace VCSnonideal { /****************************************************************************/ // Destructor - /* - * - */ VCS_SOLVE::~VCS_SOLVE() { vcs_delete_memory(); diff --git a/Cantera/src/equil/vcs_solve_TP.cpp b/Cantera/src/equil/vcs_solve_TP.cpp index b1889e929..91af5823a 100644 --- a/Cantera/src/equil/vcs_solve_TP.cpp +++ b/Cantera/src/equil/vcs_solve_TP.cpp @@ -391,9 +391,6 @@ namespace VCSnonideal { * We first determine if a phase pops into existence. */ iphasePop = vcs_popPhaseID(); - /* - * - */ soldel = -1; if (iphasePop != npos) { soldel = vcs_popPhaseRxnStepSizes(iphasePop); @@ -1720,9 +1717,6 @@ namespace VCSnonideal { vcs_setFlagsVolPhases(false, VCS_STATECALC_OLD); vcs_dfe(VCS_STATECALC_OLD, 0, 0, m_numSpeciesRdc); vcs_deltag(0, false, VCS_STATECALC_OLD); - /* - * - */ if (!ncBefore) { if (ncAfter) { /* diff --git a/Cantera/src/kinetics/ImplicitSurfChem.cpp b/Cantera/src/kinetics/ImplicitSurfChem.cpp index ca4a65071..c090dcedc 100644 --- a/Cantera/src/kinetics/ImplicitSurfChem.cpp +++ b/Cantera/src/kinetics/ImplicitSurfChem.cpp @@ -221,9 +221,6 @@ namespace Cantera { * time scale - time over which to integrate equations */ doublereal time_scale = timeScaleOverride; - /* - * - */ if (!m_surfSolver) { m_surfSolver = new solveSP(this, bulkFunc); /* diff --git a/Cantera/src/thermo/AdsorbateThermo.h b/Cantera/src/thermo/AdsorbateThermo.h index 2e9464dd7..28f446042 100644 --- a/Cantera/src/thermo/AdsorbateThermo.h +++ b/Cantera/src/thermo/AdsorbateThermo.h @@ -178,11 +178,9 @@ namespace Cantera { doublereal m_Pref; //! species index int m_index; - // size_t m_nFreqs; //! array of vib frequencies array_fp m_freq; - // doublereal m_be; diff --git a/Cantera/src/thermo/DebyeHuckel.cpp b/Cantera/src/thermo/DebyeHuckel.cpp index a5c764be3..75103aa6e 100644 --- a/Cantera/src/thermo/DebyeHuckel.cpp +++ b/Cantera/src/thermo/DebyeHuckel.cpp @@ -631,9 +631,6 @@ namespace Cantera { * This also updates the internal molality array. */ s_update_lnMolalityActCoeff(); - /* - * - */ doublereal RT = GasConstant * temperature(); double xmolSolvent = moleFraction(m_indexSolvent); for (size_t k = 0; k < m_kk; k++) { diff --git a/Cantera/src/thermo/DebyeHuckel.h b/Cantera/src/thermo/DebyeHuckel.h index 9267fa9d5..698b8d3b9 100644 --- a/Cantera/src/thermo/DebyeHuckel.h +++ b/Cantera/src/thermo/DebyeHuckel.h @@ -718,9 +718,6 @@ namespace Cantera { virtual doublereal gibbs_mole() const; /// Molar heat capacity at constant pressure. Units: J/kmol/K. - /* - * - */ virtual doublereal cp_mole() const; //! Molar heat capacity at constant volume. Units: J/kmol/K. diff --git a/Cantera/src/thermo/HMWSoln.cpp b/Cantera/src/thermo/HMWSoln.cpp index d10461a17..f30586136 100644 --- a/Cantera/src/thermo/HMWSoln.cpp +++ b/Cantera/src/thermo/HMWSoln.cpp @@ -1082,9 +1082,6 @@ namespace Cantera { * This also updates the internal molality array. */ s_update_lnMolalityActCoeff(); - /* - * - */ doublereal RT = GasConstant * temperature(); double xmolSolvent = moleFraction(m_indexSolvent); for (size_t k = 0; k < m_kk; k++) { diff --git a/Cantera/src/thermo/HMWSoln.h b/Cantera/src/thermo/HMWSoln.h index d05a35072..f5083fce5 100644 --- a/Cantera/src/thermo/HMWSoln.h +++ b/Cantera/src/thermo/HMWSoln.h @@ -1420,9 +1420,6 @@ namespace Cantera { virtual doublereal gibbs_mole() const; /// Molar heat capacity at constant pressure. Units: J/kmol/K. - /* - * - */ virtual doublereal cp_mole() const; /// Molar heat capacity at constant volume. Units: J/kmol/K. diff --git a/Cantera/src/thermo/IdealMolalSoln.cpp b/Cantera/src/thermo/IdealMolalSoln.cpp index ee2d4a975..63e5adc10 100644 --- a/Cantera/src/thermo/IdealMolalSoln.cpp +++ b/Cantera/src/thermo/IdealMolalSoln.cpp @@ -603,9 +603,6 @@ namespace Cantera { * get the solvent mole fraction */ double xmolSolvent = moleFraction(m_indexSolvent); - /* - * - */ doublereal RT = GasConstant * temperature(); if (IMS_typeCutoff_ == 0 || xmolSolvent > 3.* IMS_X_o_cutoff_/2.0) { diff --git a/Cantera/src/thermo/MargulesVPSSTP.cpp b/Cantera/src/thermo/MargulesVPSSTP.cpp index a5ac704fe..38c54d237 100644 --- a/Cantera/src/thermo/MargulesVPSSTP.cpp +++ b/Cantera/src/thermo/MargulesVPSSTP.cpp @@ -392,9 +392,6 @@ namespace Cantera { * Update the activity coefficients */ s_update_lnActCoeff(); - /* - * - */ doublereal RT = GasConstant * temperature(); for (size_t k = 0; k < m_kk; k++) { xx = fmaxx(moleFractions_[k], xxSmall); diff --git a/Cantera/src/thermo/PDSS_IonsFromNeutral.cpp b/Cantera/src/thermo/PDSS_IonsFromNeutral.cpp index a072ee40c..68180f48c 100644 --- a/Cantera/src/thermo/PDSS_IonsFromNeutral.cpp +++ b/Cantera/src/thermo/PDSS_IonsFromNeutral.cpp @@ -163,9 +163,6 @@ namespace Cantera { std::vector key; std::vector val; - /* - * - */ numMult_ = ctml::getPairs(*nsm, key, val); idNeutralMoleculeVec.resize(numMult_); factorVec.resize(numMult_); diff --git a/Cantera/src/thermo/StoichSubstance.cpp b/Cantera/src/thermo/StoichSubstance.cpp index 784a1ad04..84fa00c63 100644 --- a/Cantera/src/thermo/StoichSubstance.cpp +++ b/Cantera/src/thermo/StoichSubstance.cpp @@ -179,10 +179,6 @@ namespace Cantera { } } - /* - * - */ - void StoichSubstance::getChemPotentials_RT(doublereal* mu) const { mu[0] = gibbs_mole() / (GasConstant * temperature()); } @@ -207,10 +203,6 @@ namespace Cantera { vbar[0] = 1.0 / molarDensity(); } - /* - * - */ - void StoichSubstance::getEnthalpy_RT(doublereal* hrt) const { hrt[0] = enthalpy_mole() / (GasConstant * temperature()); } @@ -235,10 +227,6 @@ namespace Cantera { vol[0] = 1.0 / molarDensity(); } - /* - * - */ - void StoichSubstance::getEnthalpy_RT_ref(doublereal *hrt) const { _updateThermo(); hrt[0] = m_h0_RT[0]; @@ -264,10 +252,6 @@ namespace Cantera { cprt[0] = m_cp0_R[0]; } - /* - * - */ - void StoichSubstance::setParameters(int n, double * const c) { double rho = c[0]; setDensity(rho); diff --git a/test_problems/cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp b/test_problems/cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp index 36d088198..70e81cdcf 100644 --- a/test_problems/cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp +++ b/test_problems/cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp @@ -241,11 +241,6 @@ int main(int argc, char **argv) //double Lfunc = HMW->relative_enthalpy() * 1.0E-6; molarEnth = HMW->enthalpy_mole() * 1.0E-6; - - - /* - * - */ double Delta_Hs = (Xmol[0] * H_H2O + Xmol[i1] * H_Naplus + Xmol[i2] * H_Clminus diff --git a/test_problems/cathermo/HMW_test_1/HMW_test_1.cpp b/test_problems/cathermo/HMW_test_1/HMW_test_1.cpp index 9a9e73e23..d63cf12fb 100644 --- a/test_problems/cathermo/HMW_test_1/HMW_test_1.cpp +++ b/test_problems/cathermo/HMW_test_1/HMW_test_1.cpp @@ -1,10 +1,3 @@ -/* ======================================================================= */ - - - -/* ======================================================================= */ - - #include "Cantera.h" #include "kernel/HMWSoln.h" @@ -72,9 +65,6 @@ int main(int argc, char **argv) int nsp = HMW->nSpecies(); - /* - * - */ double a1 = HMW->AionicRadius(1); printf("a1 = %g\n", a1); double a2 = HMW->AionicRadius(2); diff --git a/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp b/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp index dc8d3eb7b..74359a6e1 100644 --- a/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp +++ b/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp @@ -1,10 +1,3 @@ -/* ======================================================================= */ - - - -/* ======================================================================= */ - - #ifdef SRCDIRTREE #include "ct_defs.h" #include "HMWSoln.h" @@ -60,9 +53,6 @@ int main(int argc, char **argv) int nsp = HMW->nSpecies(); - /* - * - */ double a1 = HMW->AionicRadius(1); printf("a1 = %g\n", a1); double a2 = HMW->AionicRadius(2); diff --git a/test_problems/cathermo/ims/IMSTester.cpp b/test_problems/cathermo/ims/IMSTester.cpp index cd0cde7b6..ea66072a6 100644 --- a/test_problems/cathermo/ims/IMSTester.cpp +++ b/test_problems/cathermo/ims/IMSTester.cpp @@ -13,7 +13,6 @@ // Read a mechanism and a thermodynamics file for the // class IdealMolalSoln in order to test that it's // working correctly -// #include #include