Fix unit for cirtical pressure (#26)

* fixed unit of Pc to bar, added test for PRSV gas * v0.3.7
thermohub · Mar 6, 2021 · f4da39b · f4da39b
1 parent ca89018
commit f4da39b
Show file tree

Hide file tree

Showing 6 changed files with 59,828 additions and 4 deletions.
diff --git 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
@@ -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
@@ -485,8 +485,8 @@ auto Database::parseSubstanceFormula(std::string formula_) const -> std::map<Ele
 
     formula.setFormula(formula_);
 
-//    FormulaProperites props;
-//    formula.calcFormulaProperites(props);
+    FormulaProperites props;
+    formula.calcFormulaProperites(props);
 
     for (auto element : formula.getElements_map())
     {