GreenPolyProducts/cantera
5
0
Fork 0
mirror of https://github.com/Cantera/cantera.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Miscellaneous whitespace cleanup

Browse Source
This commit is contained in:
Ray Speth
2014-05-08 23:01:12 +00:00
parent 2df0396879
commit 54ded64e4b
14 changed files with 2 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/cantera/PureFluid.h
View File

@@ -4,20 +4,16 @@
#include "thermo/PureFluidPhase.h"
#include "kinetics.h"
#include "base/stringUtils.h"
namespace Cantera
{
class PureFluid : public PureFluidPhase
{
public:
PureFluid() : m_ok(false), m_r(0) {}
PureFluid(const std::string& infile, std::string id="") : m_ok(false), m_r(0) {
m_r = get_XML_File(infile);
if (id == "-") {
id = "";
@@ -27,7 +23,6 @@ public:
"buildSolutionFromXML returned false");
}
PureFluid(XML_Node& root, const std::string& id) : m_ok(false), m_r(0) {
m_ok = buildSolutionFromXML(root, id, "phase", this, 0);
}
@@ -35,9 +30,11 @@ public:
bool operator!() {
return !m_ok;
}
bool ready() const {
return m_ok;
}
friend std::ostream& operator<<(std::ostream& s, PureFluid& mix) {
std::string r = mix.report(true);
s << r;
@@ -47,8 +44,6 @@ public:
protected:
bool m_ok;
XML_Node* m_r;
private:
};
class Water : public PureFluid
@@ -60,5 +55,4 @@ public:
}
#endif

6
include/cantera/base/Array.h
View File

@@ -17,8 +17,6 @@
namespace Cantera
{
//! A class for 2D arrays stored in column-major
//! (Fortran-compatible) form.
/*!
@@ -32,9 +30,7 @@ namespace Cantera
*/
class Array2D
{
public:
//! Type definition for the iterator class that is
//! can be used by Array2D types.
/*!
@@ -42,7 +38,6 @@ public:
*/
typedef vector_fp::iterator iterator;
//! Type definition for the const_iterator class that is
//! can be used by Array2D types.
/*!
@@ -376,7 +371,6 @@ public:
}
protected:
//! Data stored in a single array
vector_fp m_data;

4
include/cantera/base/vec_functions.h
View File

@@ -19,8 +19,6 @@
namespace Cantera
{
//! Templated function that copies the first n entries from x to y.
/*!
*
@@ -126,7 +124,6 @@ inline void add_each(T& x, const T& y)
x.begin(), std::plus<typename T::value_type>());
}
//! Templated dot ratio class
/*!
* Calculates the quantity:
@@ -155,7 +152,6 @@ inline doublereal _dot_ratio(InputIter x_begin, InputIter x_end,
return start_value;
}
//! Finds the entry in a vector with maximum absolute
//! value, and return this value.
/*!

7
include/cantera/thermo/DebyeHuckel.h
View File

@@ -908,7 +908,6 @@ public:
/// @name Partial Molar Properties of the Solution
//@{
//! Get the species chemical potentials. Units: J/kmol.
/*!
*
@@ -1007,7 +1006,6 @@ public:
//@}
protected:
/**
* @name Chemical Equilibrium
* @{
@@ -1025,7 +1023,6 @@ protected:
* @param lambda_RT Input vector of dimensionless element potentials
* The length is equal to nElements().
*/
public:
virtual void setToEquilState(const doublereal* lambda_RT) {
throw NotImplementedError("DebyeHuckel::setToEquilState");
}
@@ -1255,8 +1252,6 @@ private:
//@}
protected:
//! form of the Debye-Huckel parameterization used in the model.
/*!
* The options are described at the top of this document,
@@ -1346,7 +1341,6 @@ protected:
mutable double m_IionicMolalityStoich;
public:
/**
* Form of the constant outside the Debye-Huckel term
* called A. It's normally a function of temperature
@@ -1366,7 +1360,6 @@ public:
int m_form_A_Debye;
protected:
//! Current value of the Debye Constant, A_Debye
/**
* A_Debye -> this expression appears on the top of the

2
include/cantera/thermo/IdealMolalSoln.h
View File

@@ -450,7 +450,6 @@ public:
/// @name Partial Molar Properties of the Solution
//@{
//!Get the species chemical potentials: Units: J/kmol.
/*!
* This function returns a vector of chemical potentials of the
@@ -495,7 +494,6 @@ public:
*/
virtual void getPartialMolarEnthalpies(doublereal* hbar) const;
//! Returns an array of partial molar entropies of the species in the solution. Units: J/kmol.
/*!
*

6
src/base/application.cpp
View File

@@ -25,7 +25,6 @@ using std::endl;
namespace Cantera
{
// If running multiple threads in a cpp application, the Application class
// is the only internal object that is single instance with static data.
@@ -50,7 +49,6 @@ static mutex_t app_mutex;
//! Mutex for controlling access to XML file storage
static mutex_t xml_mutex;
Application::Messages::Messages() :
errorMessage(0),
errorRoutine(0),
@@ -222,7 +220,6 @@ void Application::thread_complete()
#endif
}
XML_Node* Application::get_XML_File(const std::string& file, int debug)
{
ScopedLock xmlLock(xml_mutex);
@@ -322,7 +319,6 @@ XML_Node* Application::get_XML_File(const std::string& file, int debug)
return xmlfiles[ff];
}
void Application::close_XML_File(const std::string& file)
{
ScopedLock xmlLock(xml_mutex);
@@ -428,8 +424,6 @@ void Application::Messages::logErrors()
errorRoutine.clear();
}
void Application::setDefaultDirectories()
{
std::vector<string>& dirs = inputDirs;

2
src/equil/vcs_MultiPhaseEquil.cpp
View File

@@ -197,8 +197,6 @@ int vcs_MultiPhaseEquil::equilibrate_HP(doublereal Htarget,
int printLvlSub = std::max(printLvl - 1, 0);
for (int n = 0; n < maxiter; n++) {
// start with a loose error tolerance, but tighten it as we get
// close to the final temperature
try {

2
src/equil/vcs_solve_TP.cpp
View File

@@ -537,8 +537,6 @@ L_MAINLOOP_ALL_SPECIES:
m_molNumSpecies_new[kspec] = m_molNumSpecies_old[kspec];
}
} else {
if (m_speciesStatus[kspec] == VCS_SPECIES_INTERFACIALVOLTAGE) {
/********************************************************************/
/************************ VOLTAGE SPECIES ***************************/

9
src/numerics/Func1.cpp
View File

@@ -8,7 +8,6 @@ using namespace std;
namespace Cantera
{
Func1::Func1() :
m_c(0.0),
m_f1(0),
@@ -123,25 +122,21 @@ int Func1::order() const
return 3;
}
Func1& Func1::func1_dup() const
{
return m_f1->duplicate();
}
Func1& Func1::func2_dup() const
{
return m_f2->duplicate();
}
Func1* Func1::parent() const
{
return m_parent;
}
void Func1::setParent(Func1* p)
{
m_parent = p;
@@ -224,9 +219,6 @@ string Func1::write(const std::string& arg) const
return "<unknown " + int2str(ID()) + ">("+arg+")";
}
string Pow1::write(const std::string& arg) const
{
//cout << "Pow1" << endl;
@@ -245,7 +237,6 @@ string Pow1::write(const std::string& arg) const
}
}
string Const1::write(const std::string& arg) const
{
//cout << "Const1" << endl;

2
src/numerics/solveProb.cpp
View File

@@ -846,8 +846,6 @@ void solveProb::printFinal(int ioflag, doublereal damp, size_t label_d, size_t l
}
#ifdef DEBUG_SOLVEPROB
else if (ioflag > 1) {
printf("\n================================== FINAL RESULT ========="
"==================================================\n");

4
src/oneD/StFlow.cpp
View File

@@ -285,8 +285,6 @@ void StFlow::eval(size_t jg, doublereal* xg,
doublereal sum, sum2, dtdzj;
for (j = jmin; j <= jmax; j++) {
//----------------------------------------------
// left boundary
//----------------------------------------------
@@ -323,7 +321,6 @@ void StFlow::eval(size_t jg, doublereal* xg,
rsd[index(c_offset_Y, 0)] = 1.0 - sum;
}
else if (j == m_points - 1) {
evalRightBoundary(x, rsd, diag, rdt);
@@ -959,7 +956,6 @@ void FreeFlame::_finalize(const doublereal* x)
}
}
void FreeFlame::restore(const XML_Node& dom, doublereal* soln, int loglevel)
{
StFlow::restore(dom, soln, loglevel);

5
src/thermo/Elements.cpp
View File

@@ -17,7 +17,6 @@ using namespace std;
namespace Cantera
{
/*! Database for atomic molecular weights
* Values are taken from the 1989 Standard Atomic Weights, CRC
*
@@ -185,10 +184,6 @@ doublereal LookupWtElements(const std::string& ename)
return -1.0;
}
//! Exception class to indicate a fixed set of elements.
/*!
* This class is used to warn the user when the number of elements

4
src/thermo/MolarityIonicVPSSTP.cpp
View File

@@ -339,13 +339,10 @@ void MolarityIonicVPSSTP::s_update_lnActCoeff() const
void MolarityIonicVPSSTP::s_update_dlnActCoeff_dT() const
{
}
void MolarityIonicVPSSTP::s_update_dlnActCoeff_dX_() const
{
}
void MolarityIonicVPSSTP::initThermo()
@@ -458,7 +455,6 @@ void MolarityIonicVPSSTP::initThermoXML(XML_Node& phaseNode, const std::string&
void MolarityIonicVPSSTP::readXMLBinarySpecies(XML_Node& xmLBinarySpecies)
{
std::string xname = xmLBinarySpecies.name();
}
std::string MolarityIonicVPSSTP::report(bool show_thermo) const

7
src/thermo/RedlichKwongMFTP.cpp
View File

@@ -737,19 +737,15 @@ void RedlichKwongMFTP::setToEquilState(const doublereal* mu_RT)
void RedlichKwongMFTP::initLengths()
{
a_vec_Curr_.resize(m_kk * m_kk, 0.0);
b_vec_Curr_.resize(m_kk, 0.0);
a_coeff_vec.resize(2, m_kk * m_kk, 0.0);
m_pc_Species.resize(m_kk, 0.0);
m_tc_Species.resize(m_kk, 0.0);
m_vc_Species.resize(m_kk, 0.0);
m_pp.resize(m_kk, 0.0);
m_tmpV.resize(m_kk, 0.0);
m_partialMolarVolumes.resize(m_kk, 0.0);
@@ -778,7 +774,6 @@ void RedlichKwongMFTP::initThermoXML(XML_Node& phaseNode, const std::string& id)
"Unknown thermo model : " + model);
}
/*
* Go get all of the coefficients and factors in the
* activityCoefficients XML block
@@ -1102,7 +1097,6 @@ doublereal RedlichKwongMFTP::densityCalc(doublereal TKelvin, doublereal presPa,
}
doublereal volguess = mmw / rhoguess;
NSolns_ = NicholsSolve(TKelvin, presPa, m_a_current, m_b_current, Vroot_);
@@ -1283,7 +1277,6 @@ void RedlichKwongMFTP::calculateAB(doublereal temp, doublereal& aCalc, doublerea
doublereal RedlichKwongMFTP::da_dt() const
{
doublereal dadT = 0.0;
if (m_formTempParam == 1) {
for (size_t i = 0; i < m_kk; i++) {