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

*** empty log message ***

Browse source
This commit is contained in:
Dave Goodwin 2003-08-29 13:13:08 +00:00
parent bf83841317
commit 73ffafe226
6 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Cantera/clib/src/ctonedim.cpp
View file

@ -187,7 +187,7 @@ extern "C" {
int DLL_EXPORT reactingsurf_new() {
try {
writelog("in reactingsurf_new\n");
//writelog("in reactingsurf_new\n");
Domain1D* i = new ReactingSurf1D();
return Cabinet<Domain1D>::cabinet()->add(i);
}
@ -342,12 +342,15 @@ extern "C" {
int DLL_EXPORT sim1D_new(int nd, int* domains) {
vector<Domain1D*> d;
try {
// cout << "nd = " << nd << endl;
for (int n = 0; n < nd; n++) {
//writelog("n = "+int2str(n)+"\n");
//writelog("dom = "+int2str(domains[n])+"\n");
d.push_back(_domain(domains[n]));
}
writelog("in sim1D_new, calling new Sim1D\n");
//writelog("in sim1D_new, calling new Sim1D\n");
Sim1D* s = new Sim1D(d);
writelog("in sim1D_new, ret Sim1D\n");
//writelog("in sim1D_new, ret Sim1D\n");
return Cabinet<Sim1D>::cabinet()->add(s);
}
catch (CanteraError) { return -1; }

12
Cantera/matlab/cantera/private/onedimmethods.cpp
View file

@ -73,7 +73,7 @@ void onedimmethods( int nlhs, mxArray *plhs[],
// construct a new Sim1D instance
case 8:
writelog("case 8\n");
//writelog("case 8\n");
checkNArgs(5, nrhs);
nd = getInt(prhs[3]);
dom_ids = mxGetPr(prhs[4]);
@ -87,16 +87,16 @@ void onedimmethods( int nlhs, mxArray *plhs[],
mexErrMsgTxt("wrong size for domain array");
ptrs = new int[sz];
writelog("allocated ptrs\n");
//writelog("allocated ptrs\n");
for (k = 0; k < sz; k++) {
writelog("k = ...\n");
// writelog("k = ...\n");
ptrs[k] = int(dom_ids[k]);
}
writelog("calling sim1D_new\n");
//writelog("calling sim1D_new\n");
indx = sim1D_new(sz, ptrs);
writelog("deleting ptrs\n");
//writelog("deleting ptrs\n");
delete[] ptrs;
writelog("done\n");
//writelog("done\n");
break;
default:

5
Cantera/src/oneD/MultiNewton.cpp
View file

@ -308,6 +308,7 @@ namespace Cantera {
// increment the Jacobian age
jac.incrementAge();
//cout << jac.age() << endl;
// damp the Newton step
m = dampStep(x, stp, x1, stp1, s1, r, jac, loglevel-1, frst);
@ -342,8 +343,8 @@ namespace Cantera {
if (jac.age() > 1) {
forceNewJac = true;
if (loglevel > 0)
writelog("Re-evaluating Jacobian, since no damping "
"coefficient\ncould be found with this Jacobian.");
writelog("\nRe-evaluating Jacobian, since no damping "
"coefficient\ncould be found with this Jacobian.\n");
}
else goto done;
}

6
Cantera/src/oneD/OneDim.cpp
View file

@ -25,6 +25,7 @@ namespace Cantera {
m_ss_jac_age(10), m_ts_jac_age(20),
m_nevals(0), m_evaltime(0.0)
{
//writelog("OneDim default constructor\n");
m_newt = new MultiNewton(1);
//m_solve_time = 0.0;
}
@ -35,7 +36,7 @@ namespace Cantera {
* input vector of pointers.
*/
OneDim::OneDim(vector<Domain1D*> domains) :
m_tmin(1.0e-16), m_tmax(0.1), m_tfactor(0.5),
m_tmin(1.0e-16), m_tmax(10.0), m_tfactor(0.5),
m_jac(0), m_newt(0),
m_rdt(0.0), m_jac_ok(false),
m_nd(0), m_bw(0), m_size(0),
@ -43,6 +44,7 @@ namespace Cantera {
m_ss_jac_age(10), m_ts_jac_age(20),
m_nevals(0), m_evaltime(0.0)
{
//writelog("OneDim constructor\n");
// create a Newton iterator, and add each domain.
m_newt = new MultiNewton(1);
@ -251,8 +253,6 @@ namespace Cantera {
clock_t t1 = clock();
m_evaltime += double(t1 - t0)/CLOCKS_PER_SEC;
m_nevals++;
//string ne = string("evals = ")+int2str(m_nevals)+"\n";
//writelog(ne.c_str());
}
}

1
Cantera/src/oneD/OneDim.h
View file

@ -146,6 +146,7 @@ namespace Cantera {
void setMaxTimeStep(doublereal tmax) { m_tmax = tmax; }
void setTimeStepFactor(doublereal tfactor) { m_tfactor = tfactor; }
void setJacAge(int ss_age, int ts_age=-1) {
cout << "setting jac age " << ss_age << " " << ts_age << endl;
m_ss_jac_age = ss_age;
if (ts_age > 0)
m_ts_jac_age = ts_age;

9
Cantera/src/oneD/Sim1D.cpp
View file

@ -13,19 +13,22 @@ namespace Cantera {
writelog(s.c_str());
}
Sim1D::Sim1D() : OneDim() {}
Sim1D::Sim1D() : OneDim() {
//writelog("Sim1D default constructor\n");
}
Sim1D::Sim1D(vector<Domain1D*>& domains) : OneDim(domains) {
// resize the internal solution vector and the wprk array,
// and perform domain-specific initialization of the
// solution vector.
//writelog("size = "+int2str(size())+"\n");
m_x.resize(size(), 0.0);
m_xnew.resize(size(), 0.0);
for (int n = 0; n < m_nd; n++) {
writelog("calling domain "+int2str(n)+" _getInitialSoln\n");
// writelog("calling domain "+int2str(n)+" _getInitialSoln\n");
domain(n)._getInitialSoln(m_x.begin() + start(n));
writelog("ret\n");
// writelog("ret\n");
}
// set some defaults