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

Simplify SolveSP printing functions

Browse source 
Remove unused arguments. Merge printIteration and PrintFinal.
This commit is contained in:
Ray Speth 2014-07-10 22:36:54 +00:00
parent 45f6e84ebf
commit d46bc31d2c
2 changed files with 18 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
include/cantera/kinetics/solveSP.h
View file

@ -200,27 +200,13 @@ private:
//! Printing routine that optionally gets called at the start of every
//! invocation
void print_header(int ioflag, int ifunc, doublereal time_scale,
int damping, doublereal reltol, doublereal abstol,
doublereal TKelvin, doublereal PGas, doublereal netProdRate[],
doublereal XMolKinSpecies[]);
int damping, doublereal reltol, doublereal abstol);
//! Printing routine that gets called after every iteration
void printIteration(int ioflag, doublereal damp, int label_d, int label_t,
doublereal inv_t, doublereal t_real, size_t iter,
doublereal update_norm, doublereal resid_norm,
doublereal netProdRate[], doublereal CSolnSP[],
doublereal resid[], doublereal XMolSolnSP[],
doublereal wtSpecies[], size_t dim, bool do_time);
//! Print a summary of the solution
void printFinal(int ioflag, doublereal damp, int label_d, int label_t,
doublereal inv_t, doublereal t_real, size_t iter,
doublereal update_norm, doublereal resid_norm,
doublereal netProdRateKinSpecies[], const doublereal CSolnSP[],
const doublereal resid[], doublereal XMolSolnSP[],
const doublereal wtSpecies[], const doublereal wtRes[],
size_t dim, bool do_time,
doublereal TKelvin, doublereal PGas);
bool do_time, bool final=false);
//! Calculate a conservative delta T to use in a pseudo-steady state
//! algorithm

92
src/kinetics/solveSP.cpp
View file

@ -184,9 +184,7 @@ int solveSP::solveSurfProb(int ifunc, doublereal time_scale, doublereal TKelvin,
evalSurfLarge(DATA_PTR(m_CSolnSP));
if (m_ioflag) {
print_header(m_ioflag, ifunc, time_scale, true, reltol, abstol,
TKelvin, PGas, DATA_PTR(m_netProductionRatesSave),
DATA_PTR(m_XMolKinSpecies));
print_header(m_ioflag, ifunc, time_scale, true, reltol, abstol);
}
/*
@ -347,11 +345,7 @@ int solveSP::solveSurfProb(int ifunc, doublereal time_scale, doublereal TKelvin,
if (m_ioflag) {
printIteration(m_ioflag, damp, label_d, label_t, inv_t, t_real, iter,
update_norm, resid_norm,
DATA_PTR(m_netProductionRatesSave),
DATA_PTR(m_CSolnSP), DATA_PTR(m_resid),
DATA_PTR(m_XMolKinSpecies), DATA_PTR(m_wtSpecies),
m_neq, do_time);
update_norm, resid_norm, do_time);
}
if (ifunc == SFLUX_TRANSIENT) {
@ -393,12 +387,8 @@ int solveSP::solveSurfProb(int ifunc, doublereal time_scale, doublereal TKelvin,
false, deltaT);
resid_norm = calcWeightedNorm(DATA_PTR(m_wtResid),
DATA_PTR(m_resid), m_neq);
printFinal(m_ioflag, damp, label_d, label_t, inv_t, t_real, iter,
update_norm, resid_norm, DATA_PTR(m_netProductionRatesSave),
DATA_PTR(m_CSolnSP), DATA_PTR(m_resid),
DATA_PTR(m_XMolKinSpecies), DATA_PTR(m_wtSpecies),
DATA_PTR(m_wtResid), m_neq, do_time,
TKelvin, PGas);
printIteration(m_ioflag, damp, label_d, label_t, inv_t, t_real, iter,
update_norm, resid_norm, do_time, true);
}
/*
@ -802,10 +792,7 @@ doublereal solveSP::calc_t(doublereal netProdRateSolnSP[],
} /* calc_t */
void solveSP::print_header(int ioflag, int ifunc, doublereal time_scale,
int damping, doublereal reltol, doublereal abstol,
doublereal TKelvin,
doublereal PGas, doublereal netProdRate[],
doublereal XMolKinSpecies[])
int damping, doublereal reltol, doublereal abstol)
{
if (ioflag) {
printf("\n================================ SOLVESP CALL SETUP "
@ -854,18 +841,18 @@ void solveSP::print_header(int ioflag, int ifunc, doublereal time_scale,
}
void solveSP::printIteration(int ioflag, doublereal damp, int label_d,
int label_t,
doublereal inv_t, doublereal t_real, size_t iter,
doublereal update_norm, doublereal resid_norm,
doublereal netProdRate[], doublereal CSolnSP[],
doublereal resid[], doublereal XMolSolnSP[],
doublereal wtSpecies[], size_t dim, bool do_time)
int label_t, doublereal inv_t, doublereal t_real,
size_t iter, doublereal update_norm,
doublereal resid_norm, bool do_time, bool final)
{
size_t i, k;
string nm;
if (ioflag == 1) {
printf("\t%6s ", int2str(iter).c_str());
if (final) {
printf("\tFIN%3s ", int2str(iter).c_str());
} else {
printf("\t%6s ", int2str(iter).c_str());
}
if (do_time) {
printf("%9.4e %9.4e ", t_real, 1.0/inv_t);
} else
@ -897,58 +884,11 @@ void solveSP::printIteration(int ioflag, doublereal damp, int label_d,
nm = m_kin->kineticsSpeciesName(k);
printf(" %-16s", nm.c_str());
}
if (final) {
printf(" -- success");
}
printf("\n");
}
} /* printIteration */
void solveSP::printFinal(int ioflag, doublereal damp, int label_d, int label_t,
doublereal inv_t, doublereal t_real, size_t iter,
doublereal update_norm, doublereal resid_norm,
doublereal netProdRateKinSpecies[], const doublereal CSolnSP[],
const doublereal resid[], doublereal XMolSolnSP[],
const doublereal wtSpecies[], const doublereal wtRes[],
size_t dim, bool do_time,
doublereal TKelvin, doublereal PGas)
{
size_t i, k;
string nm;
if (ioflag == 1) {
printf("\tFIN%3s ", int2str(iter).c_str());
if (do_time) {
printf("%9.4e %9.4e ", t_real, 1.0/inv_t);
} else
for (i = 0; i < 22; i++) {
printf(" ");
}
if (damp < 1.0) {
printf("%9.4e ", damp);
} else
for (i = 0; i < 11; i++) {
printf(" ");
}
printf("%9.4e %9.4e", update_norm, resid_norm);
if (do_time) {
k = m_kinSpecIndex[label_t];
size_t isp = m_kinObjIndex[label_t];
InterfaceKinetics* m_kin = m_objects[isp];
nm = m_kin->kineticsSpeciesName(k);
printf(" %-16s", nm.c_str());
} else {
for (i = 0; i < 16; i++) {
printf(" ");
}
}
if (label_d >= 0) {
k = m_kinSpecIndex[label_d];
size_t isp = m_kinObjIndex[label_d];
InterfaceKinetics* m_kin = m_objects[isp];
nm = m_kin->kineticsSpeciesName(k);
printf(" %-16s", nm.c_str());
}
printf(" -- success\n");
}
}
}