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

[1D] Remove unused 'importSolution' function

Browse source
This commit is contained in:
Ray Speth 2014-01-23 04:20:35 +00:00
parent e51ca819fe
commit 904459c6b8
2 changed files with 0 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/cantera/oneD/StFlow.h
View file

@ -554,18 +554,6 @@ public:
doublereal m_tfixed;
};
/**
* Import a previous solution to use as an initial estimate. The
* previous solution may have been computed using a different
* reaction mechanism. Species in the old and new mechanisms are
* matched by name, and any species in the new mechanism that were
* not in the old one are set to zero. The new solution is created
* with the same number of grid points as in the old solution.
* @deprecated Conversion is handled automatically when loading from XML
*/
void importSolution(size_t points, doublereal* oldSoln, IdealGasPhase& oldmech,
size_t size_new, doublereal* newSoln, IdealGasPhase& newmech);
}
#endif

51
src/oneD/StFlow.cpp
View file

@ -18,57 +18,6 @@ using namespace std;
namespace Cantera
{
void importSolution(size_t points,
doublereal* oldSoln, IdealGasPhase& oldmech,
size_t size_new, doublereal* newSoln, IdealGasPhase& newmech)
{
// Number of components in old and new solutions
size_t nv_old = oldmech.nSpecies() + 4;
size_t nv_new = newmech.nSpecies() + 4;
if (size_new < nv_new*points) {
throw CanteraError("importSolution",
"new solution array must have length "+
int2str(nv_new*points));
}
size_t n, j, knew;
string nm;
// copy u,V,T,lambda
for (j = 0; j < points; j++)
for (n = 0; n < 4; n++) {
newSoln[nv_new*j + n] = oldSoln[nv_old*j + n];
}
// copy mass fractions
size_t nsp0 = oldmech.nSpecies();
//int nsp1 = newmech.nSpecies();
// loop over the species in the old mechanism
for (size_t k = 0; k < nsp0; k++) {
nm = oldmech.speciesName(k); // name
// location of this species in the new mechanism.
// If < 0, then the species is not in the new mechanism.
knew = newmech.speciesIndex(nm);
// copy this species from the old to the new solution vectors
if (knew != npos) {
for (j = 0; j < points; j++) {
newSoln[nv_new*j + 4 + knew] = oldSoln[nv_old*j + 4 + k];
}
}
}
// normalize mass fractions
for (j = 0; j < points; j++) {
newmech.setMassFractions(&newSoln[nv_new*j + 4]);
newmech.getMassFractions(&newSoln[nv_new*j + 4]);
}
}
static void st_drawline()
{
writelog("\n-------------------------------------"