reg5

Author: thermalogic

benches/speed_benchmark.rs

@@ -20,10 +20,10 @@ fn criterion_benchmark(c: &mut Criterion) {
     //group.bench_function("tv2h_reg3", |b| b.iter(|| tv(black_box(650.0 - 273.15), black_box(1.0 / 500.0), OH)));
     //group.bench_function("tv2s_reg3", |b| b.iter(|| tv(black_box(650.0 - 273.15), black_box(1.0 / 500.0), OS)));
     //group.bench_function("pt2h_reg3", |b| b.iter(|| pt(black_box(50.0), black_box(630.0-273.15), OH)));
-    group.bench_function("pt2s_reg3", |b| b.iter(|| pt(black_box(50.0), black_box(630.0-273.15), OS)));
+    //group.bench_function("pt2s_reg3", |b| b.iter(|| pt(black_box(50.0), black_box(630.0-273.15), OS)));
 
     //group.bench_function("pt2h_reg5", |b| b.iter(|| pt(black_box(0.5), black_box(1500.0 - 273.15), OH)));
-    //group.bench_function("pt2s_reg5", |b| b.iter(|| pt(black_box(0.5), black_box(1500.0-273.15), OS)));
+    group.bench_function("pt2s_reg5", |b| b.iter(|| pt(black_box(0.5), black_box(1500.0-273.15), OS)));
 
     group.finish();
 }

src/r5/region5_gfe.rs

@@ -233,5 +233,38 @@ pub fn gammar_pitau_reg5(pi: f64, tau: f64) -> f64 {
     result += IJn[4].2 * 18.0 * pi * tau_6*tau_2;       // I=2,J=9,  18
 	result += IJn[5].2 * 21.0 * pi*pi * tau_6;          // I=3,J=27, 21
 	return result
-    // poly_ij_powi(pi, tau, &IJn)
-}
+   // poly_ij_powi(pi, tau, &IJn)
+}
+
+// improve performance 10% ,but code complexity is increased
+#[inline(always)]
+pub fn gammar_pi_tau_reg5(pi: f64, tau: f64) -> (f64, f64) {
+    let mut item:f64=0.0;
+    let mut result_pi: f64 = 0.0;
+	let mut result_tau: f64 = 0.0;
+	// I 1 1 1 2 2 3
+	// J 1 2 3 3 9 7
+	let pi_2:f64 = pi*pi;
+	let tau_2:f64=tau*tau;
+	let tau_3:f64=tau_2*tau;
+	let tau_6:f64=tau_3*tau_3;
+	item = IJn[0].2 * pi*tau;
+    result_pi += item;
+    result_tau += item;
+    item = IJn[1].2 * pi*tau_2;
+    result_pi += item;
+    result_tau += 2.0*item;
+    item = IJn[2].2 * pi*tau_3;
+    result_pi += item;
+    result_tau += 3.0*item;
+    item = IJn[3].2 * pi_2*tau_3;
+	result_pi += 2.0*item;
+    result_tau += 3.0*item;
+    item = IJn[4].2 * pi_2*tau_6*tau_3;
+	result_pi += 2.0*item;
+    result_tau += 9.0*item;
+    item = IJn[5].2 * pi_2*pi*tau_6*tau;
+    result_pi += 3.0*item;
+    result_tau += 7.0*item;
+    (result_pi/pi, result_tau/tau)
+}

src/r5/region5_pT.rs

@@ -26,9 +26,13 @@ pub fn pT2u_reg5(p: f64, T: f64) -> f64 {
 pub fn pT2s_reg5(p: f64, T: f64) -> f64 {
     let pi: f64 = p / r5Pstar;
     let tau: f64 = r5Tstar / T;
+    
     let (sum_gammar, sum_gammar_tau) = polys_0_j_powi(pi, tau, &IJn);
+   
+    //let (sum_gammar, sum_gammar_tau) = gammar_pi_tau_reg5(pi, tau);
     //let sum_gammar=poly_powi(pi, tau, &IJn);
     //let sum_gammar_tau = poly_j_powi(pi, tau, &IJn);
+    
     let a: f64 = tau * (gamma0_tau_reg5(tau) + sum_gammar_tau) - (gamma0_reg5(pi, tau) + sum_gammar);
     RGAS_WATER * a
 }