Fix a few very minor issues; unused variables and the like

This commit is contained in:
Ian Bell
2016-01-08 16:34:24 -07:00
parent 497622aa80
commit b5e22ebf4d
5 changed files with 3 additions and 7 deletions

View File

@@ -3021,8 +3021,8 @@ CoolProp::CriticalState HelmholtzEOSMixtureBackend::calc_critical_point(double r
{
class Resid : public FuncWrapperND{
public:
double L1, M1;
HelmholtzEOSMixtureBackend &HEOS;
double L1, M1;
Resid(HelmholtzEOSMixtureBackend &HEOS) : HEOS(HEOS), L1(_HUGE), M1(_HUGE) {};
std::vector<double> call(const std::vector<double> &tau_delta){
double rhomolar = tau_delta[1]*HEOS.rhomolar_reducing();
@@ -3149,7 +3149,7 @@ public:
std::vector<CoolProp::CriticalState> critical_points;
int N_critical_points;
Eigen::MatrixXd Lstar, adjLstar, dLstardTau, d2LstardTau2, dLstardDelta;
L0CurveTracer(HelmholtzEOSMixtureBackend &HEOS, double tau0, double delta0) : HEOS(HEOS), delta(delta0), tau(tau0), N_critical_points(0), M1_last(_HUGE)
L0CurveTracer(HelmholtzEOSMixtureBackend &HEOS, double tau0, double delta0) : HEOS(HEOS), delta(delta0), tau(tau0), M1_last(_HUGE), N_critical_points(0)
{
R_delta_tracer = 0.1;
R_delta = R_delta_tracer;

View File

@@ -607,7 +607,6 @@ CoolPropDbl TransportRoutines::viscosity_Chung(HelmholtzEOSMixtureBackend &HEOS)
A[i] = a0[i] + a1[i]*acentric + a2[i]*pow(mu_r, 4) + a3[i]*kappa;
}
double F_c = 1 - 0.2756*acentric + 0.059035*pow(mu_r, 4) + kappa; // [-]
double sigma_A = 0.809*pow(Vc_cm3mol, 1.0/3.0); // [A]
double epsilon_over_k = Tc/1.2593; // [K]
double rho_molcm3 = HEOS.rhomolar()/1e6;

View File

@@ -1138,7 +1138,6 @@ void SaturationSolvers::successive_substitution(HelmholtzEOSMixtureBackend &HEOS
CoolPropDbl Tc = EOS.reduce.T;
CoolPropDbl pc = EOS.reduce.p;
CoolPropDbl rhomolarc = EOS.reduce.rhomolar;
CoolPropDbl acentric = EOS.acentric;
CoolPropDbl R = 8.3144598;
summer_c += z[i]*(0.40768*R*Tc/pc*(0.29441 - pc/(rhomolarc*R*Tc)));

View File

@@ -240,13 +240,13 @@ namespace SaturationSolvers
class newton_raphson_twophase
{
public:
HelmholtzEOSMixtureBackend *HEOS;
newton_raphson_twophase_options::imposed_variable_options imposed_variable;
CoolPropDbl error_rms, rhomolar_liq, rhomolar_vap, T, p, min_rel_change, beta;
std::size_t N;
bool logging;
int Nsteps;
STLMatrix J;
HelmholtzEOSMixtureBackend *HEOS;
std::vector<CoolPropDbl> K, x, y, z, r, negative_r, err_rel;
std::vector<SuccessiveSubstitutionStep> step_logger;

View File

@@ -58,7 +58,6 @@ static bool dbg_refprop = false;
static const unsigned int number_of_endings = 5;
std::string endings[number_of_endings] = {"", ".FLD", ".fld", ".PPF", ".ppf"};
static char rel_path_HMX_BNC[] = "HMX.BNC";
static char default_reference_state[] = "DEF";
// Default location, can be over-ridden by configuration variable
@@ -961,7 +960,6 @@ void REFPROPMixtureBackend::calc_phase_envelope(const std::string &type)
PhaseEnvelope.lnp.push_back(log(y*1000));
isp = nc + 3;
SPLNVALdll(&isp, &iderv, &rho_molL, &y, &ierr, herr, errormessagelength);
double rhoV_molL = y;
PhaseEnvelope.rhomolar_liq.push_back(y*1000);
PhaseEnvelope.lnrhomolar_liq.push_back(log(y*1000));
PhaseEnvelope.Q.push_back(static_cast<double>(y > rho_molL));