Skip to content

Commit

Permalink
Normalize whitespace in pxd files
Browse files Browse the repository at this point in the history
  • Loading branch information
speth authored and bryanwweber committed Jul 10, 2022
1 parent 92287be commit a67cb42
Show file tree
Hide file tree
Showing 16 changed files with 43 additions and 0 deletions.
1 change: 1 addition & 0 deletions interfaces/cython/cantera/_onedim.pxd
Expand Up @@ -155,6 +155,7 @@ cdef extern from "cantera/oneD/Sim1D.h":
void setTimeStepCallback(CxxFunc1*)
void setSteadyCallback(CxxFunc1*)


cdef extern from "cantera/thermo/IdealGasPhase.h":
cdef cppclass CxxIdealGasPhase "Cantera::IdealGasPhase"

Expand Down
4 changes: 4 additions & 0 deletions interfaces/cython/cantera/_utils.pxd
Expand Up @@ -58,9 +58,11 @@ cdef extern from "cantera/base/AnyMap.h" namespace "Cantera":
CxxAnyMap AnyMapFromYamlFile "Cantera::AnyMap::fromYamlFile" (string) except +translate_exception
CxxAnyMap AnyMapFromYamlString "Cantera::AnyMap::fromYamlString" (string) except +translate_exception


cdef extern from "cantera/base/stringUtils.h" namespace "Cantera":
cdef Composition parseCompString(string) except +translate_exception


cdef extern from "cantera/base/global.h" namespace "Cantera":
cdef void CxxAddDirectory "Cantera::addDirectory" (string)
cdef string CxxGetDataDirectories "Cantera::getDataDirectories" (string)
Expand All @@ -72,6 +74,7 @@ cdef extern from "cantera/base/global.h" namespace "Cantera":
cdef string CxxGitCommit "Cantera::gitCommit" ()
cdef cbool CxxDebugModeEnabled "Cantera::debugModeEnabled" ()


cdef extern from "cantera/cython/utils_utils.h":
cdef string get_cantera_version()
cdef int get_sundials_version()
Expand All @@ -80,6 +83,7 @@ cdef extern from "cantera/cython/utils_utils.h":

cdef void CxxSetLogger "setLogger" (CxxPythonLogger*)


cdef string stringify(x) except *
cdef pystr(string x)

Expand Down
1 change: 1 addition & 0 deletions interfaces/cython/cantera/ctcxx.pxd
Expand Up @@ -28,6 +28,7 @@ cdef extern from "cantera/cython/funcWrapper.h":
cdef cppclass CxxUnits "Cantera::Units"
cdef cppclass CxxUnitSystem "Cantera::UnitSystem"


cdef extern from "<memory>":
cppclass shared_ptr "std::shared_ptr" [T]:
T* get()
Expand Down
2 changes: 2 additions & 0 deletions interfaces/cython/cantera/delegator.pxd
Expand Up @@ -20,6 +20,7 @@ cdef extern from "<array>" namespace "std" nogil:
size_array3() except+
size_t& operator[](size_t)


cdef extern from "cantera/base/Delegator.h" namespace "Cantera":
cdef cppclass CxxDelegator "Cantera::Delegator":
Delegator()
Expand All @@ -34,6 +35,7 @@ cdef extern from "cantera/base/Delegator.h" namespace "Cantera":
void setDelegate(string&, function[int(string&, size_t)], string&) except +translate_exception
void setDelegate(string&, function[int(size_t&, string&)], string&) except +translate_exception


cdef extern from "cantera/cython/funcWrapper.h":
# pyOverride is actually a templated function, but we have to specify the individual
# instantiations because Cython doesn't understand variadic templates
Expand Down
2 changes: 2 additions & 0 deletions interfaces/cython/cantera/func1.pxd
Expand Up @@ -20,11 +20,13 @@ cdef extern from "cantera/cython/funcWrapper.h":
PyObject* exceptionValue()
void setExceptionValue(PyObject*)


cdef extern from "cantera/numerics/Func1.h":
cdef cppclass CxxTabulated1 "Cantera::Tabulated1":
CxxTabulated1(int, double*, double*, string) except +translate_exception
double eval(double) except +translate_exception


cdef class Func1:
cdef shared_ptr[CxxFunc1] _func
cdef CxxFunc1* func
Expand Down
4 changes: 4 additions & 0 deletions interfaces/cython/cantera/kinetics.pxd
Expand Up @@ -12,6 +12,7 @@ cdef extern from "cantera/numerics/eigen_sparse.h" namespace "Eigen":
size_t cols()
size_t outerSize()


