From 3bc286b8f9965c7861e2ee3d154df96892f72d52 Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Mon, 22 Feb 2016 15:38:26 +0100 Subject: [PATCH] Eliminated some more warnings regarding missing return values --- src/Backends/REFPROP/REFPROPMixtureBackend.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/Backends/REFPROP/REFPROPMixtureBackend.cpp b/src/Backends/REFPROP/REFPROPMixtureBackend.cpp index 1a8ba716..244b2de1 100644 --- a/src/Backends/REFPROP/REFPROPMixtureBackend.cpp +++ b/src/Backends/REFPROP/REFPROPMixtureBackend.cpp @@ -526,11 +526,13 @@ double REFPROPMixtureBackend::get_binary_interaction_double(const std::string &C else if (parameter == "Fij"){ val = fij[4]; } else{ throw ValueError(format(" I don't know what to do with your parameter [%s]", parameter.c_str())); + return _HUGE; } return val; } else{ //throw ValueError(format("For now, model [%s] must start with KW or GE", hmodij)); + return _HUGE; } } /// Get binary mixture string value @@ -549,13 +551,17 @@ std::string REFPROPMixtureBackend::get_binary_interaction_string(const std::stri std::string shmodij(hmodij); if (shmodij.find("KW")==0 || shmodij.find("GE")==0)// Starts with KW or GE { - if (parameter == "model"){ return shmodij;} - else{ + if (parameter == "model"){ + return shmodij; + } + else { throw ValueError(format(" I don't know what to do with your parameter [%s]", parameter.c_str())); + return ""; } } - else{ + else { //throw ValueError(format("For now, model [%s] must start with KW or GE", hmodij)); + return ""; } } void REFPROPMixtureBackend::set_mole_fractions(const std::vector &mole_fractions) @@ -1733,10 +1739,12 @@ void REFPROPMixtureBackend::calc_true_critical_point(double &T, double &rho) CoolPropDbl REFPROPMixtureBackend::calc_saturated_liquid_keyed_output(parameters key) { if ((key == iDmolar) && _rhoLmolar) return _rhoLmolar; throw ValueError("The saturated liquid state has not been set."); + return _HUGE; } CoolPropDbl REFPROPMixtureBackend::calc_saturated_vapor_keyed_output(parameters key) { if ((key == iDmolar) && _rhoVmolar) return _rhoVmolar; ValueError("The saturated vapor state has not been set."); + return _HUGE; } void REFPROPMixtureBackend::calc_ideal_curve(const std::string &type, std::vector &T, std::vector &p){