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

Fixed namespace issues.

Browse source
This commit is contained in:
Harry Moffat 2011-03-28 21:05:22 +00:00
parent fc816aefb6
commit 5d5138c677
7 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/cxx/equil_example1.cpp
View file

@ -25,6 +25,8 @@
using namespace Cantera; using namespace Cantera;
using namespace Cantera_CXX; using namespace Cantera_CXX;
using namespace CanteraZeroD;
using namespace std;
//------------------------------------------------------------------- //-------------------------------------------------------------------
// utility functions for plotting // utility functions for plotting

20
examples/cxx/example_utils.h
View file

@ -5,9 +5,7 @@
#include <cantera/kernel/plots.h> #include <cantera/kernel/plots.h>
using namespace Cantera; using namespace Cantera;
using namespace std;
namespace CanteraZeroD{} namespace CanteraZeroD{}
using namespace CanteraZeroD;
// Save the temperature, density, pressure, and mole fractions at one // Save the temperature, density, pressure, and mole fractions at one
// time // time
@ -47,22 +45,22 @@ void makeDataLabels(const G& gas, V& names) {
} }
template<class G, class A> template<class G, class A>
void plotSoln(string fname, string fmt, string title, const G& gas, const A& soln) { void plotSoln(std::string fname, std::string fmt, std::string title, const G& gas, const A& soln) {
vector<string> names; std::vector<std::string> names;
makeDataLabels(gas, names); makeDataLabels(gas, names);
writePlotFile(fname, fmt, title, names, soln); writePlotFile(fname, fmt, title, names, soln);
} }
inline void writeCanteraHeader(ostream& s) { inline void writeCanteraHeader(std::ostream& s) {
s << endl; s << std::endl;
#ifdef CANTERA_VERSION #ifdef CANTERA_VERSION
s << " Cantera version " << CANTERA_VERSION << endl; s << " Cantera version " << CANTERA_VERSION << std::endl;
#else #else
s << " ???" << endl; s << " ???" << std::endl;
#endif #endif
s << " Copyright California Institute of Technology, 2002." << endl; s << " Copyright California Institute of Technology, 2002." << std::endl;
s << " http://www.cantera.org" << endl; s << " http://www.cantera.org" << std::endl;
s << endl; s << std::endl;
} }
#endif #endif

2
examples/cxx/kinetics_example2.cpp
View file

@ -24,6 +24,8 @@
using namespace Cantera; using namespace Cantera;
using namespace Cantera_CXX; using namespace Cantera_CXX;
using namespace CanteraZeroD;
using namespace std;
/** /**
* Same as kinetics_example1, except that it uses class GRI30 instead * Same as kinetics_example1, except that it uses class GRI30 instead
* of class IdealGasMix. * of class IdealGasMix.

2
examples/cxx/kinetics_example3.cpp
View file

@ -24,6 +24,8 @@
using namespace Cantera; using namespace Cantera;
using namespace Cantera_CXX; using namespace Cantera_CXX;
using namespace std;
using namespace CanteraZeroD;
// Kinetics example. This is written as a function so that one // Kinetics example. This is written as a function so that one
// driver program can run multiple examples. // driver program can run multiple examples.

3
examples/cxx/rxnpath_example1.cpp
View file

@ -24,9 +24,10 @@
#include <cantera/IdealGasMix.h> #include <cantera/IdealGasMix.h>
// #include <iostream> // #include <iostream>
// using namespace std; using namespace std;
using namespace Cantera; using namespace Cantera;
using namespace Cantera_CXX; using namespace Cantera_CXX;
using namespace CanteraZeroD;
void writeRxnPathDiagram(double time, ReactionPathBuilder& b, void writeRxnPathDiagram(double time, ReactionPathBuilder& b,
IdealGasMix& gas, ostream& logfile, ostream& outfile) { IdealGasMix& gas, ostream& logfile, ostream& outfile) {

2
examples/cxx/transport_example1.cpp
View file

@ -24,6 +24,8 @@
using namespace Cantera; using namespace Cantera;
using namespace Cantera_CXX; using namespace Cantera_CXX;
using namespace CanteraZeroD;
using namespace std;
template<class G, class V> template<class G, class V>
void makeTransportDataLabels(const G& gas, V& names) { void makeTransportDataLabels(const G& gas, V& names) {

2
examples/cxx/transport_example2.cpp
View file

@ -25,6 +25,8 @@
using namespace Cantera; using namespace Cantera;
using namespace Cantera_CXX; using namespace Cantera_CXX;
using namespace CanteraZeroD;
using namespace std;
template<class G, class V> template<class G, class V>
void makeTransportDataLabels(const G& gas, V& names) { void makeTransportDataLabels(const G& gas, V& names) {