From 75e586da0f79b2f7b0ab09c03fa7f3b47ddd5e08 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Thu, 13 Jun 2013 22:50:21 +0000 Subject: [PATCH] Remove unusable CHEMKIN_COMPATIBILITY_MODE macro --- include/cantera/base/ct_defs.h | 2 -- include/cantera/transport/MultiTransport.h | 4 ---- src/transport/L_matrix.h | 4 ---- src/transport/MultiTransport.cpp | 3 --- 4 files changed, 13 deletions(-) diff --git a/include/cantera/base/ct_defs.h b/include/cantera/base/ct_defs.h index 4712530ad..d32850701 100644 --- a/include/cantera/base/ct_defs.h +++ b/include/cantera/base/ct_defs.h @@ -30,8 +30,6 @@ namespace Cantera { -#undef CHEMKIN_COMPATIBILITY_MODE - //! Creates a pointer to the start of the raw data for a vector #ifndef DATA_PTR #define DATA_PTR(vec) &vec[0] diff --git a/include/cantera/transport/MultiTransport.h b/include/cantera/transport/MultiTransport.h index 08b7fd95e..3b1e15b03 100644 --- a/include/cantera/transport/MultiTransport.h +++ b/include/cantera/transport/MultiTransport.h @@ -8,10 +8,6 @@ #ifndef CT_MULTITRAN_H #define CT_MULTITRAN_H -// Define this for better agreement with Chemkin TRANLIB results, even -// if the results are less correct. -//#undef CHEMKIN_COMPATIBILITY_MODE - // Cantera includes #include "GasTransport.h" #include "cantera/numerics/DenseMatrix.h" diff --git a/src/transport/L_matrix.h b/src/transport/L_matrix.h index e2d1c508c..f256ab0a5 100644 --- a/src/transport/L_matrix.h +++ b/src/transport/L_matrix.h @@ -17,11 +17,7 @@ const doublereal Min_C_Internal = 0.001; bool MultiTransport::hasInternalModes(size_t j) { -#ifdef CHEMKIN_COMPATIBILITY_MODE - return (m_crot[j] > Min_C_Internal); -#else return (m_cinternal[j] > Min_C_Internal); -#endif } void MultiTransport::eval_L0000(const doublereal* const x) diff --git a/src/transport/MultiTransport.cpp b/src/transport/MultiTransport.cpp index 55770d6e1..2f3005218 100644 --- a/src/transport/MultiTransport.cpp +++ b/src/transport/MultiTransport.cpp @@ -165,9 +165,6 @@ void MultiTransport::solveLMatrixEquation() // all *monatomic* species are excluded. Since monatomic // radicals can have non-zero internal heat capacities due to // electronic excitation, they should be retained. - // - // But if CHEMKIN_COMPATIBILITY_MODE is defined, then all - // monatomic species are excluded. for (size_t k = 0; k < m_nsp; k++) { if (!hasInternalModes(k)) {