Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Some Transport updates #1327

Merged
merged 3 commits into from Jul 3, 2022
Merged

Some Transport updates #1327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8563022
[Transport] Rename TransportBase.h to Transport.h
ischoegl Jun 8, 2022
eb571f7
[Python] Update transport constructors
ischoegl Jun 8, 2022
b69c989
Adopt review suggestions
ischoegl Jul 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/cantera/core.h
View file
Open in desktop
Expand Up @@ -12,6 +12,6 @@
#include "cantera/base/Solution.h"
#include "cantera/thermo/ThermoPhase.h"
#include "cantera/kinetics/Kinetics.h"
#include "cantera/transport/TransportBase.h"
#include "cantera/transport/Transport.h"

#endif
2 changes: 1 addition & 1 deletion include/cantera/cython/wrappers.h
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
#include "cantera/base/logger.h"
#include "cantera/numerics/eigen_sparse.h"
#include "cantera/thermo/ThermoPhase.h"
#include "cantera/transport/TransportBase.h"
#include "cantera/transport/Transport.h"
#include "cantera/kinetics/Kinetics.h"

#include "Python.h"
Expand Down
2 changes: 1 addition & 1 deletion include/cantera/transport/DustyGasTransport.h
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
#define CT_DUSTYGASTRAN_H

// Cantera includes
#include "TransportBase.h"
#include "Transport.h"
#include "cantera/numerics/DenseMatrix.h"

namespace Cantera
Expand Down
20 changes: 10 additions & 10 deletions include/cantera/transport/GasTransport.h
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
#ifndef CT_GAS_TRANSPORT_H
#define CT_GAS_TRANSPORT_H

#include "TransportBase.h"
#include "Transport.h"
#include "cantera/numerics/DenseMatrix.h"

namespace Cantera
Expand Down Expand Up @@ -129,9 +129,9 @@ class GasTransport : public Transport

//! Return the polynomial fits to the collision integral of species pair (i, j)
//! @see fitCollisionIntegrals()
virtual void getCollisionIntegralPolynomial(size_t i, size_t j,
double* astar_coeffs,
double* bstar_coeffs,
virtual void getCollisionIntegralPolynomial(size_t i, size_t j,
double* astar_coeffs,
double* bstar_coeffs,
double* cstar_coeffs) const;

//! Modify the polynomial fits to the viscosity of species i
Expand All @@ -148,13 +148,13 @@ class GasTransport : public Transport

//! Modify the polynomial fits to the collision integral of species pair (i, j)
//! @see fitCollisionIntegrals()
virtual void setCollisionIntegralPolynomial(size_t i, size_t j,
double* astar_coeffs,
double* bstar_coeffs,
virtual void setCollisionIntegralPolynomial(size_t i, size_t j,
double* astar_coeffs,
double* bstar_coeffs,
double* cstar_coeffs, bool actualT);

virtual void init(ThermoPhase* thermo, int mode=0, int log_level=0);

//! Boolean indicating the form of the transport properties polynomial fits.
//! Returns true if the Chemkin form is used.
bool CKMode() const {
Expand Down Expand Up @@ -418,8 +418,8 @@ class GasTransport : public Transport
* (i,j).
*/
std::vector<vector_fp> m_omega22_poly;
//! Flag to indicate for which (i,j) interaction pairs the

//! Flag to indicate for which (i,j) interaction pairs the
//! actual temperature is used instead of the reduced temperature
std::vector<vector_int> m_star_poly_uses_actualT;

Expand Down