changed reducing scheme

include/teqp/models/multifluid_mutant_ecs.hpp

@@ -57,13 +57,13 @@ namespace teqp {
             auto p20 = tr_coeffs(3, 0) + z[0] * tr_coeffs(3, 1) + z[0] * z[0] * tr_coeffs(3, 2);
             auto p11 = tr_coeffs(4, 0) + z[0] * tr_coeffs(4, 1) + z[0] * z[0] * tr_coeffs(4, 2);
             auto p02 = tr_coeffs(5, 0) + z[0] * tr_coeffs(5, 1) + z[0] * z[0] * tr_coeffs(5, 2);
-
-            auto dc_scale = 1.0 / (vc[0] * 1E3 + vc[1] * 1E3) * 1E3;
+            // auto dc_scale = 1.0 / (vc[0] * 1E3 + vc[1] * 1E3) * 1E3;
+			auto dc_scale = 1.0/(0.125* pow( pow(vc[0],1.0/3.0)  + pow(vc[1],1.0/3.0),3.0));
             auto tc_scale = sqrt(Tc[0] * Tc[1]);
-            auto tau = T / tc_scale;
+            auto tau = tc_scale / T;
             auto delta = rho / dc_scale;
 
-            return pow(z[0], 2.0) * Tc[0] + pow(z[1], 2.0) * Tc[1] - 2.0 * z[0] * z[1] * \
+            return pow(z[0], 2.0) * Tc[0] + pow(z[1], 2.0) * Tc[1] + 2.0 * z[0] * z[1] * \
                 (p00 + p10 * delta + p01 * tau + p20 * delta * delta + p02 * tau * tau + p11 * delta * tau) * tc_scale;
         }
 
@@ -77,13 +77,14 @@ namespace teqp {
             auto p20 = dr_coeffs(3, 0) + z[0] * dr_coeffs(3, 1) + z[0] * z[0] * dr_coeffs(3, 2);
             auto p11 = dr_coeffs(4, 0) + z[0] * dr_coeffs(4, 1) + z[0] * z[0] * dr_coeffs(4, 2);
             auto p02 = dr_coeffs(5, 0) + z[0] * dr_coeffs(5, 1) + z[0] * z[0] * dr_coeffs(5, 2);
-            auto dc_scale = 1.0 / (vc[0] * 1E3 + vc[1] * 1E3) * 1E3;
+			auto dc_scale = 1.0/(0.125* pow( pow(vc[0],1.0/3.0)  + pow(vc[1],1.0/3.0),3.0));
+            auto vc_scale = (0.125 * pow(pow(vc[0], 1.0 / 3.0) + pow(vc[1], 1.0 / 3.0), 3.0));
             auto tc_scale = sqrt(Tc[0] * Tc[1]);
-            auto tau = T / tc_scale;
+            auto tau = tc_scale / T;
             auto delta = rho / dc_scale;
 
-            auto vc_ = pow(z[0], 2.0) * vc[0] * 1E3 + pow(z[1], 2.0) * vc[1] * 1E3 - 2.0 * z[0] * z[1] * \
-                (p00 + p10 * delta + p01 * tau + p20 * delta * delta + p02 * tau * tau + p11 * delta * tau) * dc_scale / 1E3;
+            auto vc_ = pow(z[0], 2.0) * vc[0] * 1E3 + pow(z[1], 2.0) * vc[1] * 1E3 + 2.0 * z[0] * z[1] * \
+                (p00 + p10 * delta + p01 * tau + p20 * delta * delta + p02 * tau * tau + p11 * delta * tau) * vc_scale * 1E3;
             return 1E3 * (1.0 / vc_);
         }
 
@@ -128,6 +129,7 @@ namespace teqp {
         auto N = model.redfunc.Tc.size();
         auto red = model.redfunc;
         auto Tc = red.Tc, vc = red.vc;
+        //auto fld = model.at["meta"];
         auto newred = Reducing_ECS(Tc, vc, jj);
         auto mfa = MultiFluidAdapter_Ecs(model, std::move(newred));
         mfa.set_meta(jj.dump());