diff --git a/SConstruct b/SConstruct index 14ef1f244..4db92b295 100644 --- a/SConstruct +++ b/SConstruct @@ -147,6 +147,9 @@ if os.name == 'nt': for key,val in env['ENV'].iteritems(): env['ENV'][key] = str(val) +if 'FRAMEWORKS' not in env: + env['FRAMEWORKS'] = [] + add_RegressionTest(env) class defaults: pass diff --git a/include/cantera/thermo/IdealGasPhase.h b/include/cantera/thermo/IdealGasPhase.h index 2d15b9abb..cef7143f6 100644 --- a/include/cantera/thermo/IdealGasPhase.h +++ b/include/cantera/thermo/IdealGasPhase.h @@ -520,10 +520,10 @@ public: * \f[ * \kappa_T = -\frac{1}{v}\left(\frac{\partial v}{\partial P}\right)_T * \f] - * For ideal gases it's equal to the negative of the inverse of the pressure + * For ideal gases it's equal to the inverse of the pressure */ virtual doublereal isothermalCompressibility() const { - return -1.0/pressure(); + return 1.0/pressure(); } //! Return the volumetric thermal expansion coefficient. Units: 1/K. diff --git a/interfaces/python/ctml_writer.py b/interfaces/python/ctml_writer.py index 3456032ec..860ffe312 100644 --- a/interfaces/python/ctml_writer.py +++ b/interfaces/python/ctml_writer.py @@ -1284,15 +1284,16 @@ class falloff_reaction(reaction): if 'M)' in self._r: del self._r['M)'] del self._p['M)'] - if 'm)' in self._r: + elif 'm)' in self._r: del self._r['m)'] del self._p['m)'] else: for r in self._r.keys(): if r[-1] == ')' and r.find('(') < 0: + species = r[:-1] if self._eff: - raise CTI_Error('(+ '+mspecies+') and '+self._eff+' cannot both be specified') - self._eff = r[-1]+':1.0' + raise CTI_Error('(+ '+species+') and '+self._eff+' cannot both be specified') + self._eff = species+':1.0' self._effm = 0.0 del self._r[r] diff --git a/src/thermo/IdealSolnGasVPSS.cpp b/src/thermo/IdealSolnGasVPSS.cpp index 06019a3e0..254bcad70 100644 --- a/src/thermo/IdealSolnGasVPSS.cpp +++ b/src/thermo/IdealSolnGasVPSS.cpp @@ -202,7 +202,7 @@ void IdealSolnGasVPSS::calcDensity() doublereal IdealSolnGasVPSS::isothermalCompressibility() const { if (m_idealGas) { - return -1.0 / m_Pcurrent; + return 1.0 / m_Pcurrent; } else { throw CanteraError("IdealSolnGasVPSS::isothermalCompressibility() ", "not implemented"); diff --git a/src/thermo/MetalSHEelectrons.cpp b/src/thermo/MetalSHEelectrons.cpp index 9758bc3f6..951c43085 100644 --- a/src/thermo/MetalSHEelectrons.cpp +++ b/src/thermo/MetalSHEelectrons.cpp @@ -208,7 +208,7 @@ void MetalSHEelectrons::setPressure(doublereal p) */ doublereal MetalSHEelectrons::isothermalCompressibility() const { - return -1.0/pressure(); + return 1.0/pressure(); } //==================================================================================================================== /*