Merge pull request #21 from eslickj/master

Final fix I hope
IDAES · Mar 30, 2020 · 29144e8 · 29144e8
2 parents f32c574 + 09244b2
commit 29144e8
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/src/helmholtz/common/helmholtz_solve.cpp b/src/helmholtz/common/helmholtz_solve.cpp
@@ -463,11 +463,8 @@ s_real tau_from_sp_with_derivs(s_real st, s_real pr, s_real *grad, s_real *hes){
       if (pr >= P_c){
         tau = 1.5;
       }
-      else if(T_c/tau_sat - 50 < T_t){
-        tau = T_c/T_t;
-      }
       else{
-        tau = T_c/(T_c/tau_sat - 50);
+        tau = T_c/T_t;
       }
       if(slpt_with_derivs(pr, tau, gradh, hesh) - st < 0 && pr < P_c){
         // Unfotunatly if the initial guess isn't good you can get on the wrong