From 06c436c45c899ec16d85c4e7f7aa7d519c884915 Mon Sep 17 00:00:00 2001 From: tyneises Date: Fri, 4 Aug 2023 15:42:26 -0500 Subject: [PATCH] remove seemingly unused co2 prop files and delete from cmakelist --- tcs/CMakeLists.txt | 1 - tcs/co2props_nn1.cpp | 108 ------------------------------------------- tcs/co2props_nn1.h | 32 ------------- 3 files changed, 141 deletions(-) delete mode 100644 tcs/co2props_nn1.cpp delete mode 100644 tcs/co2props_nn1.h diff --git a/tcs/CMakeLists.txt b/tcs/CMakeLists.txt index fc2b9e8d7..ad2df2ba3 100644 --- a/tcs/CMakeLists.txt +++ b/tcs/CMakeLists.txt @@ -100,7 +100,6 @@ set(TCS_SRC atmospheric_aod.h base_dispatch.h cavity_calcs.h - co2props_nn1.h co2_compressor_library.h CO2_properties.h co2_testing.h diff --git a/tcs/co2props_nn1.cpp b/tcs/co2props_nn1.cpp deleted file mode 100644 index d8a872397..000000000 --- a/tcs/co2props_nn1.cpp +++ /dev/null @@ -1,108 +0,0 @@ -#include "co2props_nn.h" -#include "CO2_properties.h" - -int co2_TD(double T, double D, property_info *data) -{ - CO2_state state; - int val = CO2_TD(T, D, &state); - - data->T = state.temp; - data->Q = state.qual; - data->P = state.pres; - data->V = 1.0 / state.dens; - data->U = state.inte; - data->H = state.enth; - data->S = state.entr; - data->dens = state.dens; - data->Cv = state.cv; - data->Cp = state.cp; - data->cond = CO2_cond(state.dens, state.temp); - data->visc = CO2_visc(state.dens, state.temp); - data->ssnd = state.ssnd; - return val; -} - -int co2_TP(double T, double P, property_info *data) -{ - CO2_state state; - int val = CO2_TP(T, P, &state); - - data->T = state.temp; - data->Q = state.qual; - data->P = state.pres; - data->V = 1.0 / state.dens; - data->U = state.inte; - data->H = state.enth; - data->S = state.entr; - data->dens = state.dens; - data->Cv = state.cv; - data->Cp = state.cp; - data->cond = CO2_cond(state.dens, state.temp); - data->visc = CO2_visc(state.dens, state.temp); - data->ssnd = state.ssnd; - return val; -} - -int co2_PH(double P, double H, property_info *data) -{ - CO2_state state; - int val = CO2_PH(P, H, &state); - - data->T = state.temp; - data->Q = state.qual; - data->P = state.pres; - data->V = 1.0 / state.dens; - data->U = state.inte; - data->H = state.enth; - data->S = state.entr; - data->dens = state.dens; - data->Cv = state.cv; - data->Cp = state.cp; - data->cond = CO2_cond(state.dens, state.temp); - data->visc = CO2_visc(state.dens, state.temp); - data->ssnd = state.ssnd; - return val; -} - -int co2_PS(double P, double S, property_info *data) -{ - CO2_state state; - int val = CO2_PS(P, S, &state); - - data->T = state.temp; - data->Q = state.qual; - data->P = state.pres; - data->V = 1.0 / state.dens; - data->U = state.inte; - data->H = state.enth; - data->S = state.entr; - data->dens = state.dens; - data->Cv = state.cv; - data->Cp = state.cp; - data->cond = CO2_cond(state.dens, state.temp); - data->visc = CO2_visc(state.dens, state.temp); - data->ssnd = state.ssnd; - return val; -} - -int co2_HS(double H, double S, property_info *data) -{ - CO2_state state; - int val = CO2_HS(H, S, &state); - - data->T = state.temp; - data->Q = state.qual; - data->P = state.pres; - data->V = 1.0 / state.dens; - data->U = state.inte; - data->H = state.enth; - data->S = state.entr; - data->dens = state.dens; - data->Cv = state.cv; - data->Cp = state.cp; - data->cond = CO2_cond(state.dens, state.temp); - data->visc = CO2_visc(state.dens, state.temp); - data->ssnd = state.ssnd; - return val; -} - diff --git a/tcs/co2props_nn1.h b/tcs/co2props_nn1.h deleted file mode 100644 index ef2499b4b..000000000 --- a/tcs/co2props_nn1.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef __co2_h -#define __co2_h - -struct _property_info -{ - double T; /* temperature (K) */ - double Q; /* quality [0..1] */ - double P; /* pressure (kPa) */ - double V; /* specific volume (m3/kg) */ - double U; /* internal energy (kJ/kg) */ - double H; /* enthalpy (kJ/kg) */ - double S; /* entropy (kJ/kg-K) */ - double dens; /* density (kg/m3) */ - double Cv; /* specific heat at const. volume (kJ/kg-K), only available at a quality of 0 or 1 */ - double Cp; /* specific heat at const. pressure (kJ/kg-K), only available at a quality of 0 or 1 */ - double cond; /* thermal conductivity (W/m-K), only available at a quality of 0 or 1 */ - double visc; /* viscosity (Pa-s or kg/m-s)*10-6, only available at a quality of 0 or 1 */ - double ssnd; /* speed of sound in fluid (m/s), only available at a quality of 0 or 1 */ -}; - -typedef struct _property_info property_info; - -/* property functions return 0 on success, non-zero values are error codes */ - -int co2_TD( double T, double D, property_info *data ); -int co2_TP( double T, double P, property_info *data ); -int co2_PH( double P, double H, property_info *data ); -int co2_PS( double P, double S, property_info *data ); -int co2_HS( double H, double S, property_info *data ); - -#endif -