Fixed compilation problems that occurred when porting to solaris
This commit is contained in:
parent
b5fd1d76ac
commit
c0543fe571
8 changed files with 10 additions and 10 deletions
|
|
@ -288,7 +288,7 @@ namespace Cantera {
|
|||
* \f]
|
||||
*/
|
||||
void AqueousTransport::getSpeciesFluxes(int ndim,
|
||||
doublereal* grad_T,
|
||||
const doublereal* grad_T,
|
||||
int ldx, const doublereal* grad_X,
|
||||
int ldf, doublereal* fluxes) {
|
||||
set_Grad_T(grad_T);
|
||||
|
|
|
|||
|
|
@ -249,7 +249,7 @@ namespace Cantera {
|
|||
*
|
||||
*/
|
||||
virtual void getSpeciesFluxes(int ndim,
|
||||
doublereal* grad_T,
|
||||
const doublereal* grad_T,
|
||||
int ldx, const doublereal* grad_X,
|
||||
int ldf, doublereal* fluxes);
|
||||
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ namespace Cantera {
|
|||
m_gastran(0)
|
||||
{}
|
||||
|
||||
void DustyGasTransport::setParameters(int type, int k, doublereal* p) {
|
||||
void DustyGasTransport::setParameters(const int type, const int k, const doublereal* const p) {
|
||||
switch(type) {
|
||||
case 0:
|
||||
setPorosity(p[0]); break;
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ namespace Cantera {
|
|||
|
||||
virtual int model() { return cDustyGasTransport; }
|
||||
|
||||
virtual void setParameters(int type, int k, doublereal* p);
|
||||
virtual void setParameters(const int type, const int k, const doublereal* const p);
|
||||
|
||||
virtual void getMultiDiffCoeffs(int ld, doublereal* d);
|
||||
|
||||
|
|
|
|||
|
|
@ -162,7 +162,7 @@ namespace Cantera {
|
|||
/*
|
||||
* This is where we dimension everything.
|
||||
*/
|
||||
bool LiquidTransport::init(LiquidTransportParams& tr) {
|
||||
bool LiquidTransport::initLiquid(LiquidTransportParams& tr) {
|
||||
|
||||
// constant substance attributes
|
||||
m_thermo = tr.thermo;
|
||||
|
|
@ -396,7 +396,7 @@ namespace Cantera {
|
|||
* \f]
|
||||
*/
|
||||
void LiquidTransport::getSpeciesFluxes(int ndim,
|
||||
doublereal* grad_T,
|
||||
const doublereal* grad_T,
|
||||
int ldx, const doublereal* grad_X,
|
||||
int ldf, doublereal* fluxes) {
|
||||
set_Grad_T(grad_T);
|
||||
|
|
|
|||
|
|
@ -302,7 +302,7 @@ namespace Cantera {
|
|||
*
|
||||
*/
|
||||
virtual void getSpeciesFluxes(int ndim,
|
||||
doublereal* grad_T,
|
||||
const doublereal* grad_T,
|
||||
int ldx, const doublereal* grad_X,
|
||||
int ldf, doublereal* fluxes);
|
||||
|
||||
|
|
@ -339,7 +339,7 @@ namespace Cantera {
|
|||
* @param tr Transport parameters for all of the species
|
||||
* in the phase.
|
||||
*/
|
||||
virtual bool init(LiquidTransportParams& tr);
|
||||
virtual bool initLiquid(LiquidTransportParams& tr);
|
||||
|
||||
friend class TransportFactory;
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ namespace Cantera {
|
|||
|
||||
SolidTransport::SolidTransport() {}
|
||||
|
||||
void SolidTransport::setParameters(int n, int k, double* p) {
|
||||
void SolidTransport::setParameters(const int n, const int k, const double* const p) {
|
||||
switch (n) {
|
||||
|
||||
case 0:
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ virtual ~SolidTransport() {}
|
|||
virtual doublereal thermalConductivity();
|
||||
virtual void getMixDiffCoeffs(doublereal* d);
|
||||
virtual void getMobilities(doublereal* mobil);
|
||||
virtual void setParameters(int n, int k, doublereal* p);
|
||||
virtual void setParameters(const int n, const int k, const doublereal* const p);
|
||||
|
||||
friend class TransportFactory;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue