Removed some empty comment lines
This commit is contained in:
parent
79c0f4afdc
commit
afdf3fb2d1
24 changed files with 0 additions and 106 deletions
|
|
@ -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<doublereal> zvec,Tvec,COvec,CO2vec,Uvec;
|
||||
|
||||
|
|
|
|||
|
|
@ -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 '\\'
|
||||
|
|
|
|||
|
|
@ -821,9 +821,6 @@ namespace Cantera {
|
|||
}
|
||||
|
||||
// return the number of children
|
||||
/*
|
||||
*
|
||||
*/
|
||||
size_t XML_Node::nChildren() const {
|
||||
return m_nchildren;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -863,9 +863,6 @@ namespace Cantera {
|
|||
}
|
||||
|
||||
#include <cstdio>
|
||||
/*
|
||||
*
|
||||
*/
|
||||
void MultiPhaseEquil::reportCSV(const std::string &reportFile) {
|
||||
size_t k;
|
||||
size_t istart;
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -238,9 +238,6 @@ namespace VCSnonideal {
|
|||
/****************************************************************************/
|
||||
|
||||
// Destructor
|
||||
/*
|
||||
*
|
||||
*/
|
||||
VCS_SOLVE::~VCS_SOLVE()
|
||||
{
|
||||
vcs_delete_memory();
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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++) {
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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++) {
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -163,9 +163,6 @@ namespace Cantera {
|
|||
std::vector<std::string> key;
|
||||
std::vector<std::string> val;
|
||||
|
||||
/*
|
||||
*
|
||||
*/
|
||||
numMult_ = ctml::getPairs(*nsm, key, val);
|
||||
idNeutralMoleculeVec.resize(numMult_);
|
||||
factorVec.resize(numMult_);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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 <iostream>
|
||||
#include <string>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue