diff --git a/include/teqp/json_builder.hpp b/include/teqp/json_builder.hpp index a7664cfca97399d821bf08f983a9813fd4e9454f..6f93d88986033be8a8eef3432a814ab28f9c323f 100644 --- a/include/teqp/json_builder.hpp +++ b/include/teqp/json_builder.hpp @@ -8,7 +8,7 @@ namespace teqp { - static AllowedModels build_model(const nlohmann::json& json) { + inline AllowedModels build_model(const nlohmann::json& json) { // Extract the name of the model and the model parameters std::string kind = json.at("kind"); diff --git a/include/teqp/models/multifluid_ancillaries.hpp b/include/teqp/models/multifluid_ancillaries.hpp index 5b3eb8f01c5c6db0272a7ffd9246e6421a14afb2..445ef1697e534d65166725b771d2d1fc9d4c2e7a 100644 --- a/include/teqp/models/multifluid_ancillaries.hpp +++ b/include/teqp/models/multifluid_ancillaries.hpp @@ -6,20 +6,21 @@ namespace teqp{ struct VLEAncillary{ - const double T_r, Tmax, Tmin, reducing_value; + const double T_r, Tmax, Tmin; const std::string type, description; const std::valarray<double> n, t; + const double reducing_value; const bool using_tau_r, noexp; VLEAncillary(const nlohmann::json &j) : T_r(j.at("T_r")), Tmax(j.at("Tmax")), Tmin(j.at("Tmin")), + type(j.at("type")), description(j.at("description")), n(j.at("n").get<std::valarray<double>>()), t(j.at("t").get<std::valarray<double>>()), reducing_value(j.at("reducing_value")), - type(j.at("type")), using_tau_r(j.at("using_tau_r")), noexp(type == "rhoLnoexp"){};