diff --git a/src/base/xml.cpp b/src/base/xml.cpp index 877a5b01d..7e5d70a7e 100644 --- a/src/base/xml.cpp +++ b/src/base/xml.cpp @@ -310,7 +310,6 @@ std::string XML_Reader::readValue() XML_Node::XML_Node(const std::string& nm, XML_Node* const parent_) : m_name(nm), - m_value(""), m_parent(parent_), m_root(0), m_locked(false), @@ -325,8 +324,6 @@ XML_Node::XML_Node(const std::string& nm, XML_Node* const parent_) : } XML_Node::XML_Node(const XML_Node& right) : - m_name(""), - m_value(""), m_parent(0), m_root(0), m_locked(false), diff --git a/src/equil/vcs_VolPhase.cpp b/src/equil/vcs_VolPhase.cpp index 8cd8b3a7b..7e8390988 100644 --- a/src/equil/vcs_VolPhase.cpp +++ b/src/equil/vcs_VolPhase.cpp @@ -42,8 +42,6 @@ vcs_VolPhase::vcs_VolPhase(VCS_SOLVE* owningSolverObject) : m_useCanteraCalls(false), TP_ptr(0), v_totalMoles(0.0), - creationMoleNumbers_(0), - creationGlobalRxnNumbers_(0), m_phiVarIndex(npos), m_totalVol(0.0), m_vcsStateStatus(VCS_STATECALC_OLD), diff --git a/src/kinetics/ImplicitSurfChem.cpp b/src/kinetics/ImplicitSurfChem.cpp index ad2ecc27a..db233c244 100644 --- a/src/kinetics/ImplicitSurfChem.cpp +++ b/src/kinetics/ImplicitSurfChem.cpp @@ -16,7 +16,6 @@ namespace Cantera { ImplicitSurfChem::ImplicitSurfChem(vector k) : - FuncEval(), m_nsurf(0), m_nv(0), m_numBulkPhases(0), diff --git a/src/numerics/BEulerInt.cpp b/src/numerics/BEulerInt.cpp index c5b56cd84..addba549d 100644 --- a/src/numerics/BEulerInt.cpp +++ b/src/numerics/BEulerInt.cpp @@ -32,8 +32,6 @@ BEulerInt::BEulerInt() : m_itol(0), m_reltol(1.e-4), m_abstols(1.e-10), - m_abstol(0), - m_ewt(0), m_hmax(0.0), m_maxord(0), m_time_step_num(0), @@ -47,11 +45,6 @@ BEulerInt::BEulerInt() : m_printSolnFirstSteps(0), m_dumpJacobians(false), m_neq(0), - m_y_n(0), - m_y_nm1(0), - m_y_pred_n(0), - m_ydot_n(0), - m_ydot_nm1(0), m_t0(0.0), m_time_final(0.0), time_n(0.0), @@ -62,12 +55,7 @@ BEulerInt::BEulerInt() : delta_t_nm2(0.0), delta_t_np1(1.0E-8), delta_t_max(1.0E300), - m_resid(0), - m_residWts(0), - m_wksp(0), m_func(0), - m_rowScales(0), - m_colScales(0), tdjac_ptr(0), m_print_flag(3), m_nfe(0), diff --git a/src/numerics/BandMatrix.cpp b/src/numerics/BandMatrix.cpp index a8b3febfd..08e4e7e91 100644 --- a/src/numerics/BandMatrix.cpp +++ b/src/numerics/BandMatrix.cpp @@ -26,8 +26,6 @@ BandMatrix::BandMatrix() : m_ku(0), m_zero(0.0) { - data.clear(); - ludata.clear(); } BandMatrix::BandMatrix(size_t n, size_t kl, size_t ku, doublereal v) : diff --git a/src/numerics/DenseMatrix.cpp b/src/numerics/DenseMatrix.cpp index 21eabffcf..0f69007e6 100644 --- a/src/numerics/DenseMatrix.cpp +++ b/src/numerics/DenseMatrix.cpp @@ -12,8 +12,6 @@ namespace Cantera { DenseMatrix::DenseMatrix() : - Array2D(0,0,0.0), - m_ipiv(0), m_useReturnErrorCode(0), m_printLevel(0) { @@ -36,7 +34,6 @@ DenseMatrix::DenseMatrix(size_t n, size_t m, doublereal v) : DenseMatrix::DenseMatrix(const DenseMatrix& y) : Array2D(y), - m_ipiv(0), m_useReturnErrorCode(0), m_printLevel(0) { diff --git a/src/numerics/NonlinearSolver.cpp b/src/numerics/NonlinearSolver.cpp index b48a9591b..e0338266f 100644 --- a/src/numerics/NonlinearSolver.cpp +++ b/src/numerics/NonlinearSolver.cpp @@ -59,22 +59,7 @@ NonlinearSolver::NonlinearSolver(ResidJacEval* func) : m_func(func), solnType_(NSOLN_TYPE_STEADY_STATE), neq_(0), - m_ewt(0), m_manualDeltaStepSet(0), - m_deltaStepMinimum(0), - m_y_n_curr(0), - m_ydot_n_curr(0), - m_y_nm1(0), - m_ydot_nm1(0), - m_y_n_trial(0), - m_ydot_trial(0), - m_colScales(0), - m_rowScales(0), - m_rowWtScales(0), - m_resid(0), - m_wksp(0), - m_wksp_2(0), - m_residWts(0), m_normResid_0(0.0), m_normResid_Bound(0.0), m_normResid_1(0.0), @@ -82,8 +67,6 @@ NonlinearSolver::NonlinearSolver(ResidJacEval* func) : m_normDeltaSoln_CP(0.0), m_normResidTrial(0.0), m_resid_scaled(false), - m_y_high_bounds(0), - m_y_low_bounds(0), m_dampBound(1.0), m_dampRes(1.0), delta_t_n(-1.0), @@ -101,16 +84,12 @@ NonlinearSolver::NonlinearSolver(ResidJacEval* func) : m_order(1), rtol_(1.0E-3), atolBase_(1.0E-10), - atolk_(0), - userResidAtol_(0), userResidRtol_(1.0E-3), checkUserResidualTols_(0), m_print_flag(0), m_ScaleSolnNormToResNorm(0.001), jacCopyPtr_(0), HessianPtr_(0), - deltaX_CP_(0), - deltaX_Newton_(0), residNorm2Cauchy_(0.0), dogLegID_(0), dogLegAlpha_(1.0), @@ -180,23 +159,7 @@ NonlinearSolver::NonlinearSolver(const NonlinearSolver& right) : m_func(right.m_func), solnType_(NSOLN_TYPE_STEADY_STATE), neq_(0), - m_ewt(0), m_manualDeltaStepSet(0), - m_deltaStepMinimum(0), - m_y_n_curr(0), - m_ydot_n_curr(0), - m_y_nm1(0), - m_ydot_nm1(0), - m_y_n_trial(0), - m_ydot_trial(0), - m_step_1(0), - m_colScales(0), - m_rowScales(0), - m_rowWtScales(0), - m_resid(0), - m_wksp(0), - m_wksp_2(0), - m_residWts(0), m_normResid_0(0.0), m_normResid_Bound(0.0), m_normResid_1(0.0), @@ -204,8 +167,6 @@ NonlinearSolver::NonlinearSolver(const NonlinearSolver& right) : m_normDeltaSoln_CP(0.0), m_normResidTrial(0.0), m_resid_scaled(false), - m_y_high_bounds(0), - m_y_low_bounds(0), m_dampBound(1.0), m_dampRes(1.0), delta_t_n(-1.0), @@ -223,23 +184,17 @@ NonlinearSolver::NonlinearSolver(const NonlinearSolver& right) : m_order(1), rtol_(1.0E-3), atolBase_(1.0E-10), - atolk_(0), - userResidAtol_(0), userResidRtol_(1.0E-3), checkUserResidualTols_(0), m_print_flag(0), m_ScaleSolnNormToResNorm(0.001), jacCopyPtr_(0), HessianPtr_(0), - deltaX_CP_(0), - deltaX_Newton_(0), residNorm2Cauchy_(0.0), dogLegID_(0), dogLegAlpha_(1.0), RJd_norm_(0.0), lambdaStar_(0.0), - Jd_(0), - deltaX_trust_(0), norm_deltaX_trust_(0.0), trustDelta_(1.0), trustRegionInitializationMethod_(2), diff --git a/src/numerics/ResidJacEval.cpp b/src/numerics/ResidJacEval.cpp index 6557bed34..3e37cead3 100644 --- a/src/numerics/ResidJacEval.cpp +++ b/src/numerics/ResidJacEval.cpp @@ -17,13 +17,11 @@ using namespace std; namespace Cantera { ResidJacEval::ResidJacEval(doublereal atol) : - ResidEval(), m_atol(atol) { } -ResidJacEval::ResidJacEval(const ResidJacEval& right) : - ResidEval() +ResidJacEval::ResidJacEval(const ResidJacEval& right) { *this = right; } diff --git a/src/numerics/SquareMatrix.cpp b/src/numerics/SquareMatrix.cpp index 67875870a..c3fca4271 100644 --- a/src/numerics/SquareMatrix.cpp +++ b/src/numerics/SquareMatrix.cpp @@ -19,7 +19,6 @@ namespace Cantera { SquareMatrix::SquareMatrix() : - DenseMatrix(), GeneralMatrix(0), a1norm_(0.0), useQR_(0) diff --git a/src/oneD/Sim1D.cpp b/src/oneD/Sim1D.cpp index 082f5d7dd..c20af1f5a 100644 --- a/src/oneD/Sim1D.cpp +++ b/src/oneD/Sim1D.cpp @@ -15,8 +15,7 @@ using namespace std; namespace Cantera { -Sim1D::Sim1D() : - OneDim() +Sim1D::Sim1D() { } diff --git a/src/thermo/DebyeHuckel.cpp b/src/thermo/DebyeHuckel.cpp index bc74447f7..33d5f2139 100644 --- a/src/thermo/DebyeHuckel.cpp +++ b/src/thermo/DebyeHuckel.cpp @@ -29,7 +29,6 @@ namespace Cantera { DebyeHuckel::DebyeHuckel() : - MolalityVPSSTP(), m_formDH(DHFORM_DILUTE_LIMIT), m_formGC(2), m_IionicMolality(0.0), @@ -52,7 +51,6 @@ DebyeHuckel::DebyeHuckel() : DebyeHuckel::DebyeHuckel(const std::string& inputFile, const std::string& id_) : - MolalityVPSSTP(), m_formDH(DHFORM_DILUTE_LIMIT), m_formGC(2), m_IionicMolality(0.0), @@ -74,7 +72,6 @@ DebyeHuckel::DebyeHuckel(const std::string& inputFile, } DebyeHuckel::DebyeHuckel(XML_Node& phaseRoot, const std::string& id_) : - MolalityVPSSTP(), m_formDH(DHFORM_DILUTE_LIMIT), m_formGC(2), m_IionicMolality(0.0), @@ -96,7 +93,6 @@ DebyeHuckel::DebyeHuckel(XML_Node& phaseRoot, const std::string& id_) : } DebyeHuckel::DebyeHuckel(const DebyeHuckel& b) : - MolalityVPSSTP(), m_formDH(DHFORM_DILUTE_LIMIT), m_formGC(2), m_IionicMolality(0.0), diff --git a/src/thermo/FixedChemPotSSTP.cpp b/src/thermo/FixedChemPotSSTP.cpp index c41b4f054..6eed3f985 100644 --- a/src/thermo/FixedChemPotSSTP.cpp +++ b/src/thermo/FixedChemPotSSTP.cpp @@ -24,13 +24,11 @@ namespace Cantera */ FixedChemPotSSTP::FixedChemPotSSTP() : - SingleSpeciesTP(), chemPot_(0.0) { } FixedChemPotSSTP::FixedChemPotSSTP(const std::string& infile, std::string id_) : - SingleSpeciesTP(), chemPot_(0.0) { XML_Node* root = get_XML_File(infile); @@ -52,7 +50,6 @@ FixedChemPotSSTP::FixedChemPotSSTP(const std::string& infile, std::string id_) : importPhase(*xphase, this); } FixedChemPotSSTP::FixedChemPotSSTP(XML_Node& xmlphase, const std::string& id_) : - SingleSpeciesTP(), chemPot_(0.0) { if (id_ != "") { @@ -77,7 +74,6 @@ FixedChemPotSSTP::FixedChemPotSSTP(XML_Node& xmlphase, const std::string& id_) : } FixedChemPotSSTP::FixedChemPotSSTP(const std::string& Ename, doublereal val) : - SingleSpeciesTP(), chemPot_(0.0) { @@ -121,8 +117,7 @@ FixedChemPotSSTP::FixedChemPotSSTP(const std::string& Ename, doublereal val) : s = 0; } -FixedChemPotSSTP::FixedChemPotSSTP(const FixedChemPotSSTP& right) : - SingleSpeciesTP() +FixedChemPotSSTP::FixedChemPotSSTP(const FixedChemPotSSTP& right) { *this = right; } diff --git a/src/thermo/GeneralSpeciesThermo.cpp b/src/thermo/GeneralSpeciesThermo.cpp index 696eb258f..d4617f74e 100644 --- a/src/thermo/GeneralSpeciesThermo.cpp +++ b/src/thermo/GeneralSpeciesThermo.cpp @@ -12,7 +12,6 @@ namespace Cantera { GeneralSpeciesThermo::GeneralSpeciesThermo() : - SpeciesThermo(), m_tlow_max(0.0), m_thigh_min(1.0E30), m_p0(OneAtm) diff --git a/src/thermo/GibbsExcessVPSSTP.cpp b/src/thermo/GibbsExcessVPSSTP.cpp index b3ffc89ca..0103182cf 100644 --- a/src/thermo/GibbsExcessVPSSTP.cpp +++ b/src/thermo/GibbsExcessVPSSTP.cpp @@ -23,29 +23,11 @@ using namespace std; namespace Cantera { //========================================================================================================================= -GibbsExcessVPSSTP::GibbsExcessVPSSTP() : - VPStandardStateTP(), - moleFractions_(0), - lnActCoeff_Scaled_(0), - dlnActCoeffdT_Scaled_(0), - d2lnActCoeffdT2_Scaled_(0), - dlnActCoeffdlnN_diag_(0), - dlnActCoeffdlnX_diag_(0), - dlnActCoeffdlnN_(0,0), - m_pp(0) +GibbsExcessVPSSTP::GibbsExcessVPSSTP() { } //========================================================================================================================= -GibbsExcessVPSSTP::GibbsExcessVPSSTP(const GibbsExcessVPSSTP& b) : - VPStandardStateTP(), - moleFractions_(0), - lnActCoeff_Scaled_(0), - dlnActCoeffdT_Scaled_(0), - d2lnActCoeffdT2_Scaled_(0), - dlnActCoeffdlnN_diag_(0), - dlnActCoeffdlnX_diag_(0), - dlnActCoeffdlnN_(0,0), - m_pp(0) +GibbsExcessVPSSTP::GibbsExcessVPSSTP(const GibbsExcessVPSSTP& b) { GibbsExcessVPSSTP::operator=(b); } diff --git a/src/thermo/HMWSoln.cpp b/src/thermo/HMWSoln.cpp index 45f712fa4..caf52f1d1 100644 --- a/src/thermo/HMWSoln.cpp +++ b/src/thermo/HMWSoln.cpp @@ -29,7 +29,6 @@ namespace Cantera { HMWSoln::HMWSoln() : - MolalityVPSSTP(), m_formPitzer(PITZERFORM_BASE), m_formPitzerTemp(PITZER_TEMP_CONSTANT), m_formGC(2), @@ -80,7 +79,6 @@ HMWSoln::HMWSoln() : } HMWSoln::HMWSoln(const std::string& inputFile, const std::string& id_) : - MolalityVPSSTP(), m_formPitzer(PITZERFORM_BASE), m_formPitzerTemp(PITZER_TEMP_CONSTANT), m_formGC(2), @@ -132,7 +130,6 @@ HMWSoln::HMWSoln(const std::string& inputFile, const std::string& id_) : } HMWSoln::HMWSoln(XML_Node& phaseRoot, const std::string& id_) : - MolalityVPSSTP(), m_formPitzer(PITZERFORM_BASE), m_formPitzerTemp(PITZER_TEMP_CONSTANT), m_formGC(2), @@ -184,7 +181,6 @@ HMWSoln::HMWSoln(XML_Node& phaseRoot, const std::string& id_) : } HMWSoln::HMWSoln(const HMWSoln& b) : - MolalityVPSSTP(), m_formPitzer(PITZERFORM_BASE), m_formPitzerTemp(PITZER_TEMP_CONSTANT), m_formGC(2), diff --git a/src/thermo/IdealMolalSoln.cpp b/src/thermo/IdealMolalSoln.cpp index 0d932b9ee..f9c8a2d52 100644 --- a/src/thermo/IdealMolalSoln.cpp +++ b/src/thermo/IdealMolalSoln.cpp @@ -28,7 +28,6 @@ namespace Cantera { IdealMolalSoln::IdealMolalSoln() : - MolalityVPSSTP(), m_formGC(2), IMS_typeCutoff_(0), IMS_X_o_cutoff_(0.20), diff --git a/src/thermo/IdealSolidSolnPhase.cpp b/src/thermo/IdealSolidSolnPhase.cpp index e8be0d4f9..3b006302b 100644 --- a/src/thermo/IdealSolidSolnPhase.cpp +++ b/src/thermo/IdealSolidSolnPhase.cpp @@ -22,7 +22,6 @@ namespace Cantera { IdealSolidSolnPhase::IdealSolidSolnPhase(int formGC) : - ThermoPhase(), m_formGC(formGC), m_Pref(OneAtm), m_Pcurrent(OneAtm) @@ -35,7 +34,6 @@ IdealSolidSolnPhase::IdealSolidSolnPhase(int formGC) : IdealSolidSolnPhase::IdealSolidSolnPhase(const std::string& inputFile, const std::string& id_, int formGC) : - ThermoPhase(), m_formGC(formGC), m_Pref(OneAtm), m_Pcurrent(OneAtm) @@ -49,7 +47,6 @@ IdealSolidSolnPhase::IdealSolidSolnPhase(const std::string& inputFile, IdealSolidSolnPhase::IdealSolidSolnPhase(XML_Node& root, const std::string& id_, int formGC) : - ThermoPhase(), m_formGC(formGC), m_Pref(OneAtm), m_Pcurrent(OneAtm) diff --git a/src/thermo/IdealSolnGasVPSS.cpp b/src/thermo/IdealSolnGasVPSS.cpp index 52fa50ca7..f368541d6 100644 --- a/src/thermo/IdealSolnGasVPSS.cpp +++ b/src/thermo/IdealSolnGasVPSS.cpp @@ -24,14 +24,12 @@ namespace Cantera { IdealSolnGasVPSS::IdealSolnGasVPSS() : - VPStandardStateTP(), m_idealGas(0), m_formGC(0) { } IdealSolnGasVPSS::IdealSolnGasVPSS(const std::string& infile, std::string id_) : - VPStandardStateTP(), m_idealGas(0), m_formGC(0) { @@ -48,7 +46,6 @@ IdealSolnGasVPSS::IdealSolnGasVPSS(const std::string& infile, std::string id_) : } IdealSolnGasVPSS::IdealSolnGasVPSS(const IdealSolnGasVPSS& b) : - VPStandardStateTP(), m_idealGas(0), m_formGC(0) { diff --git a/src/thermo/IonsFromNeutralVPSSTP.cpp b/src/thermo/IonsFromNeutralVPSSTP.cpp index a9b785b10..3b2f8421e 100644 --- a/src/thermo/IonsFromNeutralVPSSTP.cpp +++ b/src/thermo/IonsFromNeutralVPSSTP.cpp @@ -29,7 +29,6 @@ namespace Cantera { IonsFromNeutralVPSSTP::IonsFromNeutralVPSSTP() : - GibbsExcessVPSSTP(), ionSolnType_(cIonSolnType_SINGLEANION), numNeutralMoleculeSpecies_(0), indexSpecialSpecies_(npos), @@ -39,17 +38,13 @@ IonsFromNeutralVPSSTP::IonsFromNeutralVPSSTP() : numPassThroughSpecies_(0), neutralMoleculePhase_(0), geThermo(0), - IOwnNThermoPhase_(true), - moleFractionsTmp_(0), - muNeutralMolecule_(0), - lnActCoeff_NeutralMolecule_(0) + IOwnNThermoPhase_(true) { } IonsFromNeutralVPSSTP::IonsFromNeutralVPSSTP(const std::string& inputFile, const std::string& id_, ThermoPhase* neutralPhase) : - GibbsExcessVPSSTP(), ionSolnType_(cIonSolnType_SINGLEANION), numNeutralMoleculeSpecies_(0), indexSpecialSpecies_(npos), @@ -58,10 +53,7 @@ IonsFromNeutralVPSSTP::IonsFromNeutralVPSSTP(const std::string& inputFile, numAnionSpecies_(0), numPassThroughSpecies_(0), neutralMoleculePhase_(neutralPhase), - IOwnNThermoPhase_(true), - moleFractionsTmp_(0), - muNeutralMolecule_(0), - lnActCoeff_NeutralMolecule_(0) + IOwnNThermoPhase_(true) { if (neutralPhase) { IOwnNThermoPhase_ = false; @@ -72,7 +64,6 @@ IonsFromNeutralVPSSTP::IonsFromNeutralVPSSTP(const std::string& inputFile, IonsFromNeutralVPSSTP::IonsFromNeutralVPSSTP(XML_Node& phaseRoot, const std::string& id_, ThermoPhase* neutralPhase) : - GibbsExcessVPSSTP(), ionSolnType_(cIonSolnType_SINGLEANION), numNeutralMoleculeSpecies_(0), indexSpecialSpecies_(npos), @@ -81,11 +72,7 @@ IonsFromNeutralVPSSTP::IonsFromNeutralVPSSTP(XML_Node& phaseRoot, numAnionSpecies_(0), numPassThroughSpecies_(0), neutralMoleculePhase_(neutralPhase), - IOwnNThermoPhase_(true), - moleFractionsTmp_(0), - muNeutralMolecule_(0), - - lnActCoeff_NeutralMolecule_(0) + IOwnNThermoPhase_(true) { if (neutralPhase) { IOwnNThermoPhase_ = false; @@ -99,7 +86,6 @@ IonsFromNeutralVPSSTP::IonsFromNeutralVPSSTP(XML_Node& phaseRoot, } IonsFromNeutralVPSSTP::IonsFromNeutralVPSSTP(const IonsFromNeutralVPSSTP& b) : - GibbsExcessVPSSTP(), ionSolnType_(cIonSolnType_SINGLEANION), numNeutralMoleculeSpecies_(0), indexSpecialSpecies_(npos), @@ -109,11 +95,7 @@ IonsFromNeutralVPSSTP::IonsFromNeutralVPSSTP(const IonsFromNeutralVPSSTP& b) : numPassThroughSpecies_(0), neutralMoleculePhase_(0), geThermo(0), - IOwnNThermoPhase_(true), - moleFractionsTmp_(0), - muNeutralMolecule_(0), - - lnActCoeff_NeutralMolecule_(0) + IOwnNThermoPhase_(true) { IonsFromNeutralVPSSTP::operator=(b); } diff --git a/src/thermo/LatticeSolidPhase.cpp b/src/thermo/LatticeSolidPhase.cpp index 4024c6d9c..224848a36 100644 --- a/src/thermo/LatticeSolidPhase.cpp +++ b/src/thermo/LatticeSolidPhase.cpp @@ -20,22 +20,14 @@ namespace Cantera LatticeSolidPhase::LatticeSolidPhase() : m_press(-1.0), m_molar_density(0.0), - m_nlattice(0), - m_lattice(0), - m_x(0), - theta_(0), - tmpV_(0) + m_nlattice(0) { } LatticeSolidPhase::LatticeSolidPhase(const LatticeSolidPhase& right) : m_press(-1.0), m_molar_density(0.0), - m_nlattice(0), - m_lattice(0), - m_x(0), - theta_(0), - tmpV_(0) + m_nlattice(0) { *this = right; } diff --git a/src/thermo/MargulesVPSSTP.cpp b/src/thermo/MargulesVPSSTP.cpp index 8ca8b4323..9260137d7 100644 --- a/src/thermo/MargulesVPSSTP.cpp +++ b/src/thermo/MargulesVPSSTP.cpp @@ -20,7 +20,6 @@ using namespace std; namespace Cantera { MargulesVPSSTP::MargulesVPSSTP() : - GibbsExcessVPSSTP(), numBinaryInteractions_(0), formMargules_(0), formTempModel_(0) @@ -28,7 +27,6 @@ MargulesVPSSTP::MargulesVPSSTP() : } MargulesVPSSTP::MargulesVPSSTP(const std::string& inputFile, const std::string& id_) : - GibbsExcessVPSSTP(), numBinaryInteractions_(0), formMargules_(0), formTempModel_(0) @@ -37,7 +35,6 @@ MargulesVPSSTP::MargulesVPSSTP(const std::string& inputFile, const std::string& } MargulesVPSSTP::MargulesVPSSTP(XML_Node& phaseRoot, const std::string& id_) : - GibbsExcessVPSSTP(), numBinaryInteractions_(0), formMargules_(0), formTempModel_(0) @@ -45,8 +42,7 @@ MargulesVPSSTP::MargulesVPSSTP(XML_Node& phaseRoot, const std::string& id_) : importPhase(*findXMLPhase(&phaseRoot, id_), this); } -MargulesVPSSTP::MargulesVPSSTP(const MargulesVPSSTP& b) : - GibbsExcessVPSSTP() +MargulesVPSSTP::MargulesVPSSTP(const MargulesVPSSTP& b) { MargulesVPSSTP::operator=(b); } diff --git a/src/thermo/MetalSHEelectrons.cpp b/src/thermo/MetalSHEelectrons.cpp index 4c43b5253..486c7a00a 100644 --- a/src/thermo/MetalSHEelectrons.cpp +++ b/src/thermo/MetalSHEelectrons.cpp @@ -25,13 +25,11 @@ namespace Cantera */ MetalSHEelectrons::MetalSHEelectrons(): - SingleSpeciesTP(), xdef_(0) { } MetalSHEelectrons::MetalSHEelectrons(const std::string& infile, std::string id_) : - SingleSpeciesTP(), xdef_(0) { XML_Node* root; @@ -60,7 +58,6 @@ MetalSHEelectrons::MetalSHEelectrons(const std::string& infile, std::string id_) } MetalSHEelectrons::MetalSHEelectrons(XML_Node& xmlphase, const std::string& id_) : - SingleSpeciesTP(), xdef_(0) { if (id_ != "") { @@ -80,7 +77,6 @@ MetalSHEelectrons::MetalSHEelectrons(XML_Node& xmlphase, const std::string& id_) } MetalSHEelectrons::MetalSHEelectrons(const MetalSHEelectrons& right) : - SingleSpeciesTP(), xdef_(0) { operator=(right); diff --git a/src/thermo/MineralEQ3.cpp b/src/thermo/MineralEQ3.cpp index 59ded0fb4..0aae9ff59 100644 --- a/src/thermo/MineralEQ3.cpp +++ b/src/thermo/MineralEQ3.cpp @@ -27,13 +27,11 @@ namespace Cantera * ---- Constructors ------- */ -MineralEQ3::MineralEQ3(): - StoichSubstanceSSTP() +MineralEQ3::MineralEQ3() { } -MineralEQ3::MineralEQ3(const std::string& infile, std::string id_) : - StoichSubstanceSSTP() +MineralEQ3::MineralEQ3(const std::string& infile, std::string id_) { XML_Node* root = get_XML_File(infile); if (id_ == "-") { @@ -54,8 +52,7 @@ MineralEQ3::MineralEQ3(const std::string& infile, std::string id_) : importPhase(*xphase, this); } -MineralEQ3::MineralEQ3(XML_Node& xmlphase, const std::string& id_) : - StoichSubstanceSSTP() +MineralEQ3::MineralEQ3(XML_Node& xmlphase, const std::string& id_) { if (id_ != "") { std::string idxml = xmlphase["id"]; @@ -73,8 +70,7 @@ MineralEQ3::MineralEQ3(XML_Node& xmlphase, const std::string& id_) : importPhase(xmlphase, this); } -MineralEQ3::MineralEQ3(const MineralEQ3& right) : - StoichSubstanceSSTP() +MineralEQ3::MineralEQ3(const MineralEQ3& right) { *this = right; } diff --git a/src/thermo/MixedSolventElectrolyte.cpp b/src/thermo/MixedSolventElectrolyte.cpp index 1f95109c4..bd609e700 100644 --- a/src/thermo/MixedSolventElectrolyte.cpp +++ b/src/thermo/MixedSolventElectrolyte.cpp @@ -21,7 +21,6 @@ using namespace std; namespace Cantera { MixedSolventElectrolyte::MixedSolventElectrolyte() : - MolarityIonicVPSSTP(), numBinaryInteractions_(0), formMargules_(0), formTempModel_(0) @@ -30,7 +29,6 @@ MixedSolventElectrolyte::MixedSolventElectrolyte() : MixedSolventElectrolyte::MixedSolventElectrolyte(const std::string& inputFile, const std::string& id_) : - MolarityIonicVPSSTP(), numBinaryInteractions_(0), formMargules_(0), formTempModel_(0) @@ -40,7 +38,6 @@ MixedSolventElectrolyte::MixedSolventElectrolyte(const std::string& inputFile, MixedSolventElectrolyte::MixedSolventElectrolyte(XML_Node& phaseRoot, const std::string& id_) : - MolarityIonicVPSSTP(), numBinaryInteractions_(0), formMargules_(0), formTempModel_(0) @@ -48,8 +45,7 @@ MixedSolventElectrolyte::MixedSolventElectrolyte(XML_Node& phaseRoot, importPhase(*findXMLPhase(&phaseRoot, id_), this); } -MixedSolventElectrolyte::MixedSolventElectrolyte(const MixedSolventElectrolyte& b) : - MolarityIonicVPSSTP() +MixedSolventElectrolyte::MixedSolventElectrolyte(const MixedSolventElectrolyte& b) { MixedSolventElectrolyte::operator=(b); } diff --git a/src/thermo/MixtureFugacityTP.cpp b/src/thermo/MixtureFugacityTP.cpp index a7e0dcc0b..340790da5 100644 --- a/src/thermo/MixtureFugacityTP.cpp +++ b/src/thermo/MixtureFugacityTP.cpp @@ -21,32 +21,20 @@ namespace Cantera { MixtureFugacityTP::MixtureFugacityTP() : - ThermoPhase(), m_Pcurrent(-1.0), - moleFractions_(0), iState_(FLUID_GAS), forcedState_(FLUID_UNDEFINED), m_Tlast_ref(-1.0), - m_logc0(0.0), - m_h0_RT(0), - m_cp0_R(0), - m_g0_RT(0), - m_s0_R(0) + m_logc0(0.0) { } MixtureFugacityTP::MixtureFugacityTP(const MixtureFugacityTP& b) : - ThermoPhase(), m_Pcurrent(-1.0), - moleFractions_(0), iState_(FLUID_GAS), forcedState_(FLUID_UNDEFINED), m_Tlast_ref(-1.0), - m_logc0(0.0), - m_h0_RT(0), - m_cp0_R(0), - m_g0_RT(0), - m_s0_R(0) + m_logc0(0.0) { MixtureFugacityTP::operator=(b); } diff --git a/src/thermo/MolalityVPSSTP.cpp b/src/thermo/MolalityVPSSTP.cpp index b731fee51..e58476f27 100644 --- a/src/thermo/MolalityVPSSTP.cpp +++ b/src/thermo/MolalityVPSSTP.cpp @@ -29,7 +29,6 @@ namespace Cantera { MolalityVPSSTP::MolalityVPSSTP() : - VPStandardStateTP(), m_indexSolvent(0), m_pHScalingType(PHSCALE_PITZER), m_indexCLM(npos), @@ -46,7 +45,6 @@ MolalityVPSSTP::MolalityVPSSTP() : } MolalityVPSSTP::MolalityVPSSTP(const MolalityVPSSTP& b) : - VPStandardStateTP(), m_indexSolvent(b.m_indexSolvent), m_pHScalingType(b.m_pHScalingType), m_indexCLM(b.m_indexCLM), diff --git a/src/thermo/MolarityIonicVPSSTP.cpp b/src/thermo/MolarityIonicVPSSTP.cpp index c42ca8581..1c7e101c4 100644 --- a/src/thermo/MolarityIonicVPSSTP.cpp +++ b/src/thermo/MolarityIonicVPSSTP.cpp @@ -28,7 +28,6 @@ namespace Cantera { MolarityIonicVPSSTP::MolarityIonicVPSSTP() : - GibbsExcessVPSSTP(), PBType_(PBTYPE_PASSTHROUGH), numPBSpecies_(m_kk), indexSpecialSpecies_(npos), @@ -41,7 +40,6 @@ MolarityIonicVPSSTP::MolarityIonicVPSSTP() : MolarityIonicVPSSTP::MolarityIonicVPSSTP(const std::string& inputFile, const std::string& id_) : - GibbsExcessVPSSTP(), PBType_(PBTYPE_PASSTHROUGH), numPBSpecies_(m_kk), indexSpecialSpecies_(npos), @@ -55,7 +53,6 @@ MolarityIonicVPSSTP::MolarityIonicVPSSTP(const std::string& inputFile, MolarityIonicVPSSTP::MolarityIonicVPSSTP(XML_Node& phaseRoot, const std::string& id_) : - GibbsExcessVPSSTP(), PBType_(PBTYPE_PASSTHROUGH), numPBSpecies_(m_kk), indexSpecialSpecies_(npos), @@ -68,7 +65,6 @@ MolarityIonicVPSSTP::MolarityIonicVPSSTP(XML_Node& phaseRoot, } MolarityIonicVPSSTP::MolarityIonicVPSSTP(const MolarityIonicVPSSTP& b) : - GibbsExcessVPSSTP(), PBType_(PBTYPE_PASSTHROUGH), numPBSpecies_(m_kk), indexSpecialSpecies_(npos), diff --git a/src/thermo/Phase.cpp b/src/thermo/Phase.cpp index 56b03e9ac..f2d5c51cd 100644 --- a/src/thermo/Phase.cpp +++ b/src/thermo/Phase.cpp @@ -22,7 +22,6 @@ Phase::Phase() : m_undefinedElementBehavior(UndefElement::error), m_xml(new XML_Node("phase")), m_id(""), - m_name(""), m_temp(0.001), m_dens(0.001), m_mmw(0.0), @@ -39,7 +38,6 @@ Phase::Phase(const Phase& right) : m_undefinedElementBehavior(right.m_undefinedElementBehavior), m_xml(0), m_id(""), - m_name(""), m_temp(0.001), m_dens(0.001), m_mmw(0.0), diff --git a/src/thermo/PhaseCombo_Interaction.cpp b/src/thermo/PhaseCombo_Interaction.cpp index 69ce1789b..466816b53 100644 --- a/src/thermo/PhaseCombo_Interaction.cpp +++ b/src/thermo/PhaseCombo_Interaction.cpp @@ -17,7 +17,6 @@ using namespace std; namespace Cantera { PhaseCombo_Interaction::PhaseCombo_Interaction() : - GibbsExcessVPSSTP(), numBinaryInteractions_(0), formMargules_(0), formTempModel_(0) @@ -26,7 +25,6 @@ PhaseCombo_Interaction::PhaseCombo_Interaction() : PhaseCombo_Interaction::PhaseCombo_Interaction(const std::string& inputFile, const std::string& id_) : - GibbsExcessVPSSTP(), numBinaryInteractions_(0), formMargules_(0), formTempModel_(0) @@ -36,7 +34,6 @@ PhaseCombo_Interaction::PhaseCombo_Interaction(const std::string& inputFile, PhaseCombo_Interaction::PhaseCombo_Interaction(XML_Node& phaseRoot, const std::string& id_) : - GibbsExcessVPSSTP(), numBinaryInteractions_(0), formMargules_(0), formTempModel_(0) @@ -44,8 +41,7 @@ PhaseCombo_Interaction::PhaseCombo_Interaction(XML_Node& phaseRoot, importPhase(*findXMLPhase(&phaseRoot, id_), this); } -PhaseCombo_Interaction::PhaseCombo_Interaction(const PhaseCombo_Interaction& b) : - GibbsExcessVPSSTP() +PhaseCombo_Interaction::PhaseCombo_Interaction(const PhaseCombo_Interaction& b) { PhaseCombo_Interaction::operator=(b); } diff --git a/src/thermo/PseudoBinaryVPSSTP.cpp b/src/thermo/PseudoBinaryVPSSTP.cpp index 7346a6b25..2c5b8264d 100644 --- a/src/thermo/PseudoBinaryVPSSTP.cpp +++ b/src/thermo/PseudoBinaryVPSSTP.cpp @@ -26,7 +26,6 @@ using namespace std; namespace Cantera { PseudoBinaryVPSSTP::PseudoBinaryVPSSTP() : - GibbsExcessVPSSTP(), PBType_(PBTYPE_PASSTHROUGH), numPBSpecies_(m_kk), indexSpecialSpecies_(npos), @@ -40,7 +39,6 @@ PseudoBinaryVPSSTP::PseudoBinaryVPSSTP() : } PseudoBinaryVPSSTP::PseudoBinaryVPSSTP(const PseudoBinaryVPSSTP& b) : - GibbsExcessVPSSTP(), PBType_(PBTYPE_PASSTHROUGH), numPBSpecies_(m_kk), indexSpecialSpecies_(npos), diff --git a/src/thermo/PureFluidPhase.cpp b/src/thermo/PureFluidPhase.cpp index f18fd42b1..21e5d5cd3 100644 --- a/src/thermo/PureFluidPhase.cpp +++ b/src/thermo/PureFluidPhase.cpp @@ -19,7 +19,6 @@ namespace Cantera { PureFluidPhase::PureFluidPhase() : - ThermoPhase(), m_sub(0), m_subflag(0), m_mw(-1.0), @@ -28,7 +27,6 @@ PureFluidPhase::PureFluidPhase() : } PureFluidPhase::PureFluidPhase(const PureFluidPhase& right) : - ThermoPhase(), m_sub(0), m_subflag(0), m_mw(-1.0), diff --git a/src/thermo/RedlichKisterVPSSTP.cpp b/src/thermo/RedlichKisterVPSSTP.cpp index e17e350e7..128cb3041 100644 --- a/src/thermo/RedlichKisterVPSSTP.cpp +++ b/src/thermo/RedlichKisterVPSSTP.cpp @@ -22,62 +22,34 @@ using namespace std; namespace Cantera { RedlichKisterVPSSTP::RedlichKisterVPSSTP() : - GibbsExcessVPSSTP(), numBinaryInteractions_(0), - m_pSpecies_A_ij(0), - m_pSpecies_B_ij(0), - m_N_ij(0), - m_HE_m_ij(0), - m_SE_m_ij(0), formRedlichKister_(0), - formTempModel_(0), - dlnActCoeff_dX_() + formTempModel_(0) { } RedlichKisterVPSSTP::RedlichKisterVPSSTP(const std::string& inputFile, const std::string& id_) : - GibbsExcessVPSSTP(), numBinaryInteractions_(0), - m_pSpecies_A_ij(0), - m_pSpecies_B_ij(0), - m_N_ij(0), - m_HE_m_ij(0), - m_SE_m_ij(0), formRedlichKister_(0), - formTempModel_(0), - dlnActCoeff_dX_() + formTempModel_(0) { initThermoFile(inputFile, id_); } RedlichKisterVPSSTP::RedlichKisterVPSSTP(XML_Node& phaseRoot, const std::string& id_) : - GibbsExcessVPSSTP(), numBinaryInteractions_(0), - m_pSpecies_A_ij(0), - m_pSpecies_B_ij(0), - m_N_ij(0), - m_HE_m_ij(0), - m_SE_m_ij(0), formRedlichKister_(0), - formTempModel_(0), - dlnActCoeff_dX_() + formTempModel_(0) { importPhase(*findXMLPhase(&phaseRoot, id_), this); } RedlichKisterVPSSTP::RedlichKisterVPSSTP(int testProb) : - GibbsExcessVPSSTP(), numBinaryInteractions_(0), - m_pSpecies_A_ij(0), - m_pSpecies_B_ij(0), - m_N_ij(0), - m_HE_m_ij(0), - m_SE_m_ij(0), formRedlichKister_(0), - formTempModel_(0), - dlnActCoeff_dX_() + formTempModel_(0) { initThermoFile("LiKCl_liquid.xml", ""); numBinaryInteractions_ = 1; @@ -115,16 +87,9 @@ RedlichKisterVPSSTP::RedlichKisterVPSSTP(int testProb) : } RedlichKisterVPSSTP::RedlichKisterVPSSTP(const RedlichKisterVPSSTP& b) : - GibbsExcessVPSSTP(), numBinaryInteractions_(0), - m_pSpecies_A_ij(0), - m_pSpecies_B_ij(0), - m_N_ij(0), - m_HE_m_ij(0), - m_SE_m_ij(0), formRedlichKister_(0), - formTempModel_(0), - dlnActCoeff_dX_() + formTempModel_(0) { RedlichKisterVPSSTP::operator=(b); } diff --git a/src/thermo/RedlichKwongMFTP.cpp b/src/thermo/RedlichKwongMFTP.cpp index 72549ba7c..53b2c8c14 100644 --- a/src/thermo/RedlichKwongMFTP.cpp +++ b/src/thermo/RedlichKwongMFTP.cpp @@ -30,24 +30,13 @@ const doublereal RedlichKwongMFTP::omega_b = 8.66403499650E-02; const doublereal RedlichKwongMFTP::omega_vc = 3.33333333333333E-01; RedlichKwongMFTP::RedlichKwongMFTP() : - MixtureFugacityTP(), m_standardMixingRules(0), m_formTempParam(0), m_b_current(0.0), m_a_current(0.0), - a_vec_Curr_(0), - b_vec_Curr_(0), - a_coeff_vec(0,0), - m_pc_Species(0), - m_tc_Species(0), - m_vc_Species(0), NSolns_(0), - m_pp(0), - m_tmpV(0), - m_partialMolarVolumes(0), dpdV_(0.0), - dpdT_(0.0), - dpdni_(0) + dpdT_(0.0) { Vroot_[0] = 0.0; Vroot_[1] = 0.0; @@ -55,24 +44,13 @@ RedlichKwongMFTP::RedlichKwongMFTP() : } RedlichKwongMFTP::RedlichKwongMFTP(const std::string& infile, std::string id_) : - MixtureFugacityTP(), m_standardMixingRules(0), m_formTempParam(0), m_b_current(0.0), m_a_current(0.0), - a_vec_Curr_(0), - b_vec_Curr_(0), - a_coeff_vec(0,0), - m_pc_Species(0), - m_tc_Species(0), - m_vc_Species(0), NSolns_(0), - m_pp(0), - m_tmpV(0), - m_partialMolarVolumes(0), dpdV_(0.0), - dpdT_(0.0), - dpdni_(0) + dpdT_(0.0) { Vroot_[0] = 0.0; Vroot_[1] = 0.0; @@ -90,24 +68,13 @@ RedlichKwongMFTP::RedlichKwongMFTP(const std::string& infile, std::string id_) : } RedlichKwongMFTP::RedlichKwongMFTP(XML_Node& phaseRefRoot, const std::string& id_) : - MixtureFugacityTP(), m_standardMixingRules(0), m_formTempParam(0), m_b_current(0.0), m_a_current(0.0), - a_vec_Curr_(0), - b_vec_Curr_(0), - a_coeff_vec(0,0), - m_pc_Species(0), - m_tc_Species(0), - m_vc_Species(0), NSolns_(0), - m_pp(0), - m_tmpV(0), - m_partialMolarVolumes(0), dpdV_(0.0), - dpdT_(0.0), - dpdni_(0) + dpdT_(0.0) { Vroot_[0] = 0.0; Vroot_[1] = 0.0; @@ -120,24 +87,13 @@ RedlichKwongMFTP::RedlichKwongMFTP(XML_Node& phaseRefRoot, const std::string& id } RedlichKwongMFTP::RedlichKwongMFTP(int testProb) : - MixtureFugacityTP(), m_standardMixingRules(0), m_formTempParam(0), m_b_current(0.0), m_a_current(0.0), - a_vec_Curr_(0), - b_vec_Curr_(0), - a_coeff_vec(0,0), - m_pc_Species(0), - m_tc_Species(0), - m_vc_Species(0), NSolns_(0), - m_pp(0), - m_tmpV(0), - m_partialMolarVolumes(0), dpdV_(0.0), - dpdT_(0.0), - dpdni_(0) + dpdT_(0.0) { std::string infile = "co2_redlichkwong.xml"; std::string id_; @@ -159,24 +115,13 @@ RedlichKwongMFTP::RedlichKwongMFTP(int testProb) : } RedlichKwongMFTP::RedlichKwongMFTP(const RedlichKwongMFTP& b) : - MixtureFugacityTP(), m_standardMixingRules(0), m_formTempParam(0), m_b_current(0.0), m_a_current(0.0), - a_vec_Curr_(0), - b_vec_Curr_(0), - a_coeff_vec(0,0), - m_pc_Species(0), - m_tc_Species(0), - m_vc_Species(0), NSolns_(0), - m_pp(0), - m_tmpV(0), - m_partialMolarVolumes(0), dpdV_(0.0), - dpdT_(0.0), - dpdni_(0) + dpdT_(0.0) { *this = b; } diff --git a/src/thermo/SingleSpeciesTP.cpp b/src/thermo/SingleSpeciesTP.cpp index a785f9be8..e6aadbe52 100644 --- a/src/thermo/SingleSpeciesTP.cpp +++ b/src/thermo/SingleSpeciesTP.cpp @@ -19,14 +19,12 @@ using namespace std; namespace Cantera { SingleSpeciesTP::SingleSpeciesTP() : - ThermoPhase(), m_press(OneAtm), m_p0(OneAtm) { } SingleSpeciesTP::SingleSpeciesTP(const SingleSpeciesTP& right): - ThermoPhase(), m_press(OneAtm), m_p0(OneAtm) { diff --git a/src/thermo/StoichSubstanceSSTP.cpp b/src/thermo/StoichSubstanceSSTP.cpp index d152e679c..9d86b799b 100644 --- a/src/thermo/StoichSubstanceSSTP.cpp +++ b/src/thermo/StoichSubstanceSSTP.cpp @@ -24,13 +24,11 @@ namespace Cantera * ---- Constructors ------- */ -StoichSubstanceSSTP::StoichSubstanceSSTP(): - SingleSpeciesTP() +StoichSubstanceSSTP::StoichSubstanceSSTP() { } -StoichSubstanceSSTP::StoichSubstanceSSTP(const std::string& infile, std::string id_) : - SingleSpeciesTP() +StoichSubstanceSSTP::StoichSubstanceSSTP(const std::string& infile, std::string id_) { XML_Node* root = get_XML_File(infile); if (id_ == "-") { @@ -51,8 +49,7 @@ StoichSubstanceSSTP::StoichSubstanceSSTP(const std::string& infile, std::string importPhase(*xphase, this); } -StoichSubstanceSSTP::StoichSubstanceSSTP(XML_Node& xmlphase, const std::string& id_) : - SingleSpeciesTP() +StoichSubstanceSSTP::StoichSubstanceSSTP(XML_Node& xmlphase, const std::string& id_) { if (id_ != "") { std::string idxml = xmlphase["id"]; @@ -70,8 +67,7 @@ StoichSubstanceSSTP::StoichSubstanceSSTP(XML_Node& xmlphase, const std::string& importPhase(xmlphase, this); } -StoichSubstanceSSTP::StoichSubstanceSSTP(const StoichSubstanceSSTP& right) : - SingleSpeciesTP() +StoichSubstanceSSTP::StoichSubstanceSSTP(const StoichSubstanceSSTP& right) { *this = right; } diff --git a/src/thermo/SurfPhase.cpp b/src/thermo/SurfPhase.cpp index 34ae49984..2e807ef6e 100644 --- a/src/thermo/SurfPhase.cpp +++ b/src/thermo/SurfPhase.cpp @@ -20,7 +20,6 @@ using namespace std; namespace Cantera { SurfPhase::SurfPhase(doublereal n0): - ThermoPhase(), m_n0(n0), m_logn0(0.0), m_press(OneAtm) @@ -32,7 +31,6 @@ SurfPhase::SurfPhase(doublereal n0): } SurfPhase::SurfPhase(const std::string& infile, std::string id_) : - ThermoPhase(), m_n0(0.0), m_logn0(0.0), m_press(OneAtm) @@ -57,7 +55,6 @@ SurfPhase::SurfPhase(const std::string& infile, std::string id_) : } SurfPhase::SurfPhase(XML_Node& xmlphase) : - ThermoPhase(), m_n0(0.0), m_logn0(0.0), m_press(OneAtm) diff --git a/src/thermo/VPStandardStateTP.cpp b/src/thermo/VPStandardStateTP.cpp index 4b478c971..8a555f2a8 100644 --- a/src/thermo/VPStandardStateTP.cpp +++ b/src/thermo/VPStandardStateTP.cpp @@ -23,7 +23,6 @@ namespace Cantera * Default constructor */ VPStandardStateTP::VPStandardStateTP() : - ThermoPhase(), m_Pcurrent(OneAtm), m_Tlast_ss(-1.0), m_Plast_ss(-1.0), @@ -33,7 +32,6 @@ VPStandardStateTP::VPStandardStateTP() : } VPStandardStateTP::VPStandardStateTP(const VPStandardStateTP& b) : - ThermoPhase(), m_Pcurrent(OneAtm), m_Tlast_ss(-1.0), m_Plast_ss(-1.0), diff --git a/src/thermo/WaterSSTP.cpp b/src/thermo/WaterSSTP.cpp index 63d5199a6..d4daf6d2e 100644 --- a/src/thermo/WaterSSTP.cpp +++ b/src/thermo/WaterSSTP.cpp @@ -20,7 +20,6 @@ using namespace std; namespace Cantera { WaterSSTP::WaterSSTP() : - SingleSpeciesTP(), m_sub(0), m_waterProps(0), m_mw(0.0), @@ -32,7 +31,6 @@ WaterSSTP::WaterSSTP() : } WaterSSTP::WaterSSTP(const std::string& inputFile, const std::string& id) : - SingleSpeciesTP(), m_sub(0), m_waterProps(0), m_mw(0.0), @@ -45,7 +43,6 @@ WaterSSTP::WaterSSTP(const std::string& inputFile, const std::string& id) : } WaterSSTP::WaterSSTP(XML_Node& phaseRoot, const std::string& id) : - SingleSpeciesTP(), m_sub(0), m_waterProps(0), m_mw(0.0), diff --git a/src/tpx/CarbonDioxide.h b/src/tpx/CarbonDioxide.h index 76001f0ad..c0f88fbc7 100644 --- a/src/tpx/CarbonDioxide.h +++ b/src/tpx/CarbonDioxide.h @@ -12,8 +12,7 @@ namespace tpx class CarbonDioxide : public Substance { public: - CarbonDioxide() : - Substance() { + CarbonDioxide() { m_name="CarbonDioxide"; m_formula="CO2"; } diff --git a/src/tpx/RedlichKwong.h b/src/tpx/RedlichKwong.h index 8230e923e..8f32c0e98 100644 --- a/src/tpx/RedlichKwong.h +++ b/src/tpx/RedlichKwong.h @@ -14,7 +14,7 @@ class RedlichKwong : public Substance public: - RedlichKwong() : Substance() { + RedlichKwong() { setParameters(1.0, 1.0, 1.0); m_name = "Redlich-Kwong"; m_formula = "-"; diff --git a/src/transport/DustyGasTransport.cpp b/src/transport/DustyGasTransport.cpp index 116a84f62..fdde7a601 100644 --- a/src/transport/DustyGasTransport.cpp +++ b/src/transport/DustyGasTransport.cpp @@ -17,12 +17,7 @@ namespace Cantera { DustyGasTransport::DustyGasTransport(thermo_t* thermo) : Transport(thermo), - m_mw(0), - m_dk(0), m_temp(-1.0), - m_multidiff(0,0), - m_spwork(0), - m_spwork2(0), m_gradP(0.0), m_knudsen_ok(false), m_bulk_ok(false), @@ -36,13 +31,7 @@ DustyGasTransport::DustyGasTransport(thermo_t* thermo) : } DustyGasTransport::DustyGasTransport(const DustyGasTransport& right) : - Transport(), - m_mw(0), - m_dk(0), m_temp(-1.0), - m_multidiff(0,0), - m_spwork(0), - m_spwork2(0), m_gradP(0.0), m_knudsen_ok(false), m_bulk_ok(false), diff --git a/src/transport/GasTransport.cpp b/src/transport/GasTransport.cpp index b9e879dc9..e72639392 100644 --- a/src/transport/GasTransport.cpp +++ b/src/transport/GasTransport.cpp @@ -14,21 +14,12 @@ namespace Cantera GasTransport::GasTransport(ThermoPhase* thermo) : Transport(thermo), - m_molefracs(0), m_viscmix(0.0), m_visc_ok(false), m_viscwt_ok(false), m_spvisc_ok(false), m_bindiff_ok(false), m_mode(0), - m_phi(0,0), - m_spwork(0), - m_visc(0), - m_visccoeffs(0), - m_mw(0), - m_wratjk(0,0), - m_wratkj1(0,0), - m_sqvisc(0), m_polytempvec(5), m_temp(-1.0), m_kbt(0.0), @@ -37,28 +28,17 @@ GasTransport::GasTransport(ThermoPhase* thermo) : m_logt(0.0), m_t14(0.0), m_t32(0.0), - m_diffcoeffs(0), - m_bdiff(0, 0), m_log_level(0) { } GasTransport::GasTransport(const GasTransport& right) : - m_molefracs(0), m_viscmix(0.0), m_visc_ok(false), m_viscwt_ok(false), m_spvisc_ok(false), m_bindiff_ok(false), m_mode(0), - m_phi(0,0), - m_spwork(0), - m_visc(0), - m_visccoeffs(0), - m_mw(0), - m_wratjk(0,0), - m_wratkj1(0,0), - m_sqvisc(0), m_polytempvec(5), m_temp(-1.0), m_kbt(0.0), @@ -67,8 +47,6 @@ GasTransport::GasTransport(const GasTransport& right) : m_logt(0.0), m_t14(0.0), m_t32(0.0), - m_diffcoeffs(0), - m_bdiff(0, 0), m_log_level(0) { } diff --git a/src/transport/LTPspecies.cpp b/src/transport/LTPspecies.cpp index e075dc7bd..4016cef39 100644 --- a/src/transport/LTPspecies.cpp +++ b/src/transport/LTPspecies.cpp @@ -174,7 +174,6 @@ LTPspecies_Arrhenius::LTPspecies_Arrhenius(const XML_Node& propNode, const std:: } LTPspecies_Arrhenius::LTPspecies_Arrhenius(const LTPspecies_Arrhenius& right) - : LTPspecies() { *this = right; } diff --git a/src/transport/LiquidTransport.cpp b/src/transport/LiquidTransport.cpp index f3a28d97f..f60c32fde 100644 --- a/src/transport/LiquidTransport.cpp +++ b/src/transport/LiquidTransport.cpp @@ -28,8 +28,6 @@ LiquidTransport::LiquidTransport(thermo_t* thermo, int ndim) : m_lambda(-1.0), m_viscmix(-1.0), m_ionCondmix(-1.0), - m_mobRatMix(0), - m_selfDiffMix(0), m_visc_mix_ok(false), m_visc_temp_ok(false), m_visc_conc_ok(false), @@ -71,8 +69,6 @@ LiquidTransport::LiquidTransport(const LiquidTransport& right) : m_lambda(-1.0), m_viscmix(-1.0), m_ionCondmix(-1.0), - m_mobRatMix(0), - m_selfDiffMix(0), m_visc_mix_ok(false), m_visc_temp_ok(false), m_visc_conc_ok(false), diff --git a/src/transport/LiquidTransportData.cpp b/src/transport/LiquidTransportData.cpp index 1747bdfdf..d7a6fc998 100644 --- a/src/transport/LiquidTransportData.cpp +++ b/src/transport/LiquidTransportData.cpp @@ -13,8 +13,6 @@ LiquidTransportData::LiquidTransportData() : hydroRadius(0), viscosity(0), ionConductivity(0), - mobilityRatio(0), - selfDiffusion(0), thermalCond(0), electCond(0), speciesDiffusivity(0) @@ -27,8 +25,6 @@ LiquidTransportData::LiquidTransportData(const LiquidTransportData& right) : hydroRadius(0), viscosity(0), ionConductivity(0), - mobilityRatio(0), - selfDiffusion(0), thermalCond(0), electCond(0), speciesDiffusivity(0) diff --git a/src/transport/LiquidTransportParams.cpp b/src/transport/LiquidTransportParams.cpp index 63433898e..533a397da 100644 --- a/src/transport/LiquidTransportParams.cpp +++ b/src/transport/LiquidTransportParams.cpp @@ -18,12 +18,8 @@ public: }; LiquidTransportParams::LiquidTransportParams() : - TransportParams(), - LTData(0), viscosity(0), ionConductivity(0), - mobilityRatio(0), - selfDiffusion(0), thermalCond(0), speciesDiffusivity(0), electCond(0), @@ -46,8 +42,6 @@ LiquidTransportParams::~LiquidTransportParams() } LiquidTransportParams::LiquidTransportParams(const LiquidTransportParams& right) : - TransportParams(), - LTData(0), viscosity(0), thermalCond(0), speciesDiffusivity(0), diff --git a/src/transport/MixTransport.cpp b/src/transport/MixTransport.cpp index c1aaefd5a..f2edc03b8 100644 --- a/src/transport/MixTransport.cpp +++ b/src/transport/MixTransport.cpp @@ -12,7 +12,6 @@ using namespace std; namespace Cantera { MixTransport::MixTransport() : - m_cond(0), m_lambda(0.0), m_spcond_ok(false), m_condmix_ok(false), @@ -22,7 +21,6 @@ MixTransport::MixTransport() : MixTransport::MixTransport(const MixTransport& right) : GasTransport(right), - m_cond(0), m_lambda(0.0), m_spcond_ok(false), m_condmix_ok(false), diff --git a/src/transport/SimpleTransport.cpp b/src/transport/SimpleTransport.cpp index 6afcce255..c29594563 100644 --- a/src/transport/SimpleTransport.cpp +++ b/src/transport/SimpleTransport.cpp @@ -34,7 +34,6 @@ SimpleTransport::SimpleTransport(thermo_t* thermo, int ndim) : } SimpleTransport::SimpleTransport(const SimpleTransport& right) : - Transport(), tempDepType_(0), compositionDepType_(LTI_MODEL_SOLVENT), useHydroRadius_(false), diff --git a/src/transport/SolidTransport.cpp b/src/transport/SolidTransport.cpp index 66147e135..df7e1a2fc 100644 --- a/src/transport/SolidTransport.cpp +++ b/src/transport/SolidTransport.cpp @@ -15,12 +15,7 @@ namespace Cantera { SolidTransport::SolidTransport() : - Transport() , m_nmobile(0), - m_Adiff(0), - m_Ndiff(0), - m_Ediff(0), - m_sp(0), m_Alam(-1.0), m_Nlam(0), m_Elam(0) @@ -28,12 +23,7 @@ SolidTransport::SolidTransport() : } SolidTransport::SolidTransport(const SolidTransport& right) : - Transport(), m_nmobile(0), - m_Adiff(0), - m_Ndiff(0), - m_Ediff(0), - m_sp(0), m_Alam(-1.0), m_Nlam(0), m_Elam(0) diff --git a/src/zeroD/FlowReactor.cpp b/src/zeroD/FlowReactor.cpp index 4cbfa9e1e..3cc41f3c1 100644 --- a/src/zeroD/FlowReactor.cpp +++ b/src/zeroD/FlowReactor.cpp @@ -13,7 +13,6 @@ namespace Cantera { FlowReactor::FlowReactor() : - Reactor(), m_speed(0.0), m_dist(0.0), m_T(0.0),