cdef extern from "cantera/kinetics/Kinetics.h" namespace "Cantera":
cdef cppclass CxxReaction "Cantera::Reaction"
cdef cppclass CxxKinetics "Cantera::Kinetics":
Expand Down Expand Up @@ -47,11 +48,13 @@ cdef extern from "cantera/kinetics/Kinetics.h" namespace "Cantera":
void getDerivativeSettings(CxxAnyMap&) except +translate_exception
void setDerivativeSettings(CxxAnyMap&) except +translate_exception


cdef extern from "cantera/kinetics/InterfaceKinetics.h":
cdef cppclass CxxInterfaceKinetics "Cantera::InterfaceKinetics":
void advanceCoverages(double, double, double, double, size_t, size_t) except +translate_exception
void solvePseudoSteadyStateProblem() except +translate_exception


cdef extern from "cantera/cython/kinetics_utils.h":
cdef size_t CxxSparseTriplets "sparseTriplets" (CxxSparseMatrix, int*, int*, double*, size_t) except +translate_exception
cdef void CxxSparseCscData "sparseCscData" (CxxSparseMatrix, double*, int*, int*) except +translate_exception
Expand Down Expand Up @@ -120,6 +123,7 @@ cdef extern from "cantera/cython/kinetics_utils.h":
cdef CxxSparseMatrix kin_destructionRates_ddX(CxxKinetics*) except +translate_exception
cdef CxxSparseMatrix kin_netProductionRates_ddX(CxxKinetics*) except +translate_exception


ctypedef void (*kineticsMethod1d)(CxxKinetics*, double*) except +translate_exception
ctypedef CxxSparseMatrix (*kineticsMethodSparse)(CxxKinetics*) except +translate_exception

Expand Down
1 change: 1 addition & 0 deletions interfaces/cython/cantera/mixture.pxd
Expand Up @@ -45,6 +45,7 @@ cdef extern from "cantera/equil/MultiPhase.h" namespace "Cantera":
double cp() except +translate_exception
double volume() except +translate_exception


cdef class Mixture:
cdef CxxMultiPhase* mix
cdef list _phases
Expand Down
7 changes: 7 additions & 0 deletions interfaces/cython/cantera/reaction.pxd
Expand Up @@ -19,10 +19,12 @@ cdef extern from "<map>" namespace "std":
pair[iterator, bint] insert(pair[T, U]) nogil
iterator find(T&) nogil


cdef extern from "cantera/kinetics/ReactionRateFactory.h" namespace "Cantera":
cdef shared_ptr[CxxReactionRate] CxxNewReactionRate "newReactionRate" (string) except +translate_exception
cdef shared_ptr[CxxReactionRate] CxxNewReactionRate "newReactionRate" (CxxAnyMap&) except +translate_exception


cdef extern from "cantera/kinetics/ReactionRate.h" namespace "Cantera":
cdef cppclass CxxReactionRate "Cantera::ReactionRate":
CxxReactionRate()
Expand All @@ -32,6 +34,7 @@ cdef extern from "cantera/kinetics/ReactionRate.h" namespace "Cantera":
double eval(double, vector[double]&) except +translate_exception
CxxAnyMap parameters() except +translate_exception


cdef extern from "cantera/kinetics/Arrhenius.h" namespace "Cantera":
cdef cppclass CxxArrheniusBase "Cantera::ArrheniusBase" (CxxReactionRate):
CxxArrheniusBase()
Expand All @@ -57,12 +60,14 @@ cdef extern from "cantera/kinetics/Arrhenius.h" namespace "Cantera":
CxxBlowersMaselRate(CxxAnyMap) except +translate_exception
CxxBlowersMaselRate(double, double, double, double)


cdef extern from "cantera/kinetics/TwoTempPlasmaRate.h" namespace "Cantera":
cdef cppclass CxxTwoTempPlasmaRate "Cantera::TwoTempPlasmaRate" (CxxArrheniusBase):
CxxTwoTempPlasmaRate(CxxAnyMap) except +translate_exception
CxxTwoTempPlasmaRate(double, double, double, double)
double activationElectronEnergy()


cdef extern from "cantera/base/Array.h" namespace "Cantera":
cdef cppclass CxxArray2D "Cantera::Array2D":
CxxArray2D()
Expand All @@ -73,10 +78,12 @@ cdef extern from "cantera/base/Array.h" namespace "Cantera":
size_t nRows()
size_t nColumns()


cdef extern from "cantera/cython/wrappers.h":
# workaround for Cython assignment limitations
cdef void CxxArray2D_set(CxxArray2D, size_t, size_t, double)


