From a8659c86ccecc2564d1266c1273f86bdbc0e99e9 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Wed, 29 Oct 2014 23:32:24 +0000 Subject: [PATCH] [Kinetics] Removed unnecessary initializations --- src/kinetics/AqueousKinetics.cpp | 2 -- src/kinetics/GasKinetics.cpp | 16 +---------- src/kinetics/InterfaceKinetics.cpp | 44 +----------------------------- src/kinetics/Kinetics.cpp | 18 +----------- 4 files changed, 3 insertions(+), 77 deletions(-) diff --git a/src/kinetics/AqueousKinetics.cpp b/src/kinetics/AqueousKinetics.cpp index 3273f3121..f90c3dcf6 100644 --- a/src/kinetics/AqueousKinetics.cpp +++ b/src/kinetics/AqueousKinetics.cpp @@ -20,7 +20,6 @@ namespace Cantera { AqueousKinetics::AqueousKinetics(thermo_t* thermo) : - Kinetics(), m_nfall(0), m_nirrev(0), m_nrev(0), @@ -34,7 +33,6 @@ AqueousKinetics::AqueousKinetics(thermo_t* thermo) : } AqueousKinetics::AqueousKinetics(const AqueousKinetics& right) : - Kinetics(), m_nfall(0), m_nirrev(0), m_nrev(0), diff --git a/src/kinetics/GasKinetics.cpp b/src/kinetics/GasKinetics.cpp index 84e064ad8..d700e77b6 100644 --- a/src/kinetics/GasKinetics.cpp +++ b/src/kinetics/GasKinetics.cpp @@ -13,7 +13,6 @@ using namespace std; namespace Cantera { GasKinetics::GasKinetics(thermo_t* thermo) : - Kinetics(), m_nfall(0), m_nirrev(0), m_nrev(0), @@ -28,23 +27,10 @@ GasKinetics::GasKinetics(thermo_t* thermo) : if (thermo != 0) { addPhase(*thermo); } - m_temp = 0.0; } -GasKinetics::GasKinetics(const GasKinetics& right) : - Kinetics(), - m_nfall(0), - m_nirrev(0), - m_nrev(0), - m_logp_ref(0.0), - m_logc_ref(0.0), - m_logStandConc(0.0), - m_ROP_ok(false), - m_temp(0.0), - m_pres(0.0), - m_finalized(false) +GasKinetics::GasKinetics(const GasKinetics& right) { - m_temp = 0.0; *this = right; } diff --git a/src/kinetics/InterfaceKinetics.cpp b/src/kinetics/InterfaceKinetics.cpp index 06d623252..60c6481dd 100644 --- a/src/kinetics/InterfaceKinetics.cpp +++ b/src/kinetics/InterfaceKinetics.cpp @@ -19,20 +19,11 @@ namespace Cantera { InterfaceKinetics::InterfaceKinetics(thermo_t* thermo) : - Kinetics(), m_redo_rates(false), m_nirrev(0), m_nrev(0), m_surf(0), m_integrator(0), - m_beta(0), - m_ctrxn(0), - m_ctrxn_BVform(0), - m_ctrxn_ecdf(0), - m_StandardConc(0), - m_deltaG0(0), - m_deltaG(0), - m_ProdStanConcReac(0), m_logp0(0.0), m_logc0(0.0), m_ROP_ok(false), @@ -43,10 +34,6 @@ InterfaceKinetics::InterfaceKinetics(thermo_t* thermo) : m_has_electrochem_rxns(false), m_has_exchange_current_density_formulation(false), m_phaseExistsCheck(false), - m_phaseExists(0), - m_phaseIsStable(0), - m_rxnPhaseIsReactant(0), - m_rxnPhaseIsProduct(0), m_ioFlag(0) { if (thermo != 0) { @@ -69,36 +56,7 @@ InterfaceKinetics::~InterfaceKinetics() } } -InterfaceKinetics::InterfaceKinetics(const InterfaceKinetics& right) : - Kinetics(), - m_redo_rates(false), - m_nirrev(0), - m_nrev(0), - m_surf(0), - m_integrator(0), - m_beta(0), - m_ctrxn(0), - m_ctrxn_BVform(0), - m_ctrxn_ecdf(0), - m_StandardConc(0), - m_deltaG0(0), - m_deltaG(0), - m_ProdStanConcReac(0), - m_logp0(0.0), - m_logc0(0.0), - m_ROP_ok(false), - m_temp(0.0), - m_logtemp(0.0), - m_finalized(false), - m_has_coverage_dependence(false), - m_has_electrochem_rxns(false), - m_has_exchange_current_density_formulation(false), - m_phaseExistsCheck(false), - m_phaseExists(0), - m_phaseIsStable(0), - m_rxnPhaseIsReactant(0), - m_rxnPhaseIsProduct(0), - m_ioFlag(0) +InterfaceKinetics::InterfaceKinetics(const InterfaceKinetics& right) { /* * Call the assignment operator diff --git a/src/kinetics/Kinetics.cpp b/src/kinetics/Kinetics.cpp index 7215e030d..1d1478b27 100644 --- a/src/kinetics/Kinetics.cpp +++ b/src/kinetics/Kinetics.cpp @@ -18,12 +18,7 @@ namespace Cantera Kinetics::Kinetics() : m_ii(0), m_kk(0), - m_perturb(0), - m_reactants(0), - m_products(0), m_thermo(0), - m_start(0), - m_phaseindex(), m_surfphase(npos), m_rxnphase(npos), m_mindim(4) @@ -32,18 +27,7 @@ Kinetics::Kinetics() : Kinetics::~Kinetics() {} -Kinetics::Kinetics(const Kinetics& right) : - m_ii(0), - m_kk(0), - m_perturb(0), - m_reactants(0), - m_products(0), - m_thermo(0), - m_start(0), - m_phaseindex(), - m_surfphase(npos), - m_rxnphase(npos), - m_mindim(4) +Kinetics::Kinetics(const Kinetics& right) { /* * Call the assignment operator