Refactor the setting of Paricaud constants

usnistgov · Oct 18, 2023 · ff03495 · ff03495
1 parent 19d09e5
commit ff03495
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/include/teqp/models/saft/polar_terms.hpp b/include/teqp/models/saft/polar_terms.hpp
@@ -786,16 +786,16 @@ class MultipolarContributionGrayGubbins {
 
     // These values were adjusted in the model of Paricaud, JPCB, 2023
     /// The C3b is the C of Paricaud, and C3 is the tau of Paricaud. They were renamed to be not cause confusion with the multifluid modeling approach
-    const double C3;
+    const double C3, C3b;
     const double C3b;
 
-    double get_C3(const std::optional<nlohmann::json>& flags){
-        if (flags){ return flags.value().value("C3", 1.0); }
-        return 1.0;
+    double get_C3(const std::optional<nlohmann::json>& flags, double default_value=1.0){
+        if (flags){ return flags.value().value("C3", default_value); }
+        return default_value;
     }
-    double get_C3b(const std::optional<nlohmann::json>& flags){
-        if (flags){ return flags.value().value("C3b", 1.0); }
-        return 1.0;
+    double get_C3b(const std::optional<nlohmann::json>& flags, double default_value=1.0){
+        if (flags){ return flags.value().value("C3b", default_value); }
+        return default_value;
     }
     multipolar_rhostar_approach get_approach(const std::optional<nlohmann::json>& flags){
         if (flags){ return flags.value().value("approach", multipolar_rhostar_approach::use_packing_fraction); }