diff --git a/CMakeLists.txt b/CMakeLists.txt index c9b8cfa..e16ff21 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.9) # Set the name of the project -project(ThermoFun VERSION 0.3.6 LANGUAGES CXX) +project(ThermoFun VERSION 0.3.7 LANGUAGES CXX) # Set the cmake module path of the project set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") diff --git a/ThermoFun/Common/ParseJsonToData.cpp b/ThermoFun/Common/ParseJsonToData.cpp index c982553..0f9b906 100644 --- a/ThermoFun/Common/ParseJsonToData.cpp +++ b/ThermoFun/Common/ParseJsonToData.cpp @@ -337,7 +337,7 @@ auto thermoParamSubst(const json &j, std::string prop_name, ThermoParametersSubs read_values_units(j, "eos_akinfiev_diamond_coeffs", ps.Cp_nonElectrolyte_coeff, {"1", "(cm^3)/g", "(cm^3*K^0.5)/g"}); // ps.volume_BirchM_coeff = read_values_units(j, "eos_birch_murnaghan_coeffs", {}); - read_values_units(j, "eos_gas_crit_props", ps.critical_parameters, {"K", "Pa", "1", "1"}); + read_values_units(j, "eos_gas_crit_props", ps.critical_parameters, {"K", "bar", "1", "1"}); read_values_units(j, "eos_hkf_coeffs", ps.HKF_parameters, {"cal/(mol*bar)", "cal/mol", "(cal*K)/(mol*bar)", "(cal*K)/mol", "cal/(mol*K)", "(cal*K)/mol", "cal/mol"}); // temporary fix - need to think how to handle more than 1 TP interval - for new structure - simplified diff --git a/ThermoFun/Database.cpp b/ThermoFun/Database.cpp index 9923a9d..e880fc2 100644 --- a/ThermoFun/Database.cpp +++ b/ThermoFun/Database.cpp @@ -485,8 +485,8 @@ auto Database::parseSubstanceFormula(std::string formula_) const -> std::map