From 7747b7004a888ca2fa335ec3bd6d20929c21ac5b Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Sat, 11 Jul 2009 17:25:05 +0000 Subject: [PATCH] changes to make these applications link. I do not know what the issue is, atm. --- examples/cxx/kinetics_example1.cpp | 11 ++++++----- examples/cxx/kinetics_example2.cpp | 3 ++- examples/cxx/kinetics_example3.cpp | 2 +- examples/cxx/rxnpath_example1.cpp | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/examples/cxx/kinetics_example1.cpp b/examples/cxx/kinetics_example1.cpp index 561177d5a..ed8172356 100755 --- a/examples/cxx/kinetics_example1.cpp +++ b/examples/cxx/kinetics_example1.cpp @@ -23,6 +23,7 @@ #include "example_utils.h" using namespace Cantera; using namespace Cantera_CXX; +using namespace CanteraZeroD; using namespace std; // Kinetics example. This is written as a function so that one @@ -87,8 +88,8 @@ int kinetics_example1(int job) { // create a container object to run the simulation // and add the reactor to it - ReactorNet sim; - sim.addReactor(&r); + CanteraZeroD::ReactorNet *sim_ptr = new CanteraZeroD::ReactorNet(); + sim_ptr->addReactor(&r); double tm; double dt = 1.e-5; // interval at which output is written @@ -103,7 +104,7 @@ int kinetics_example1(int job) { clock_t t0 = clock(); for (int i = 1; i <= nsteps; i++) { tm = i*dt; - sim.advance(tm); + sim_ptr->advance(tm); saveSoln(tm, gas, soln); } clock_t t1 = clock(); @@ -120,8 +121,8 @@ int kinetics_example1(int job) { cout << " Tfinal = " << r.temperature() << endl; cout << " time = " << tmm << endl; cout << " number of residual function evaluations = " - << sim.integrator().nEvals() << endl; - cout << " time per evaluation = " << tmm/sim.integrator().nEvals() + << sim_ptr->integrator().nEvals() << endl; + cout << " time per evaluation = " << tmm/sim_ptr->integrator().nEvals() << endl << endl; cout << "Output files:" << endl << " kin1.csv (Excel CSV file)" << endl diff --git a/examples/cxx/kinetics_example2.cpp b/examples/cxx/kinetics_example2.cpp index 5461372f6..2aa5ee684 100755 --- a/examples/cxx/kinetics_example2.cpp +++ b/examples/cxx/kinetics_example2.cpp @@ -77,7 +77,8 @@ int kinetics_example2(int job) { // create a container object to run the simulation // and add the reactor to it - ReactorNet sim; + CanteraZeroD::ReactorNet * sim_ptr = new ReactorNet (); + CanteraZeroD::ReactorNet &sim = *sim_ptr; sim.addReactor(&r); double tm; diff --git a/examples/cxx/kinetics_example3.cpp b/examples/cxx/kinetics_example3.cpp index 362908f22..ab2932cfb 100644 --- a/examples/cxx/kinetics_example3.cpp +++ b/examples/cxx/kinetics_example3.cpp @@ -83,7 +83,7 @@ int kinetics_example3(int job) { // create a container object to run the simulation // and add the reactor to it - ReactorNet sim; + CanteraZeroD::ReactorNet& sim = *(new ReactorNet()); sim.addReactor(&r); double tm; diff --git a/examples/cxx/rxnpath_example1.cpp b/examples/cxx/rxnpath_example1.cpp index 0e5b0a71e..5ad7690ae 100755 --- a/examples/cxx/rxnpath_example1.cpp +++ b/examples/cxx/rxnpath_example1.cpp @@ -132,7 +132,7 @@ int rxnpath_example1(int job) { // create a container object to run the simulation // and add the reactor to it - ReactorNet sim; + CanteraZeroD::ReactorNet& sim = *(new ReactorNet ()); sim.addReactor(&r); // create a reaction path diagram builder