From 58aa23c95b992b62f9b21a746007e24945f970ad Mon Sep 17 00:00:00 2001 From: Rod Persky Date: Sat, 17 May 2014 17:44:21 +1000 Subject: [PATCH] test travis --- .travis.yml | 15 +++---- Web/examples/C++/Example.cpp | 80 +++++++++++++++++++++--------------- 2 files changed, 53 insertions(+), 42 deletions(-) diff --git a/.travis.yml b/.travis.yml index ace61c50..8ef6f1f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,17 +3,14 @@ virtualenv: system_site_packages: true python: - "2.7" - - "3.2" - - "3.3" # command to install dependencies install: - gcc -v - - pip -q install cython --install-option="--no-cython-compile" - - cd wrappers/Python - - python setup.py install # Install CoolProp - - cd ../SharedLibrary + - mkdir build + - cmake .. -DCOOLPROP_TESTING=ON + - cmake .. -DCOOLPROP_TESTING=ON - make - + - ctest # command to run tests script: - pwd @@ -23,6 +20,6 @@ script: notifications: email: recipients: - - ian.h.bell@gmail.com + - rodney.persky@gmail.com on_success: never # default: change - on_failure: always # default: always \ No newline at end of file + on_failure: always # default: always diff --git a/Web/examples/C++/Example.cpp b/Web/examples/C++/Example.cpp index c8f6362f..503e98c0 100644 --- a/Web/examples/C++/Example.cpp +++ b/Web/examples/C++/Example.cpp @@ -1,11 +1,13 @@ #include "CoolProp.h" #include "HumidAirProp.h" -#include "CPState.h" +//#include "CPState.h" #include #include #pragma GCC diagnostic ignored "-Wwrite-strings" //Ignore char* warnings +using namespace CoolProp; // For normal CoolProp calls +using namespace HumidAir; // For HAPropsSI int main() { double T, h, p, D; @@ -13,89 +15,101 @@ int main() { printf("CoolProp gitrevision:\t%s\n", get_global_param_string("gitrevision").c_str()); printf("CoolProp fluids:\t%s\n", get_global_param_string("FluidsList").c_str()); + printf("\n************ USING EOS *************\n"); printf("FLUID STATE INDEPENDENT INPUTS\n"); - printf("Critical Density Propane: %f kg/m^3\n", Props1("Propane", "rhocrit")); + //printf("Critical Density Propane: %f kg/m^3\n", PropsSI1("Propane", "rhocrit")); printf("\nTWO PHASE INPUTS (Pressure)\n"); - printf("Density of saturated liquid Propane at 101.325 kPa: %f kg/m^3\n", Props("D", 'P', 101.325, 'Q', 0, "Propane")); - printf("Density of saturated vapor R290 at 101.325 kPa: %f kg/m^3\n", Props("D", 'P', 101.325, 'Q', 1, "R290")); + printf("Density of saturated liquid Propane at 101.325 kPa: %f kg/m^3\n", PropsSI("D", "P", 101.325, "Q", 0, "Propane")); + printf("Density of saturated vapor R290 at 101.325 kPa: %f kg/m^3\n", PropsSI("D", "P", 101.325, "Q", 1, "R290")); printf("\nTWO PHASE INPUTS (Temperature)\n"); - printf("Density of saturated liquid Propane at 300 K: %f kg/m^3\n", Props("D", 'T', 300, 'Q', 0, "Propane")); - printf("Density of saturated vapor R290 at 300 K: %f kg/m^3\n", Props("D", 'T', 300, 'Q', 1, "R290")); + printf("Density of saturated liquid Propane at 300 K: %f kg/m^3\n", PropsSI("D", "T", 300, "Q", 0, "Propane")); + printf("Density of saturated vapor R290 at 300 K: %f kg/m^3\n", PropsSI("D", "T", 300, "Q", 1, "R290")); printf("\nSINGLE PHASE CYCLE (Propane)\n"); - p = Props("P", 'T', 300, 'D', 1, "Propane"); - h = Props("H", 'T', 300, 'D', 1, "Propane"); + p = PropsSI("P", "T", 300, "D", 1, "Propane"); + h = PropsSI("H", "T", 300, "D", 1, "Propane"); printf("T,D -> P,H : 300,1 -> %f,%f\n", p, h); - T = Props("T", 'P', p, 'H', h, "Propane"); - D = Props("D", 'P', p, 'H', h, "Propane"); + T = PropsSI("T", "P", p, "H", h, "Propane"); + D = PropsSI("D", "P", p, "H", h, "Propane"); printf("P,H -> T,D : %f, %f -> %f, %f\n", p, h, T, D); + /* enable_TTSE_LUT not currently in V5 printf("\n************ USING TTSE ***************\n"); enable_TTSE_LUT("Propane"); printf("TWO PHASE INPUTS (Pressure)\n"); - printf("Density of saturated liquid Propane at 101.325 kPa: %f kg/m^3\n", Props("D", 'P', 101.325, 'Q', 0, "Propane")); - printf("Density of saturated vapor R290 at 101.325 kPa: %f kg/m^3\n", Props("D", 'P', 101.325, 'Q', 1, "R290")); + printf("Density of saturated liquid Propane at 101.325 kPa: %f kg/m^3\n", PropsSI("D", "P", 101.325, "Q", 0, "Propane")); + printf("Density of saturated vapor R290 at 101.325 kPa: %f kg/m^3\n", PropsSI("D", "P", 101.325, "Q", 1, "R290")); printf("\nTWO PHASE INPUTS (Temperature)"); - printf("Density of saturated liquid Propane at 300 K: %f kg/m^3\n", Props("D", 'T', 300, 'Q', 0, "Propane")); - printf("Density of saturated vapor R290 at 300 K: %f kg/m^3\n", Props("D", 'T', 300, 'Q', 1, "R290")); + printf("Density of saturated liquid Propane at 300 K: %f kg/m^3\n", PropsSI("D", "T", 300, "Q", 0, "Propane")); + printf("Density of saturated vapor R290 at 300 K: %f kg/m^3\n", PropsSI("D", "T", 300, "Q", 1, "R290")); printf("\nSINGLE PHASE CYCLE (propane)\n"); - p = Props("P", 'T', 300, 'D', 1, "Propane"); - h = Props("H", 'T', 300, 'D', 1, "Propane"); + p = PropsSI("P", "T", 300, "D", 1, "Propane"); + h = PropsSI("H", "T", 300, "D", 1, "Propane"); printf("T,D -> P,H : 300,1 -> %f,%f", p, h); - T = Props("T", 'P', p, 'H', h, "Propane"); - D = Props("D", 'P', p, 'H', h, "Propane"); + T = PropsSI("T", "P", p, "H", h, "Propane"); + D = PropsSI("D", "P", p, "H", h, "Propane"); printf("P,H -> T,D : %f, %f -> %f, %f\n", p, h, T, D); disable_TTSE_LUT("Propane"); + */ + /* get_fluid_param_string not currently in V5 try { printf("\n************ USING REFPROP ***************\n"); std::string RPName = std::string("REFPROP-")+get_fluid_param_string("Propane","REFPROPname"); printf("TWO PHASE INPUTS (Pressure)"); - printf("Density of saturated liquid Propane at 101.325 kPa: %f kg/m^3\n", Props("D", 'P', 101.325, 'Q', 0, RPName)); - printf("Density of saturated vapor R290 at 101.325 kPa: %f kg/m^3\n", Props("D", 'P', 101.325, 'Q', 1, RPName)); + printf("Density of saturated liquid Propane at 101.325 kPa: %f kg/m^3\n", PropsSI("D", "P", 101.325, "Q", 0, RPName)); + printf("Density of saturated vapor R290 at 101.325 kPa: %f kg/m^3\n", PropsSI("D", "P", 101.325, "Q", 1, RPName)); printf("\nTWO PHASE INPUTS (Temperature)"); - printf("Density of saturated liquid Propane at 300 K: %f kg/m^3\n", Props("D", 'T', 300, 'Q', 0, RPName)); - printf("Density of saturated vapor R290 at 300 K: %f kg/m^3\n", Props("D", 'T', 300, 'Q', 1, RPName)); + printf("Density of saturated liquid Propane at 300 K: %f kg/m^3\n", PropsSI("D", "T", 300, "Q", 0, RPName)); + printf("Density of saturated vapor R290 at 300 K: %f kg/m^3\n", PropsSI("D", "T", 300, "Q", 1, RPName)); printf("\nSINGLE PHASE CYCLE (propane)\n"); - p = Props("P", 'T', 300, 'D', 1, RPName); - h = Props("H", 'T', 300, 'D', 1, RPName); + p = PropsSI("P", "T", 300, "D", 1, RPName); + h = PropsSI("H", "T", 300, "D", 1, RPName); printf("T,D -> P,H : 300,1 -> %f,%f\n", p, h); - T = Props("T", 'P', p, 'H', h, RPName); - D = Props("D", 'P', p, 'H', h, RPName); + T = PropsSI("T", "P", p, "H", h, RPName); + D = PropsSI("D", "P", p, "H", h, RPName); printf("P,H -> T,D : %f, %f -> %f, %f\n", p, h, T, D); } catch (std::exception &e) { printf("\n************ CANT USE REFPROP ************\n"); } + + */ + /* set_standard_unit_system not currently in V5 printf("\n************ CHANGE UNIT SYSTEM (default is kSI) *************\n"); set_standard_unit_system(UNIT_SYSTEM_SI); - printf("Vapor pressure of water at 373.15 K in SI units (Pa): %f\n", Props("P", 'T', 373.15, 'Q', 0, "Water")); + printf("Vapor pressure of water at 373.15 K in SI units (Pa): %f\n", PropsSI("P", "T", 373.15, "Q", 0, "Water")); set_standard_unit_system(UNIT_SYSTEM_KSI); - printf("Vapor pressure of water at 373.15 K in kSI units (kPa): %f\n", Props("P", 'T', 373.15, 'Q', 0, "Water")); + printf("Vapor pressure of water at 373.15 K in kSI units (kPa): %f\n", PropsSI("P", "T", 373.15, "Q", 0, "Water")); + */ printf("\n************ BRINES AND SECONDARY WORKING FLUIDS *************\n"); - printf("Density of 50%% (mass) ethylene glycol/water at 300 K, 101.325 kPa: %f kg/m^3\n", Props("D", 'T', 300, 'P', 101.325, "EG-50%")); - printf("Viscosity of Therminol D12 at 350 K, 101.325 kPa: %f Pa-s\n", Props("V", 'T', 350, 'P', 101.325, "TD12")); + printf("Density of 50%% (mass) ethylene glycol/water at 300 K, 101.325 kPa: %f kg/m^3\n", PropsSI("D", "T", 300, "P", 101.325, "EG-50%")); + printf("Viscosity of Therminol D12 at 350 K, 101.325 kPa: %f Pa-s\n", PropsSI("V", "T", 350, "P", 101.325, "TD12")); - printf("\n************ HUMID AIR PROPERTIES *************\n"); - printf("Humidity ratio of 50%% rel. hum. air at 300 K, 101.325 kPa: %f kg_w/kg_da\n", HAProps("W", "T", 300, "P", 101.325, "R", 0.5)); - printf("Relative humidity from last calculation: %f (fractional)\n", HAProps("R", "T", 300, "P", 101.325, "W", HAProps("W", "T", 300, "P", 101.325, "R", 0.5))); + // HAProps API broken in V5 + //printf("\n************ HUMID AIR PROPERTIES *************\n"); + //printf("Humidity ratio of 50%% rel. hum. air at 300 K, 101.325 kPa: %f kg_w/kg_da\n", HAPropsSI('W', 'T', 300, 'P', 101.325, 'R', 0.5)); + //printf("Relative humidity from last calculation: %f (fractional)\n", HAPropsSI('R', 'T', 300, 'P', 101.325, 'W', HAPropsSI('W', 'T', 300, 'P', 101.325, 'R', 0.5))); + + return 0; + }