From f8020eb65b133b8a6525a8c9d27f669b3ea4b502 Mon Sep 17 00:00:00 2001 From: thermalogic Date: Mon, 4 Sep 2023 00:29:52 +0800 Subject: [PATCH] fixed px --- Cargo.toml | 2 +- setup.cfg | 2 +- src/cdecl_c_if97.rs | 2 +- src/python_if97.rs | 2 +- src/r4/region4_pTx.rs | 4 ++-- src/rust_if97.rs | 2 +- src/stdcall_c_if97.rs | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 63d1ce4..6e182b6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "seuif97" -version = "1.1.1" +version = "1.1.2" edition = "2021" authors = ["Cheng Maohua "] description = "The high-speed IAPWS-IF97 package with C and Python binding" diff --git a/setup.cfg b/setup.cfg index 807c00f..cb4451b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = seuif97 -version = 2.1.7 +version = 2.1.8 author=Cheng Maohua author_email=cmh@seu.edu.cn keywords = IAPWS-IF97, IF97 diff --git a/src/cdecl_c_if97.rs b/src/cdecl_c_if97.rs index 4e1073b..dc4401d 100644 --- a/src/cdecl_c_if97.rs +++ b/src/cdecl_c_if97.rs @@ -62,7 +62,7 @@ pub unsafe extern "C" fn px(p: f64, x: f64, o_id: i32) -> f64 { match o_id { OP => return p, OX => return x, - OT => return px_reg4(p, x, o_id) - 273.15, + OT => return px_reg4(p, x, o_id), _ => return px_reg4(p, x, o_id), } } diff --git a/src/python_if97.rs b/src/python_if97.rs index db43ffb..8226af9 100644 --- a/src/python_if97.rs +++ b/src/python_if97.rs @@ -59,7 +59,7 @@ fn px(p: f64, x: f64, o_id: i32) -> f64 { match o_id { OP => return p, OX => return x, - OT => return px_reg4(p, x, o_id) - 273.15, + OT => return px_reg4(p, x, o_id), _ => return px_reg4(p, x, o_id), } } diff --git a/src/r4/region4_pTx.rs b/src/r4/region4_pTx.rs index 96ec318..0f20fd7 100644 --- a/src/r4/region4_pTx.rs +++ b/src/r4/region4_pTx.rs @@ -175,7 +175,7 @@ pub fn px_reg4(p: f64, x: f64, o_id: i32) -> f64 { let T: f64 = T_saturation(p); match o_id { OT => return T - 273.15, - OH | OS | OV | OU | OF | OG | OE => { + OH | OS | OV | OD | OU | OF | OG | OE => { // region 4 x(0,1) return v,h,s only let mut rl: f64 = 0.0; let mut rv: f64 = 0.0; @@ -208,7 +208,7 @@ pub fn Tx_reg4(T: f64, x: f64, o_id: i32) -> f64 { } let mut r: f64 = 0.0; match o_id { - OH | OS | OV | OU | OF | OG | OE => { + OH | OS | OV | OD | OU | OF | OG | OE => { // region 4 x(0,1) return v,h,s only let mut rl: f64 = 0.0; let mut rv: f64 = 0.0; diff --git a/src/rust_if97.rs b/src/rust_if97.rs index 24d4f38..62303b0 100644 --- a/src/rust_if97.rs +++ b/src/rust_if97.rs @@ -187,7 +187,7 @@ pub fn px(p: f64, x: f64, o_id: i32) -> f64 { match o_id { OP => return p, OX => return x, - OT => return px_reg4(p, x, o_id) - 273.15, + OT => return px_reg4(p, x, o_id), _ => return px_reg4(p, x, o_id), } } diff --git a/src/stdcall_c_if97.rs b/src/stdcall_c_if97.rs index d3d6e7c..3b7d607 100644 --- a/src/stdcall_c_if97.rs +++ b/src/stdcall_c_if97.rs @@ -62,7 +62,7 @@ pub unsafe extern "stdcall" fn px(p: f64, x: f64, o_id: i32) -> f64 { match o_id { OP => return p, OX => return x, - OT => return px_reg4(p, x, o_id) - 273.15, + OT => return px_reg4(p, x, o_id), _ => return px_reg4(p, x, o_id), } }