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

MSVC experienced an error on this code. fixed it.

Browse source
This commit is contained in:
Harry Moffat 2004-08-10 01:11:20 +00:00
parent e5faac2a47
commit 5ddde370b6
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
examples/cxx/example_utils.h
View file

@ -17,8 +17,9 @@ void saveSoln(int i, double time, const G& gas, A& soln) {
template<class G, class A>
void saveSoln(double time, const G& gas, A& soln) {
soln.resize(soln.nRows(), soln.nColumns() + 1);
int back = soln.nColumns() - 1;
soln.resize(static_cast<int>(soln.nRows()),
static_cast<int>(soln.nColumns()) + 1);
int back = static_cast<int>(soln.nColumns()) - 1;
soln(0,back) = time;
soln(1,back) = gas.temperature();
soln(2,back) = gas.density();

11
examples/cxx/examples.cpp
View file

@ -17,11 +17,11 @@ int transport_example2(int job);
int equil_example1(int job);
int rxnpath_example1(int job);
typedef int (*exfun)(int n=2);
typedef int (*exfun)(int n);
int run_example(int n, exfun f) {
int run_example(int n, exfun f, int job = 2) {
cout << "\n\n\n\n>>>>> example " << n+1 << "\n\nDescription: ";
int i = f();
int i = f(job);
showErrors(cout);
return i;
}
@ -62,14 +62,15 @@ int main(int argc, char** argv) {
try {
int i = 0;
int job = 2;
if (example_num == 0) {
int j;
for (j = 0; j < NUM_EXAMPLES; j++) {
i = run_example(j, fex[j]);
i = run_example(j, fex[j], 2);
}
}
else if (example_num > 0 && example_num <= NUM_EXAMPLES)
i = run_example(example_num-1, fex[example_num-1]);
i = run_example(example_num-1, fex[example_num-1], 2);
return 0;
}