cdef extern from "cantera/kinetics/Reaction.h" namespace "Cantera":
cdef cppclass CxxKinetics "Cantera::Kinetics"
cdef shared_ptr[CxxReaction] CxxNewReaction "Cantera::newReaction" (string) except +translate_exception
Expand Down
2 changes: 2 additions & 0 deletions interfaces/cython/cantera/reactionpath.pxd
Expand Up @@ -8,6 +8,7 @@ cdef extern from "<sstream>":
cdef cppclass CxxStringStream "std::stringstream":
string str()


cdef extern from "cantera/kinetics/ReactionPath.h":
cdef enum CxxFlow_t "flow_t":
CxxNetFlow "Cantera::NetFlow"
Expand Down Expand Up @@ -38,6 +39,7 @@ cdef extern from "cantera/kinetics/ReactionPath.h":
void init(CxxStringStream&, CxxKinetics&) except +translate_exception
void build(CxxKinetics&, string&, CxxStringStream&, CxxReactionPathDiagram&, cbool)


cdef class ReactionPathDiagram:
cdef CxxReactionPathDiagram diagram
cdef CxxReactionPathBuilder builder
Expand Down
2 changes: 2 additions & 0 deletions interfaces/cython/cantera/reactor.pxd
Expand Up @@ -155,6 +155,7 @@ cdef extern from "cantera/zerodim.h" namespace "Cantera":
size_t nparams()
string sensitivityParameterName(size_t) except +translate_exception


cdef extern from "cantera/zeroD/ReactorDelegator.h" namespace "Cantera":
cdef cppclass CxxReactorAccessor "Cantera::ReactorAccessor":
CxxReactorAccessor()
Expand All @@ -166,6 +167,7 @@ cdef extern from "cantera/zeroD/ReactorDelegator.h" namespace "Cantera":
void restoreThermoState() except +translate_exception
void restoreSurfaceState(size_t) except +translate_exception


ctypedef CxxReactorAccessor* CxxReactorAccessorPtr

cdef class ReactorBase:
Expand Down
5 changes: 5 additions & 0 deletions interfaces/cython/cantera/solutionbase.pxd
Expand Up @@ -10,18 +10,22 @@ cdef extern from "cantera/thermo/ThermoFactory.h" namespace "Cantera":
cdef cppclass CxxThermoPhase "Cantera::ThermoPhase"
cdef shared_ptr[CxxThermoPhase] newThermo(string) except +translate_exception


cdef extern from "cantera/kinetics/KineticsFactory.h" namespace "Cantera":
cdef cppclass CxxKinetics "Cantera::Kinetics"
cdef shared_ptr[CxxKinetics] newKinetics (string) except +translate_exception


cdef extern from "cantera/transport/TransportFactory.h" namespace "Cantera":
cdef cppclass CxxTransport "Cantera::Transport"
cdef shared_ptr[CxxTransport] newTransport(CxxThermoPhase*, string) except +translate_exception


cdef extern from "cantera/base/Interface.h" namespace "Cantera":
cdef shared_ptr[CxxSolution] newInterface(
string, string, vector[string]) except +translate_exception


cdef extern from "cantera/base/Solution.h" namespace "Cantera":
cdef cppclass CxxKinetics "Cantera::Kinetics"
cdef cppclass CxxTransport "Cantera::Transport"
Expand Down Expand Up @@ -50,6 +54,7 @@ cdef extern from "cantera/base/Solution.h" namespace "Cantera":
cdef shared_ptr[CxxSolution] newSolution (
CxxAnyMap&, CxxAnyMap&, string, vector[shared_ptr[CxxSolution]]) except +translate_exception


ctypedef void (*transportMethod1d)(CxxTransport*, double*) except +translate_exception
ctypedef void (*transportMethod2d)(CxxTransport*, size_t, double*) except +translate_exception
ctypedef void (*transportPolyMethod1i)(CxxTransport*, size_t, double*) except +translate_exception
Expand Down
2 changes: 2 additions & 0 deletions interfaces/cython/cantera/speciesthermo.pxd
Expand Up @@ -16,10 +16,12 @@ cdef extern from "cantera/thermo/SpeciesThermoInterpType.h":
CxxAnyMap parameters(cbool) except +translate_exception
CxxAnyMap& input()


cdef extern from "cantera/thermo/SpeciesThermoFactory.h":
cdef CxxSpeciesThermo* CxxNewSpeciesThermo "Cantera::newSpeciesThermoInterpType"\
(int, double, double, double, double*) except +translate_exception


