research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Eliminated variable-length arrays from MolalityVPSSTP::reportCSV

Browse source 
These are a feature of C99, but are not part of the C++ standard.
This commit is contained in:
Ray Speth 2011-12-14 05:55:44 +00:00
parent be92c4cbc5
commit a9b09b6527
1 changed files with 27 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
Cantera/src/thermo/MolalityVPSSTP.cpp
View file

@ -941,87 +941,76 @@ namespace Cantera {
csvFile.precision(8);
int kk = nSpecies();
double x[kk];
double molal[kk];
double mu[kk];
double muss[kk];
double aMolal[kk];
double acMolal[kk];
double hbar[kk];
double sbar[kk];
double ubar[kk];
double cpbar[kk];
double vbar[kk];
vector<std::string> pNames;
vector<double*> data;
vector<vector_fp> data;
vector_fp temp(nSpecies());
getMoleFractions(x);
getMoleFractions(&temp[0]);
pNames.push_back("X");
data.push_back(x);
data.push_back(temp);
try{
getMolalities(molal);
getMolalities(&temp[0]);
pNames.push_back("Molal");
data.push_back(molal);
data.push_back(temp);
}
catch (CanteraError) {;}
try{
getChemPotentials(mu);
getChemPotentials(&temp[0]);
pNames.push_back("Chem. Pot. (J/kmol)");
data.push_back(mu);
data.push_back(temp);
}
catch (CanteraError) {;}
try{
getStandardChemPotentials(muss);
getStandardChemPotentials(&temp[0]);
pNames.push_back("Chem. Pot. SS (J/kmol)");
data.push_back(muss);
data.push_back(temp);
}
catch (CanteraError) {;}
try{
getMolalityActivityCoefficients(acMolal);
getMolalityActivityCoefficients(&temp[0]);
pNames.push_back("Molal Act. Coeff.");
data.push_back(acMolal);
data.push_back(temp);
}
catch (CanteraError) {;}
try{
getActivities(aMolal);
getActivities(&temp[0]);
pNames.push_back("Molal Activity");
data.push_back(aMolal);
data.push_back(temp);
int iHp = speciesIndex("H+");
if (iHp >= 0) {
double pH = -log(aMolal[iHp]) / log(10.0);
double pH = -log(temp[iHp]) / log(10.0);
csvFile << setw(tabL) << "pH = " << setw(tabS) << pH << endl;
}
}
catch (CanteraError) {;}
try{
getPartialMolarEnthalpies(hbar);
getPartialMolarEnthalpies(&temp[0]);
pNames.push_back("Part. Mol Enthalpy (J/kmol)");
data.push_back(hbar);
data.push_back(temp);
}
catch (CanteraError) {;}
try{
getPartialMolarEntropies(sbar);
getPartialMolarEntropies(&temp[0]);
pNames.push_back("Part. Mol. Entropy (J/K/kmol)");
data.push_back(sbar);
data.push_back(temp);
}
catch (CanteraError) {;}
try{
getPartialMolarIntEnergies(ubar);
getPartialMolarIntEnergies(&temp[0]);
pNames.push_back("Part. Mol. Energy (J/kmol)");
data.push_back(ubar);
data.push_back(temp);
}
catch (CanteraError) {;}
try{
getPartialMolarCp(cpbar);
getPartialMolarCp(&temp[0]);
pNames.push_back("Part. Mol. Cp (J/K/kmol");
data.push_back(cpbar);
data.push_back(temp);
}
catch (CanteraError) {;}
try{
getPartialMolarVolumes(vbar);
getPartialMolarVolumes(&temp[0]);
pNames.push_back("Part. Mol. Cv (J/K/kmol)");
data.push_back(vbar);
data.push_back(temp);
}
catch (CanteraError) {;}
@ -1035,9 +1024,9 @@ namespace Cantera {
csvFile << setw(tabS+(tabM+1)*pNames.size()) << "-\n";
csvFile.fill(' ');
*/
for (int k = 0; k < kk; k++) {
for (int k = 0; k < nSpecies(); k++) {
csvFile << setw(tabS) << speciesName(k) + ",";
if (x[k] > SmallNumber) {
if (data[0][k] > SmallNumber) {
for ( int i = 0; i < (int)pNames.size(); i++ ){
csvFile << setw(tabM) << data[i][k] << ",";
}