cdef class SpeciesThermo:
cdef shared_ptr[CxxSpeciesThermo] _spthermo
cdef CxxSpeciesThermo* spthermo
Expand Down
5 changes: 5 additions & 0 deletions interfaces/cython/cantera/thermo.pxd
Expand Up @@ -25,6 +25,7 @@ cdef extern from "cantera/thermo/Species.h" namespace "Cantera":
cdef shared_ptr[CxxSpecies] CxxNewSpecies "newSpecies" (CxxAnyMap&) except +translate_exception
cdef vector[shared_ptr[CxxSpecies]] CxxGetSpecies "getSpecies" (CxxAnyValue&) except +translate_exception


cdef extern from "cantera/thermo/ThermoPhase.h" namespace "Cantera":
ctypedef enum ThermoBasis:
mass "Cantera::ThermoBasis::mass",
Expand Down Expand Up @@ -180,6 +181,7 @@ cdef extern from "cantera/thermo/SurfPhase.h":
void setCoveragesNoNorm(double*) except +translate_exception
void getCoverages(double*) except +translate_exception


cdef extern from "cantera/thermo/PlasmaPhase.h":
cdef cppclass CxxPlasmaPhase "Cantera::PlasmaPhase":
CxxPlasmaPhase()
Expand All @@ -201,6 +203,7 @@ cdef extern from "cantera/thermo/PlasmaPhase.h":
double meanElectronEnergy()
size_t nElectronEnergyLevels() except +translate_exception


cdef extern from "cantera/cython/thermo_utils.h":
# ThermoPhase composition
cdef void thermo_getMassFractions(CxxThermoPhase*, double*) except +translate_exception
Expand Down Expand Up @@ -232,6 +235,7 @@ cdef extern from "cantera/cython/thermo_utils.h":
cdef void thermo_getMolecularWeights(CxxThermoPhase*, double*) except +translate_exception
cdef void thermo_getCharges(CxxThermoPhase*, double*) except +translate_exception


ctypedef void (*thermoMethod1d)(CxxThermoPhase*, double*) except +translate_exception

cdef extern from "cantera/thermo/Elements.h" namespace "Cantera":
Expand All @@ -246,6 +250,7 @@ cdef extern from "cantera/thermo/Elements.h" namespace "Cantera":
string getElementName(string ename) except +translate_exception
string getElementName(int atomicNumber) except +translate_exception


cdef class Species:
cdef shared_ptr[CxxSpecies] _species
cdef CxxSpecies* species
Expand Down
3 changes: 3 additions & 0 deletions interfaces/cython/cantera/transport.pxd
Expand Up @@ -30,6 +30,7 @@ cdef extern from "cantera/transport/DustyGasTransport.h" namespace "Cantera":
void getMolarFluxes(double*, double*, double, double*) except +translate_exception
CxxTransport& gasTransport() except +translate_exception


cdef extern from "cantera/transport/TransportData.h" namespace "Cantera":
cdef cppclass CxxTransportData "Cantera::TransportData":
CxxTransportData()
Expand All @@ -51,6 +52,7 @@ cdef extern from "cantera/transport/TransportData.h" namespace "Cantera":
double dispersion_coefficient
double quadrupole_polarizability


cdef extern from "cantera/cython/transport_utils.h":
cdef void tran_getMixDiffCoeffs(CxxTransport*, double*) except +translate_exception
cdef void tran_getMixDiffCoeffsMass(CxxTransport*, double*) except +translate_exception
Expand All @@ -70,6 +72,7 @@ cdef extern from "cantera/cython/transport_utils.h":
cdef void tran_setConductivityPolynomial(CxxTransport*, size_t, double*) except +translate_exception
cdef void tran_setBinDiffusivityPolynomial(CxxTransport*, size_t, size_t, double*) except +translate_exception


cdef class GasTransportData:
cdef shared_ptr[CxxTransportData] _data
cdef CxxGasTransportData* data
Expand Down
1 change: 1 addition & 0 deletions interfaces/cython/cantera/units.pxd
Expand Up @@ -23,6 +23,7 @@ cdef extern from "cantera/base/Units.h" namespace "Cantera":
stdmap[string, string] defaults()
void setDefaults(stdmap[string, string]&) except +translate_exception


cdef class Units:
cdef CxxUnits units
@staticmethod
Expand Down
1 change: 1 addition & 0 deletions interfaces/cython/cantera/yamlwriter.pxd
Expand Up @@ -19,6 +19,7 @@ cdef extern from "cantera/base/YamlWriter.h" namespace "Cantera":
void skipUserDefined(cbool)
void setUnitSystem(CxxUnitSystem&) except +translate_exception


cdef class YamlWriter:
cdef shared_ptr[CxxYamlWriter] _writer
cdef CxxYamlWriter* writer
Expand Down

0 comments on commit a67cb42

Please sign in to comment.