From aa5be70f193f12056808e4abb620f261133fca6d Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Fri, 6 Dec 2013 16:52:25 -0500 Subject: [PATCH] Fixed bug with Humid air - new DerivTerms needs to be rethought/fixed to be able to handle temperatures below triple point Signed-off-by: Ian Bell --- CoolProp/HumidAirProp.cpp | 526 +++++++++++++++++---------------- CoolProp/gitrevision.h | 2 +- Doxyfile | 2 +- MakeDistro.py | 31 +- Web/_templates/index.html | 22 +- Web/examples/C++/Output.txt | 10 +- Web/examples/CSharp/Output.txt | 10 +- Web/examples/Java/Output.txt | 4 +- Web/examples/MATLAB/Output.txt | 2 +- Web/examples/Octave/Output.txt | 4 +- Web/examples/Python/Output.txt | 4 +- wrappers/C#/exports.txt | 2 +- wrappers/Excel/exports.txt | 2 +- wrappers/Excel/exports_x64.txt | 2 +- wrappers/Java/exports.txt | 116 ++++---- wrappers/Java/exports_x64.txt | 116 ++++---- wrappers/Labview/exports.txt | 104 +++---- 17 files changed, 489 insertions(+), 470 deletions(-) diff --git a/CoolProp/HumidAirProp.cpp b/CoolProp/HumidAirProp.cpp index 02c91981..b5be24ed 100644 --- a/CoolProp/HumidAirProp.cpp +++ b/CoolProp/HumidAirProp.cpp @@ -607,7 +607,8 @@ double IdealGasMolarEntropy_Water(double T, double p) R_bar = 8.314371; //[kJ/kmol/K] tau=Props((char *)"Water",(char *)"Tcrit")/T; rho = p/(R_bar/MM_Water()*T); //[kg/m^3] - sbar_w=R_bar*(tau*DerivTerms((char *)"dphi0_dTau",T,rho,(char *)"Water")-DerivTerms((char *)"phi0",T,rho,(char *)"Water")); //[kJ/kmol/K] + Fluid * pWater = get_fluid(get_Fluid_index((char *)"Water")); + sbar_w=R_bar*(tau*pWater->dphi0_dTau(tau,rho/pWater->reduce.rho)-pWater->phi0(tau,rho/pWater->reduce.rho)); //[kJ/kmol/K] return sbar_w; } double IdealGasMolarEnthalpy_Air(double T, double v_bar) @@ -1057,278 +1058,289 @@ double RelativeHumidity(double T, double p, double psi_w) } EXPORT_CODE double CONVENTION HAProps(char *OutputName, char *Input1Name, double Input1, char *Input2Name, double Input2, char *Input3Name, double Input3) { - int In1Type, In2Type, In3Type,iT,iW,iTdp,iRH,ip,Type1,Type2; - double vals[3],p,T,RH,W,Tdp,psi_w,M_ha,v_bar,h_bar,s_bar,MainInputValue,SecondaryInputValue,T_guess; - double Value1,Value2,W_guess; - char MainInputName[100], SecondaryInputName[100],Name1[100],Name2[100]; - - vals[0]=Input1; - vals[1]=Input2; - vals[2]=Input3; - - // First figure out what kind of inputs you have, convert names to Macro expansions - In1Type=Name2Type(Input1Name); - In2Type=Name2Type(Input2Name); - In3Type=Name2Type(Input3Name); - - // Pressure must be included - ip=TypeMatch(GIVEN_P,Input1Name,Input2Name,Input3Name); - if (ip>0) - p=vals[ip-1]; - else - return -1000; + try + { + int In1Type, In2Type, In3Type,iT,iW,iTdp,iRH,ip,Type1,Type2; + double vals[3],p,T,RH,W,Tdp,psi_w,M_ha,v_bar,h_bar,s_bar,MainInputValue,SecondaryInputValue,T_guess; + double Value1,Value2,W_guess; + char MainInputName[100], SecondaryInputName[100],Name1[100],Name2[100]; + + vals[0]=Input1; + vals[1]=Input2; + vals[2]=Input3; + + // First figure out what kind of inputs you have, convert names to Macro expansions + In1Type=Name2Type(Input1Name); + In2Type=Name2Type(Input2Name); + In3Type=Name2Type(Input3Name); + + // Pressure must be included + ip=TypeMatch(GIVEN_P,Input1Name,Input2Name,Input3Name); + if (ip>0) + p=vals[ip-1]; + else + return -1000; - // ----------------------------------------------------------------------------------------------------- - // Check whether the remaining values give explicit solution for mole fraction of water - nice and fast - // ----------------------------------------------------------------------------------------------------- - - // Find the codes if they are there - iT= TypeMatch(GIVEN_T,Input1Name,Input2Name,Input3Name); - iRH= TypeMatch(GIVEN_RH,Input1Name,Input2Name,Input3Name); - iW= TypeMatch(GIVEN_HUMRAT,Input1Name,Input2Name,Input3Name); - iTdp= TypeMatch(GIVEN_TDP,Input1Name,Input2Name,Input3Name); - - if (iT>0) // Found T (or alias) as an input - { - T=vals[iT-1]; - if (iRH>0) //Relative Humidity is provided - { - RH=vals[iRH-1]; - psi_w=MoleFractionWater(T,p,GIVEN_RH,RH); - } - else if (iW>0) - { - W=vals[iW-1]; - psi_w=MoleFractionWater(T,p,GIVEN_HUMRAT,W); - } - else if (iTdp>0) - { - Tdp=vals[iTdp-1]; - psi_w=MoleFractionWater(T,p,GIVEN_TDP,Tdp); - } - else - { - // Temperature and pressure are known, figure out which variable holds the other value - if (In1Type!=GIVEN_T && In1Type!=GIVEN_P) - { - strcpy(SecondaryInputName,Input1Name); - SecondaryInputValue=Input1; - } - else if (In2Type!=GIVEN_T && In2Type!=GIVEN_P) - { - strcpy(SecondaryInputName,Input2Name); - SecondaryInputValue=Input2; - } - else if (In3Type!=GIVEN_T && In3Type!=GIVEN_P) - { - strcpy(SecondaryInputName,Input3Name); - SecondaryInputValue=Input3; - } - else{ - return _HUGE; + // ----------------------------------------------------------------------------------------------------- + // Check whether the remaining values give explicit solution for mole fraction of water - nice and fast + // ----------------------------------------------------------------------------------------------------- + + // Find the codes if they are there + iT= TypeMatch(GIVEN_T,Input1Name,Input2Name,Input3Name); + iRH= TypeMatch(GIVEN_RH,Input1Name,Input2Name,Input3Name); + iW= TypeMatch(GIVEN_HUMRAT,Input1Name,Input2Name,Input3Name); + iTdp= TypeMatch(GIVEN_TDP,Input1Name,Input2Name,Input3Name); + + if (iT>0) // Found T (or alias) as an input + { + T=vals[iT-1]; + if (iRH>0) //Relative Humidity is provided + { + RH=vals[iRH-1]; + psi_w=MoleFractionWater(T,p,GIVEN_RH,RH); + } + else if (iW>0) + { + W=vals[iW-1]; + psi_w=MoleFractionWater(T,p,GIVEN_HUMRAT,W); + } + else if (iTdp>0) + { + Tdp=vals[iTdp-1]; + psi_w=MoleFractionWater(T,p,GIVEN_TDP,Tdp); + } + else + { + // Temperature and pressure are known, figure out which variable holds the other value + if (In1Type!=GIVEN_T && In1Type!=GIVEN_P) + { + strcpy(SecondaryInputName,Input1Name); + SecondaryInputValue=Input1; + } + else if (In2Type!=GIVEN_T && In2Type!=GIVEN_P) + { + strcpy(SecondaryInputName,Input2Name); + SecondaryInputValue=Input2; + } + else if (In3Type!=GIVEN_T && In3Type!=GIVEN_P) + { + strcpy(SecondaryInputName,Input3Name); + SecondaryInputValue=Input3; + } + else{ + return _HUGE; + } + // Find the value for W + W_guess=0.001; + W=Secant_HAProps_W(SecondaryInputName,(char *)"P",p,(char *)"T",T,SecondaryInputValue,W_guess); + // Mole fraction of water + psi_w=MoleFractionWater(T,p,GIVEN_HUMRAT,W); + // And on to output... } - // Find the value for W - W_guess=0.001; - W=Secant_HAProps_W(SecondaryInputName,(char *)"P",p,(char *)"T",T,SecondaryInputValue,W_guess); - // Mole fraction of water - psi_w=MoleFractionWater(T,p,GIVEN_HUMRAT,W); - // And on to output... - } - } - else - { - // Need to iterate to find dry bulb temperature since temperature is not provided - - // Pick one input, and alter T to match the other input - - // Get the variables and their values that are NOT pressure for simplicity - // because you know you need pressure as an input and you already have - // its value in variable p - if (ip==1) // Pressure is in slot 1 - { - strcpy(Name1,Input2Name); - Value1=Input2; - strcpy(Name2,Input3Name); - Value2=Input3; - } - else if (ip==2) // Pressure is in slot 2 - { - strcpy(Name1,Input1Name); - Value1=Input1; - strcpy(Name2,Input3Name); - Value2=Input3; - } - else if (ip==3) // Pressure is in slot 3 - { - strcpy(Name1,Input1Name); - Value1=Input1; - strcpy(Name2,Input2Name); - Value2=Input2; - } - else{ - return _HUGE; } - - // Get the integer type codes - Type1=Name2Type(Name1); - Type2=Name2Type(Name2); - - // First, if one of the inputs is something that can potentially yield - // an explicit solution at a given iteration of the solver, use it - if (Type1==GIVEN_RH || Type1==GIVEN_HUMRAT || Type1==GIVEN_TDP) - { - // First input variable is a "nice" one - - // MainInput is the one that you are using in the call to HAProps - MainInputValue=Value1; - strcpy(MainInputName,Name1); - // SecondaryInput is the one that you are trying to match - SecondaryInputValue=Value2; - strcpy(SecondaryInputName,Name2); - } - else if (Type2==GIVEN_RH || Type2==GIVEN_HUMRAT || Type2==GIVEN_TDP) - { - // Second input variable is a "nice" one - - // MainInput is the one that you are using in the call to HAProps - MainInputValue=Value2; - strcpy(MainInputName,Name2); - // SecondaryInput is the one that you are trying to match - SecondaryInputValue=Value1; - strcpy(SecondaryInputName,Name1); - } - else - { - printf("Sorry, but currently at least one of the variables as an input to HAProps() must be temperature, relative humidity, humidity ratio, or dewpoint\n Eventually will add a 2-D NR solver to find T and psi_w simultaneously, but not included now\n"); - return -1000; - } + else + { + // Need to iterate to find dry bulb temperature since temperature is not provided + + // Pick one input, and alter T to match the other input + + // Get the variables and their values that are NOT pressure for simplicity + // because you know you need pressure as an input and you already have + // its value in variable p + if (ip==1) // Pressure is in slot 1 + { + strcpy(Name1,Input2Name); + Value1=Input2; + strcpy(Name2,Input3Name); + Value2=Input3; + } + else if (ip==2) // Pressure is in slot 2 + { + strcpy(Name1,Input1Name); + Value1=Input1; + strcpy(Name2,Input3Name); + Value2=Input3; + } + else if (ip==3) // Pressure is in slot 3 + { + strcpy(Name1,Input1Name); + Value1=Input1; + strcpy(Name2,Input2Name); + Value2=Input2; + } + else{ + return _HUGE; + } + + // Get the integer type codes + Type1=Name2Type(Name1); + Type2=Name2Type(Name2); + + // First, if one of the inputs is something that can potentially yield + // an explicit solution at a given iteration of the solver, use it + if (Type1==GIVEN_RH || Type1==GIVEN_HUMRAT || Type1==GIVEN_TDP) + { + // First input variable is a "nice" one + + // MainInput is the one that you are using in the call to HAProps + MainInputValue=Value1; + strcpy(MainInputName,Name1); + // SecondaryInput is the one that you are trying to match + SecondaryInputValue=Value2; + strcpy(SecondaryInputName,Name2); + } + else if (Type2==GIVEN_RH || Type2==GIVEN_HUMRAT || Type2==GIVEN_TDP) + { + // Second input variable is a "nice" one + + // MainInput is the one that you are using in the call to HAProps + MainInputValue=Value2; + strcpy(MainInputName,Name2); + // SecondaryInput is the one that you are trying to match + SecondaryInputValue=Value1; + strcpy(SecondaryInputName,Name1); + } + else + { + printf("Sorry, but currently at least one of the variables as an input to HAProps() must be temperature, relative humidity, humidity ratio, or dewpoint\n Eventually will add a 2-D NR solver to find T and psi_w simultaneously, but not included now\n"); + return -1000; + } - double T_min = 210; - double T_max = 450; + double T_min = 210; + double T_max = 450; - T = -1; + T = -1; - // First try to use the secant solver to find T at a few different temperatures - for (T_guess = 210; T_guess < 450; T_guess += 60) - { - try{ - T = Secant_HAProps_T(SecondaryInputName,(char *)"P",p,MainInputName,MainInputValue,SecondaryInputValue,T_guess); - if (!ValidNumber(T) || !(T_min < T && T < T_max) || fabs(HAProps(SecondaryInputName,(char *)"T",T,(char *)"P",p,MainInputName,MainInputValue)-SecondaryInputValue)>1e-6) - { - throw ValueError(); - } - else - { - break; + // First try to use the secant solver to find T at a few different temperatures + for (T_guess = 210; T_guess < 450; T_guess += 60) + { + try{ + T = Secant_HAProps_T(SecondaryInputName,(char *)"P",p,MainInputName,MainInputValue,SecondaryInputValue,T_guess); + if (!ValidNumber(T) || !(T_min < T && T < T_max) || fabs(HAProps(SecondaryInputName,(char *)"T",T,(char *)"P",p,MainInputName,MainInputValue)-SecondaryInputValue)>1e-6) + { + throw ValueError(); + } + else + { + break; + } } + catch (std::exception &){}; + } + + if (T < 0) // No solution found using secant + { + // Use the Brent's method solver to find T + T = Brent_HAProps_T(SecondaryInputName,(char *)"P",p,MainInputName,MainInputValue,SecondaryInputValue,T_min,T_max); + } + + // If you want the temperature, return it + if (Name2Type(OutputName)==GIVEN_T) + return T; + else + { + // Otherwise, find psi_w for further calculations in the following section + W=HAProps((char *)"W",(char *)"T",T,(char *)"P",p,MainInputName,MainInputValue); + psi_w=MoleFractionWater(T,p,GIVEN_HUMRAT,W); } - catch (std::exception &){}; } - - if (T < 0) // No solution found using secant + + M_ha=(1-psi_w)*28.966+MM_Water()*psi_w; //[kg_ha/kmol_ha] + + // ----------------------------------------------------------------- + // Calculate and return the desired value for known set of T,p,psi_w + // ----------------------------------------------------------------- + if (!strcmp(OutputName,"Vda") || !strcmp(OutputName,"V")) { - // Use the Brent's method solver to find T - T = Brent_HAProps_T(SecondaryInputName,(char *)"P",p,MainInputName,MainInputValue,SecondaryInputValue,T_min,T_max); + v_bar=MolarVolume(T,p,psi_w); //[m^3/mol_ha] + W=HumidityRatio(psi_w); + return v_bar*(1+W)/M_ha*1000; //[m^3/kg_da] + } + else if (!strcmp(OutputName,"Vha")) + { + v_bar=MolarVolume(T,p,psi_w); //[m^3/mol_ha] + return v_bar/M_ha*1000; //[m^3/kg_ha] + } + else if (!strcmp(OutputName,"Y")) + { + return psi_w; //[mol_w/mol] + } + else if (!strcmp(OutputName,"Hda") || !strcmp(OutputName,"H")) + { + return MassEnthalpy(T,p,psi_w); + } + else if (!strcmp(OutputName,"Hha")) + { + v_bar=MolarVolume(T,p,psi_w); //[m^3/mol_ha] + h_bar=MolarEnthalpy(T,p,psi_w,v_bar); //[kJ/kmol_ha] + return h_bar/M_ha; //[kJ/kg_ha] + } + else if (!strcmp(OutputName,"S") || !strcmp(OutputName,"Entropy")) + { + v_bar=MolarVolume(T,p,psi_w); //[m^3/mol_ha] + s_bar=MolarEntropy(T,p,psi_w,v_bar); //[kJ/kmol_ha] + W=HumidityRatio(psi_w); //[kg_w/kg_da] + return s_bar*(1+W)/M_ha; //[kJ/kg_da] + } + else if (!strcmp(OutputName,"C") || !strcmp(OutputName,"cp")) + { + double v_bar1,v_bar2,h_bar1,h_bar2, cp_bar, dT = 1e-3; + v_bar1=MolarVolume(T-dT,p,psi_w); //[m^3/mol_ha] + h_bar1=MolarEnthalpy(T-dT,p,psi_w,v_bar1); //[kJ/kmol_ha] + v_bar2=MolarVolume(T+dT,p,psi_w); //[m^3/mol_ha] + h_bar2=MolarEnthalpy(T+dT,p,psi_w,v_bar2); //[kJ/kmol_ha] + W=HumidityRatio(psi_w); //[kg_w/kg_da] + cp_bar = (h_bar2-h_bar1)/(2*dT); + return cp_bar*(1+W)/M_ha; //[kJ/kg_da] + } + else if (!strcmp(OutputName,"Cha") || !strcmp(OutputName,"cp_ha")) + { + double v_bar1,v_bar2,h_bar1,h_bar2, cp_bar, dT = 1e-3; + v_bar1=MolarVolume(T-dT,p,psi_w); //[m^3/mol_ha] + h_bar1=MolarEnthalpy(T-dT,p,psi_w,v_bar1); //[kJ/kmol_ha] + v_bar2=MolarVolume(T+dT,p,psi_w); //[m^3/mol_ha] + h_bar2=MolarEnthalpy(T+dT,p,psi_w,v_bar2); //[kJ/kmol_ha] + W=HumidityRatio(psi_w); //[kg_w/kg_da] + cp_bar = (h_bar2-h_bar1)/(2*dT); + return cp_bar/M_ha; //[kJ/kg_da] + } + else if (!strcmp(OutputName,"Tdp") || !strcmp(OutputName,"D")) + { + return DewpointTemperature(T,p,psi_w); //[K] + } + else if (!strcmp(OutputName,"Twb") || !strcmp(OutputName,"T_wb") || !strcmp(OutputName,"WetBulb") || !strcmp(OutputName,"B")) + { + return WetbulbTemperature(T,p,psi_w); //[K] + } + else if (!strcmp(OutputName,"Omega") || !strcmp(OutputName,"HumRat") || !strcmp(OutputName,"W")) + { + return HumidityRatio(psi_w); + } + else if (!strcmp(OutputName,"RH") || !strcmp(OutputName,"RelHum") || !strcmp(OutputName,"R")) + { + return RelativeHumidity(T,p,psi_w); + } + else if (!strcmp(OutputName,"mu") || !strcmp(OutputName,"Visc") || !strcmp(OutputName,"M")) + { + return Viscosity(T,p,psi_w); + } + else if (!strcmp(OutputName,"k") || !strcmp(OutputName,"Conductivity") || !strcmp(OutputName,"K")) + { + return Conductivity(T,p,psi_w); + } + else + { + return -1000; } - - // If you want the temperature, return it - if (Name2Type(OutputName)==GIVEN_T) - return T; - else - { - // Otherwise, find psi_w for further calculations in the following section - W=HAProps((char *)"W",(char *)"T",T,(char *)"P",p,MainInputName,MainInputValue); - psi_w=MoleFractionWater(T,p,GIVEN_HUMRAT,W); - } - } - - M_ha=(1-psi_w)*28.966+MM_Water()*psi_w; //[kg_ha/kmol_ha] - - // ----------------------------------------------------------------- - // Calculate and return the desired value for known set of T,p,psi_w - // ----------------------------------------------------------------- - if (!strcmp(OutputName,"Vda") || !strcmp(OutputName,"V")) - { - v_bar=MolarVolume(T,p,psi_w); //[m^3/mol_ha] - W=HumidityRatio(psi_w); - return v_bar*(1+W)/M_ha*1000; //[m^3/kg_da] - } - else if (!strcmp(OutputName,"Vha")) - { - v_bar=MolarVolume(T,p,psi_w); //[m^3/mol_ha] - return v_bar/M_ha*1000; //[m^3/kg_ha] - } - else if (!strcmp(OutputName,"Y")) - { - return psi_w; //[mol_w/mol] - } - else if (!strcmp(OutputName,"Hda") || !strcmp(OutputName,"H")) - { - return MassEnthalpy(T,p,psi_w); - } - else if (!strcmp(OutputName,"Hha")) - { - v_bar=MolarVolume(T,p,psi_w); //[m^3/mol_ha] - h_bar=MolarEnthalpy(T,p,psi_w,v_bar); //[kJ/kmol_ha] - return h_bar/M_ha; //[kJ/kg_ha] - } - else if (!strcmp(OutputName,"S") || !strcmp(OutputName,"Entropy")) - { - v_bar=MolarVolume(T,p,psi_w); //[m^3/mol_ha] - s_bar=MolarEntropy(T,p,psi_w,v_bar); //[kJ/kmol_ha] - W=HumidityRatio(psi_w); //[kg_w/kg_da] - return s_bar*(1+W)/M_ha; //[kJ/kg_da] } - else if (!strcmp(OutputName,"C") || !strcmp(OutputName,"cp")) + catch (std::exception &e) { - double v_bar1,v_bar2,h_bar1,h_bar2, cp_bar, dT = 1e-3; - v_bar1=MolarVolume(T-dT,p,psi_w); //[m^3/mol_ha] - h_bar1=MolarEnthalpy(T-dT,p,psi_w,v_bar1); //[kJ/kmol_ha] - v_bar2=MolarVolume(T+dT,p,psi_w); //[m^3/mol_ha] - h_bar2=MolarEnthalpy(T+dT,p,psi_w,v_bar2); //[kJ/kmol_ha] - W=HumidityRatio(psi_w); //[kg_w/kg_da] - cp_bar = (h_bar2-h_bar1)/(2*dT); - return cp_bar*(1+W)/M_ha; //[kJ/kg_da] + double rr = 4; } - else if (!strcmp(OutputName,"Cha") || !strcmp(OutputName,"cp_ha")) + catch (...) { - double v_bar1,v_bar2,h_bar1,h_bar2, cp_bar, dT = 1e-3; - v_bar1=MolarVolume(T-dT,p,psi_w); //[m^3/mol_ha] - h_bar1=MolarEnthalpy(T-dT,p,psi_w,v_bar1); //[kJ/kmol_ha] - v_bar2=MolarVolume(T+dT,p,psi_w); //[m^3/mol_ha] - h_bar2=MolarEnthalpy(T+dT,p,psi_w,v_bar2); //[kJ/kmol_ha] - W=HumidityRatio(psi_w); //[kg_w/kg_da] - cp_bar = (h_bar2-h_bar1)/(2*dT); - return cp_bar/M_ha; //[kJ/kg_da] + return _HUGE; } - else if (!strcmp(OutputName,"Tdp") || !strcmp(OutputName,"D")) - { - return DewpointTemperature(T,p,psi_w); //[K] - } - else if (!strcmp(OutputName,"Twb") || !strcmp(OutputName,"T_wb") || !strcmp(OutputName,"WetBulb") || !strcmp(OutputName,"B")) - { - return WetbulbTemperature(T,p,psi_w); //[K] - } - else if (!strcmp(OutputName,"Omega") || !strcmp(OutputName,"HumRat") || !strcmp(OutputName,"W")) - { - return HumidityRatio(psi_w); - } - else if (!strcmp(OutputName,"RH") || !strcmp(OutputName,"RelHum") || !strcmp(OutputName,"R")) - { - return RelativeHumidity(T,p,psi_w); - } - else if (!strcmp(OutputName,"mu") || !strcmp(OutputName,"Visc") || !strcmp(OutputName,"M")) - { - return Viscosity(T,p,psi_w); - } - else if (!strcmp(OutputName,"k") || !strcmp(OutputName,"Conductivity") || !strcmp(OutputName,"K")) - { - return Conductivity(T,p,psi_w); - } - else - { - return -1000; - } } EXPORT_CODE double CONVENTION HAProps_Aux(char* Name,double T, double p, double W, char *units) diff --git a/CoolProp/gitrevision.h b/CoolProp/gitrevision.h index 26526df5..bed20cb4 100644 --- a/CoolProp/gitrevision.h +++ b/CoolProp/gitrevision.h @@ -1 +1 @@ -std::string gitrevision = "b'2c7ac1777e9c757b666ef69d3176e28a877219af'"; \ No newline at end of file +std::string gitrevision = "4c5efbe7c47364771541575b5de18d28bcb4efa6"; \ No newline at end of file diff --git a/Doxyfile b/Doxyfile index 14492906..3b21f5a3 100644 --- a/Doxyfile +++ b/Doxyfile @@ -32,7 +32,7 @@ PROJECT_NAME = CoolProp # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 4.0.0beta +PROJECT_NUMBER = 4.0.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer diff --git a/MakeDistro.py b/MakeDistro.py index 55e35ec4..f9e5f11b 100644 --- a/MakeDistro.py +++ b/MakeDistro.py @@ -231,6 +231,7 @@ def BuildDocs(): print subprocess.check_output(['doxygen','Doxyfile'],shell=True) shutil.rmtree(os.path.join('Web','_build'),ignore_errors = True) + print subprocess.check_output(['run_examples.bat'],shell=True,cwd='Web/examples') print subprocess.check_output(['BuildCPDocs.bat'],shell=True,cwd='Web') def UploadDocs(): @@ -268,21 +269,21 @@ def Superpacks(): # InstallPrereqs() #This is optional if you think any of the pre-reqs have been updated - DLL_and_Excel() - Source() - Python() - Csharp() - Octave() - MATLAB() - EES() - Javascript() - Java() - MathCAD() - Labview() - Modelica() - Superpacks() +# DLL_and_Excel() +# Source() +# Python() +# Csharp() +# Octave() +# MATLAB() +# EES() +# Javascript() +# Java() +# MathCAD() +# Labview() +# Modelica() +# Superpacks() # PYPI() # UploadSourceForge() -# BuildDocs() -# UploadDocs() \ No newline at end of file + BuildDocs() + UploadDocs() \ No newline at end of file diff --git a/Web/_templates/index.html b/Web/_templates/index.html index fb50ca9e..963be917 100644 --- a/Web/_templates/index.html +++ b/Web/_templates/index.html @@ -13,17 +13,17 @@

Languages/Environments Supported

Platforms supported

diff --git a/Web/examples/C++/Output.txt b/Web/examples/C++/Output.txt index 70d2c8a3..779596b2 100644 --- a/Web/examples/C++/Output.txt +++ b/Web/examples/C++/Output.txt @@ -1,5 +1,5 @@ CoolProp version: 4.0.0 -CoolProp gitrevision: 9a179be2c74c667c262dd578b4f43ec569398cb4 +CoolProp gitrevision: b'4c5efbe7c47364771541575b5de18d28bcb4efa6' CoolProp fluids: Water,R134a,Helium,Oxygen,Hydrogen,ParaHydrogen,OrthoHydrogen,Argon,CarbonDioxide,Nitrogen,n-Propane,Ammonia,R1234yf,R1234ze(E),R32,R22,SES36,Ethylene,SulfurHexafluoride,Ethanol,DimethylEther,DimethylCarbonate,R143a,R23,n-Dodecane,Propylene,Cyclopentane,R236FA,R236EA,R227EA,R365MFC,R161,HFE143m,Benzene,n-Undecane,R125,CycloPropane,Neon,R124,Propyne,Fluorine,Methanol,RC318,R21,R114,R13,R14,R12,R113,R1234ze(Z),R1233zd(E),R245fa,R41,CarbonMonoxide,CarbonylSulfide,n-Decane,HydrogenSulfide,Isopentane,Neopentane,Isohexane,Krypton,n-Nonane,Toluene,Xenon,R116,Acetone,NitrousOxide,SulfurDioxide,R141b,R142b,R218,Methane,Ethane,n-Butane,IsoButane,n-Pentane,n-Hexane,n-Heptane,n-Octane,CycloHexane,R152A,R123,R11,MDM,MD2M,MD3M,D6,MM,MD4M,D4,D5,1-Butene,IsoButene,cis-2-Butene,trans-2-Butene,MethylPalmitate,MethylStearate,MethylOleate,MethylLinoleate,MethylLinolenate,o-Xylene,m-Xylene,p-Xylene,EthylBenzene,Deuterium,ParaDeuterium,OrthoDeuterium,Air,R404A,R410A,R407C,R507A,R407F ************ USING EOS ************* @@ -20,10 +20,10 @@ P,H -> T,D : 56.072763, 634.733626 -> 300.000000, 1.000000 ************ USING TTSE *************** TWO PHASE INPUTS (Pressure) -0.073 to build both two phase tables -1.395 to build single phase table with p,h -6.772 to build single phase table for T,rho -write time: 0.038 +0.123 to build both two phase tables +2.145 to build single phase table with p,h +10.289 to build single phase table for T,rho +write time: 0.048 Density of saturated liquid Propane at 101.325 kPa: 580.882952 kg/m^3 Density of saturated vapor R290 at 101.325 kPa: 2.416136 kg/m^3 diff --git a/Web/examples/CSharp/Output.txt b/Web/examples/CSharp/Output.txt index fabe515d..dc062da5 100644 --- a/Web/examples/CSharp/Output.txt +++ b/Web/examples/CSharp/Output.txt @@ -1,5 +1,5 @@ CoolProp version: 4.0.0 -CoolProp gitrevision: 9a179be2c74c667c262dd578b4f43ec569398cb4 +CoolProp gitrevision: b'4c5efbe7c47364771541575b5de18d28bcb4efa6' CoolProp fluids: Water,R134a,Helium,Oxygen,Hydrogen,ParaHydrogen,OrthoHydrogen,Argon,CarbonDioxide,Nitrogen,n-Propane,Ammonia,R1234yf,R1234ze(E),R32,R22,SES36,Ethylene,SulfurHexafluoride,Ethanol,DimethylEther,DimethylCarbonate,R143a,R23,n-Dodecane,Propylene,Cyclopentane,R236FA,R236EA,R227EA,R365MFC,R161,HFE143m,Benzene,n-Undecane,R125,CycloPropane,Neon,R124,Propyne,Fluorine,Methanol,RC318,R21,R114,R13,R14,R12,R113,R1234ze(Z),R1233zd(E),R245fa,R41,CarbonMonoxide,CarbonylSulfide,n-Decane,HydrogenSulfide,Isopentane,Neopentane,Isohexane,Krypton,n-Nonane,Toluene,Xenon,R116,Acetone,NitrousOxide,SulfurDioxide,R141b,R142b,R218,Methane,Ethane,n-Butane,IsoButane,n-Pentane,n-Hexane,n-Heptane,n-Octane,CycloHexane,R152A,R123,R11,MDM,MD2M,MD3M,D6,MM,MD4M,D4,D5,1-Butene,IsoButene,cis-2-Butene,trans-2-Butene,MethylPalmitate,MethylStearate,MethylOleate,MethylLinoleate,MethylLinolenate,o-Xylene,m-Xylene,p-Xylene,EthylBenzene,Deuterium,ParaDeuterium,OrthoDeuterium,Air,R404A,R410A,R407C,R507A,R407F ************ USING EOS ************* @@ -19,10 +19,10 @@ P,H -> T,D 56.0727627482929,634.733625928477 --> 300,0.999999999999999 ************ USING TTSE *************** TWO PHASE INPUTS (Pressure) -0.11 to build both two phase tables -2.345 to build single phase table with p,h -10.869 to build single phase table for T,rho -write time: 0.035 +0.189 to build both two phase tables +2.908 to build single phase table with p,h +13.388 to build single phase table for T,rho +write time: 0.045 Density of saturated liquid Propane at 101.325 kPa: 580.882952265691 kg/m^3 Density of saturated vapor R290 at 101.325 kPa: 2.41613600655146 kg/m^3 TWO PHASE INPUTS (Temperature) diff --git a/Web/examples/Java/Output.txt b/Web/examples/Java/Output.txt index 9ab532fa..f2911bea 100644 --- a/Web/examples/Java/Output.txt +++ b/Web/examples/Java/Output.txt @@ -1,5 +1,5 @@ CoolProp version: 4.0.0 -CoolProp gitrevision: 9a179be2c74c667c262dd578b4f43ec569398cb4 +CoolProp gitrevision: b'4c5efbe7c47364771541575b5de18d28bcb4efa6' CoolProp fluids: Water,R134a,Helium,Oxygen,Hydrogen,ParaHydrogen,OrthoHydrogen,Argon,CarbonDioxide,Nitrogen,n-Propane,Ammonia,R1234yf,R1234ze(E),R32,R22,SES36,Ethylene,SulfurHexafluoride,Ethanol,DimethylEther,DimethylCarbonate,R143a,R23,n-Dodecane,Propylene,Cyclopentane,R236FA,R236EA,R227EA,R365MFC,R161,HFE143m,Benzene,n-Undecane,R125,CycloPropane,Neon,R124,Propyne,Fluorine,Methanol,RC318,R21,R114,R13,R14,R12,R113,R1234ze(Z),R1233zd(E),R245fa,R41,CarbonMonoxide,CarbonylSulfide,n-Decane,HydrogenSulfide,Isopentane,Neopentane,Isohexane,Krypton,n-Nonane,Toluene,Xenon,R116,Acetone,NitrousOxide,SulfurDioxide,R141b,R142b,R218,Methane,Ethane,n-Butane,IsoButane,n-Pentane,n-Hexane,n-Heptane,n-Octane,CycloHexane,R152A,R123,R11,MDM,MD2M,MD3M,D6,MM,MD4M,D4,D5,1-Butene,IsoButene,cis-2-Butene,trans-2-Butene,MethylPalmitate,MethylStearate,MethylOleate,MethylLinoleate,MethylLinolenate,o-Xylene,m-Xylene,p-Xylene,EthylBenzene,Deuterium,ParaDeuterium,OrthoDeuterium,Air,R404A,R410A,R407C,R507A,R407F ************ USING EOS ************* @@ -19,7 +19,7 @@ P,H -> T,D 56.07276274829289,634.7336259284773 --> 300.0000000000003,0.999999999 ************ USING TTSE *************** TWO PHASE INPUTS (Pressure) -0.086 to build both two phase tables +0.102 to build both two phase tables Density of saturated liquid Propane at 101.325 kPa: 580.8829522656912 kg/m^3 Density of saturated vapor R290 at 101.325 kPa: 2.416136006551463 kg/m^3 TWO PHASE INPUTS (Temperature) diff --git a/Web/examples/MATLAB/Output.txt b/Web/examples/MATLAB/Output.txt index 239a2303..63e6641f 100644 --- a/Web/examples/MATLAB/Output.txt +++ b/Web/examples/MATLAB/Output.txt @@ -3,7 +3,7 @@ For product information, visit www.mathworks.com. CoolProp version: 4.0.0 -CoolProp gitrevision: 9a179be2c74c667c262dd578b4f43ec569398cb4 +CoolProp gitrevision: b'4c5efbe7c47364771541575b5de18d28bcb4efa6' CoolProp fluids: Water,R134a,Helium,Oxygen,Hydrogen,ParaHydrogen,OrthoHydrogen,Argon,CarbonDioxide,Nitrogen,n-Propane,Ammonia,R1234yf,R1234ze(E),R32,R22,SES36,Ethylene,SulfurHexafluoride,Ethanol,DimethylEther,DimethylCarbonate,R143a,R23,n-Dodecane,Propylene,Cyclopentane,R236FA,R236EA,R227EA,R365MFC,R161,HFE143m,Benzene,n-Undecane,R125,CycloPropane,Neon,R124,Propyne,Fluorine,Methanol,RC318,R21,R114,R13,R14,R12,R113,R1234ze(Z),R1233zd(E),R245fa,R41,CarbonMonoxide,CarbonylSulfide,n-Decane,HydrogenSulfide,Isopentane,Neopentane,Isohexane,Krypton,n-Nonane,Toluene,Xenon,R116,Acetone,NitrousOxide,SulfurDioxide,R141b,R142b,R218,Methane,Ethane,n-Butane,IsoButane,n-Pentane,n-Hexane,n-Heptane,n-Octane,CycloHexane,R152A,R123,R11,MDM,MD2M,MD3M,D6,MM,MD4M,D4,D5,1-Butene,IsoButene,cis-2-Butene,trans-2-Butene,MethylPalmitate,MethylStearate,MethylOleate,MethylLinoleate,MethylLinolenate,o-Xylene,m-Xylene,p-Xylene,EthylBenzene,Deuterium,ParaDeuterium,OrthoDeuterium,Air,R404A,R410A,R407C,R507A,R407F ************ USING EOS ************* diff --git a/Web/examples/Octave/Output.txt b/Web/examples/Octave/Output.txt index 628114e2..51eb1aaf 100644 --- a/Web/examples/Octave/Output.txt +++ b/Web/examples/Octave/Output.txt @@ -20,7 +20,7 @@ For information about changes from previous versions, type `news'. - Graphics backend: qt. CoolProp version: 4.0.0 -CoolProp gitrevision: 9a179be2c74c667c262dd578b4f43ec569398cb4 +CoolProp gitrevision: b'4c5efbe7c47364771541575b5de18d28bcb4efa6' CoolProp fluids: Water,R134a,Helium,Oxygen,Hydrogen,ParaHydrogen,OrthoHydrogen,Argon,CarbonDioxide,Nitrogen,n-Propane,Ammonia,R1234yf,R1234ze(E),R32,R22,SES36,Ethylene,SulfurHexafluoride,Ethanol,DimethylEther,DimethylCarbonate,R143a,R23,n-Dodecane,Propylene,Cyclopentane,R236FA,R236EA,R227EA,R365MFC,R161,HFE143m,Benzene,n-Undecane,R125,CycloPropane,Neon,R124,Propyne,Fluorine,Methanol,RC318,R21,R114,R13,R14,R12,R113,R1234ze(Z),R1233zd(E),R245fa,R41,CarbonMonoxide,CarbonylSulfide,n-Decane,HydrogenSulfide,Isopentane,Neopentane,Isohexane,Krypton,n-Nonane,Toluene,Xenon,R116,Acetone,NitrousOxide,SulfurDioxide,R141b,R142b,R218,Methane,Ethane,n-Butane,IsoButane,n-Pentane,n-Hexane,n-Heptane,n-Octane,CycloHexane,R152A,R123,R11,MDM,MD2M,MD3M,D6,MM,MD4M,D4,D5,1-Butene,IsoButene,cis-2-Butene,trans-2-Butene,MethylPalmitate,MethylStearate,MethylOleate,MethylLinoleate,MethylLinolenate,o-Xylene,m-Xylene,p-Xylene,EthylBenzene,Deuterium,ParaDeuterium,OrthoDeuterium,Air,R404A,R410A,R407C,R507A,R407F ************ USING EOS ************* @@ -40,7 +40,7 @@ P,H -> T,D56.073,634.73-->300,1 ************ USING TTSE *************** TWO PHASE INPUTS (Pressure) -0.071 to build both two phase tables +0.114 to build both two phase tables Density of saturated liquid Propane at 101.325 kPa: 580.88 kg/m^3 Density of saturated vapor R290 at 101.325 kPa: 2.4161 kg/m^3 TWO PHASE INPUTS (Temperature) diff --git a/Web/examples/Python/Output.txt b/Web/examples/Python/Output.txt index 39c66cb7..d53859a5 100644 --- a/Web/examples/Python/Output.txt +++ b/Web/examples/Python/Output.txt @@ -1,5 +1,5 @@ CoolProp version: 4.0.0 -CoolProp gitrevision: bc5a7955a09b8fadce017ffc30d30da6d8f4f0b1 +CoolProp gitrevision: 4c5efbe7c47364771541575b5de18d28bcb4efa6 CoolProp fluids: ['Water', 'R134a', 'Helium', 'Oxygen', 'Hydrogen', 'ParaHydrogen', 'OrthoHydrogen', 'Argon', 'CarbonDioxide', 'Nitrogen', 'n-Propane', 'Ammonia', 'R1234yf', 'R1234ze(E)', 'R32', 'R22', 'SES36', 'Ethylene', 'SulfurHexafluoride', 'Ethanol', 'DimethylEther', 'DimethylCarbonate', 'R143a', 'R23', 'n-Dodecane', 'Propylene', 'Cyclopentane', 'R236FA', 'R236EA', 'R227EA', 'R365MFC', 'R161', 'HFE143m', 'Benzene', 'n-Undecane', 'R125', 'CycloPropane', 'Neon', 'R124', 'Propyne', 'Fluorine', 'Methanol', 'RC318', 'R21', 'R114', 'R13', 'R14', 'R12', 'R113', 'R1234ze(Z)', 'R1233zd(E)', 'R245fa', 'R41', 'CarbonMonoxide', 'CarbonylSulfide', 'n-Decane', 'HydrogenSulfide', 'Isopentane', 'Neopentane', 'Isohexane', 'Krypton', 'n-Nonane', 'Toluene', 'Xenon', 'R116', 'Acetone', 'NitrousOxide', 'SulfurDioxide', 'R141b', 'R142b', 'R218', 'Methane', 'Ethane', 'n-Butane', 'IsoButane', 'n-Pentane', 'n-Hexane', 'n-Heptane', 'n-Octane', 'CycloHexane', 'R152A', 'R123', 'R11', 'MDM', 'MD2M', 'MD3M', 'D6', 'MM', 'MD4M', 'D4', 'D5', '1-Butene', 'IsoButene', 'cis-2-Butene', 'trans-2-Butene', 'MethylPalmitate', 'MethylStearate', 'MethylOleate', 'MethylLinoleate', 'MethylLinolenate', 'o-Xylene', 'm-Xylene', 'p-Xylene', 'EthylBenzene', 'Deuterium', 'ParaDeuterium', 'OrthoDeuterium', 'Air', 'R404A', 'R410A', 'R407C', 'R507A', 'R407F'] ************ USING EOS ************* @@ -19,7 +19,7 @@ P,H -> T,D 56.0727627483 , 634.733625928 --> 300.0 , 1.0 ************ USING TTSE *************** TWO PHASE INPUTS (Pressure) -0.065 to build both two phase tables +0.086 to build both two phase tables Density of saturated liquid Propane at 101.325 kPa: 580.882952266 kg/m^3 Density of saturated vapor R290 at 101.325 kPa: 2.41613600655 kg/m^3 TWO PHASE INPUTS (Temperature) diff --git a/wrappers/C#/exports.txt b/wrappers/C#/exports.txt index 776a2983..dfffdc41 100644 --- a/wrappers/C#/exports.txt +++ b/wrappers/C#/exports.txt @@ -9,7 +9,7 @@ File Type: DLL Section contains the following exports for CoolProp.dll 00000000 characteristics - 52A22A98 time date stamp Fri Dec 06 14:50:48 2013 + 52A22DAD time date stamp Fri Dec 06 15:03:57 2013 0.00 version 1 ordinal base 55 number of functions diff --git a/wrappers/Excel/exports.txt b/wrappers/Excel/exports.txt index 1d431e86..33d06c4d 100644 --- a/wrappers/Excel/exports.txt +++ b/wrappers/Excel/exports.txt @@ -9,7 +9,7 @@ File Type: DLL Section contains the following exports for CoolProp.dll 00000000 characteristics - 52A22963 time date stamp Fri Dec 06 14:45:39 2013 + 52A22CB4 time date stamp Fri Dec 06 14:59:48 2013 0.00 version 1 ordinal base 46 number of functions diff --git a/wrappers/Excel/exports_x64.txt b/wrappers/Excel/exports_x64.txt index d9dbca6e..b53f6231 100644 --- a/wrappers/Excel/exports_x64.txt +++ b/wrappers/Excel/exports_x64.txt @@ -9,7 +9,7 @@ File Type: DLL Section contains the following exports for CoolProp_x64.dll 00000000 characteristics - 52A2296D time date stamp Fri Dec 06 14:45:49 2013 + 52A22CBE time date stamp Fri Dec 06 14:59:58 2013 0.00 version 1 ordinal base 46 number of functions diff --git a/wrappers/Java/exports.txt b/wrappers/Java/exports.txt index c297c707..fd1746ac 100644 --- a/wrappers/Java/exports.txt +++ b/wrappers/Java/exports.txt @@ -9,68 +9,70 @@ File Type: DLL Section contains the following exports for CoolProp.dll 00000000 characteristics - 5277637E time date stamp Mon Nov 04 10:06:06 2013 + 52A22F00 time date stamp Fri Dec 06 15:09:36 2013 0.00 version 1 ordinal base - 50 number of functions - 50 number of names + 52 number of functions + 52 number of names ordinal hint RVA name - 1 0 0008FEA0 _Java_CoolPropJNI_DerivTerms@32 - 2 1 00090280 _Java_CoolPropJNI_F2K@16 - 3 2 000914A0 _Java_CoolPropJNI_HAHelp@8 - 4 3 00091130 _Java_CoolPropJNI_HAProps@48 - 5 4 000912C0 _Java_CoolPropJNI_HAProps_1Aux@40 - 6 5 0008FD70 _Java_CoolPropJNI_IProps@40 - 7 6 000913B0 _Java_CoolPropJNI_IceProps@28 - 8 7 0008FDE0 _Java_CoolPropJNI_IsFluidType@16 - 9 8 000902C0 _Java_CoolPropJNI_K2F@16 - 10 9 0008FF80 _Java_CoolPropJNI_Phase@32 - 11 A 00090140 _Java_CoolPropJNI_Phase_1Tp@32 - 12 B 00090060 _Java_CoolPropJNI_Phase_1Trho@32 - 13 C 0008FCB0 _Java_CoolPropJNI_Props1@16 - 14 D 0008FBC0 _Java_CoolPropJNI_Props@40 - 15 E 0008FA40 _Java_CoolPropJNI_PropsS@40 - 16 F 00091480 _Java_CoolPropJNI_UseIdealGasEnthalpyCorrelations@12 - 17 10 00091460 _Java_CoolPropJNI_UseIsothermCompressCorrelation@12 - 18 11 00091440 _Java_CoolPropJNI_UseVirialCorrelations@12 - 19 12 00091520 _Java_CoolPropJNI_cair_1sat@16 - 20 13 00090FA0 _Java_CoolPropJNI_conductivity_1background@28 - 21 14 00090F10 _Java_CoolPropJNI_conductivity_1critical@28 - 22 15 00091030 _Java_CoolPropJNI_conformal_1Trho@48 - 23 16 00090740 _Java_CoolPropJNI_disable_1TTSE_1LUT@12 - 24 17 00090890 _Java_CoolPropJNI_disable_1TTSE_1LUT_1writing@12 - 25 18 00090660 _Java_CoolPropJNI_enable_1TTSE_1LUT@12 - 26 19 000907B0 _Java_CoolPropJNI_enable_1TTSE_1LUT_1writing@12 - 27 1A 00090370 _Java_CoolPropJNI_get_1Fluid_1index@12 - 28 1B 00090AC0 _Java_CoolPropJNI_get_1TTSESinglePhase_1LUT_1range@44 - 29 1C 0008F830 _Java_CoolPropJNI_get_1fluid_1param_1string@16 - 30 1D 0008F6B0 _Java_CoolPropJNI_get_1global_1param_1string@12 - 31 1E 000903E0 _Java_CoolPropJNI_get_1index_1units@16 - 32 1F 00090300 _Java_CoolPropJNI_get_1param_1index@12 - 33 20 00090DB0 _Java_CoolPropJNI_get_1standard_1unit_1system@8 - 34 21 000906D0 _Java_CoolPropJNI_isenabled_1TTSE_1LUT@12 - 35 22 00090820 _Java_CoolPropJNI_isenabled_1TTSE_1LUT_1writing@12 - 36 23 00090560 _Java_CoolPropJNI_psatL_1anc@20 - 37 24 000905E0 _Java_CoolPropJNI_psatV_1anc@20 - 38 25 000914B0 _Java_CoolPropJNI_returnHumAirCode@12 - 39 26 00090460 _Java_CoolPropJNI_rhosatL_1anc@20 - 40 27 000904E0 _Java_CoolPropJNI_rhosatV_1anc@20 - 41 28 00090900 _Java_CoolPropJNI_set_1TTSESat_1LUT_1size@16 - 42 29 00090A10 _Java_CoolPropJNI_set_1TTSESinglePhase_1LUT_1range@44 - 43 2A 00090980 _Java_CoolPropJNI_set_1TTSESinglePhase_1LUT_1size@20 - 44 2B 00090B80 _Java_CoolPropJNI_set_1TTSE_1mode@16 - 45 2C 00090220 _Java_CoolPropJNI_set_1phase@12 - 46 2D 00090D00 _Java_CoolPropJNI_set_1reference_1stateD@44 - 47 2E 00090C40 _Java_CoolPropJNI_set_1reference_1stateS@16 - 48 2F 00090DE0 _Java_CoolPropJNI_set_1standard_1unit_1system@12 - 49 30 00090E00 _Java_CoolPropJNI_viscosity_1dilute@20 - 50 31 00090E80 _Java_CoolPropJNI_viscosity_1residual@28 + 1 0 0008FA20 _Java_CoolPropJNI_DerivTerms@32 + 2 1 0008FE00 _Java_CoolPropJNI_F2K@16 + 3 2 000911C0 _Java_CoolPropJNI_HAHelp@8 + 4 3 00090E50 _Java_CoolPropJNI_HAProps@48 + 5 4 00090FE0 _Java_CoolPropJNI_HAProps_1Aux@40 + 6 5 0008F8F0 _Java_CoolPropJNI_IProps@40 + 7 6 000910D0 _Java_CoolPropJNI_IceProps@28 + 8 7 0008F960 _Java_CoolPropJNI_IsFluidType@16 + 9 8 0008FE40 _Java_CoolPropJNI_K2F@16 + 10 9 0008FB00 _Java_CoolPropJNI_Phase@32 + 11 A 0008FCC0 _Java_CoolPropJNI_Phase_1Tp@32 + 12 B 0008FBE0 _Java_CoolPropJNI_Phase_1Trho@32 + 13 C 0008F830 _Java_CoolPropJNI_Props1@16 + 14 D 0008F740 _Java_CoolPropJNI_Props@40 + 15 E 0008F5C0 _Java_CoolPropJNI_PropsS@40 + 16 F 000911A0 _Java_CoolPropJNI_UseIdealGasEnthalpyCorrelations@12 + 17 10 00091180 _Java_CoolPropJNI_UseIsothermCompressCorrelation@12 + 18 11 00091160 _Java_CoolPropJNI_UseVirialCorrelations@12 + 19 12 00091240 _Java_CoolPropJNI_cair_1sat@16 + 20 13 00090CC0 _Java_CoolPropJNI_conductivity_1background@28 + 21 14 00090C30 _Java_CoolPropJNI_conductivity_1critical@28 + 22 15 00090D50 _Java_CoolPropJNI_conformal_1Trho@48 + 23 16 00090460 _Java_CoolPropJNI_disable_1TTSE_1LUT@12 + 24 17 000905B0 _Java_CoolPropJNI_disable_1TTSE_1LUT_1writing@12 + 25 18 00090380 _Java_CoolPropJNI_enable_1TTSE_1LUT@12 + 26 19 000904D0 _Java_CoolPropJNI_enable_1TTSE_1LUT_1writing@12 + 27 1A 0008FE80 _Java_CoolPropJNI_fromSI@24 + 28 1B 00090090 _Java_CoolPropJNI_get_1Fluid_1index@12 + 29 1C 000907E0 _Java_CoolPropJNI_get_1TTSESinglePhase_1LUT_1range@44 + 30 1D 0008F3B0 _Java_CoolPropJNI_get_1fluid_1param_1string@16 + 31 1E 0008F230 _Java_CoolPropJNI_get_1global_1param_1string@12 + 32 1F 00090100 _Java_CoolPropJNI_get_1index_1units@16 + 33 20 00090020 _Java_CoolPropJNI_get_1param_1index@12 + 34 21 00090AD0 _Java_CoolPropJNI_get_1standard_1unit_1system@8 + 35 22 000903F0 _Java_CoolPropJNI_isenabled_1TTSE_1LUT@12 + 36 23 00090540 _Java_CoolPropJNI_isenabled_1TTSE_1LUT_1writing@12 + 37 24 00090280 _Java_CoolPropJNI_psatL_1anc@20 + 38 25 00090300 _Java_CoolPropJNI_psatV_1anc@20 + 39 26 000911D0 _Java_CoolPropJNI_returnHumAirCode@12 + 40 27 00090180 _Java_CoolPropJNI_rhosatL_1anc@20 + 41 28 00090200 _Java_CoolPropJNI_rhosatV_1anc@20 + 42 29 00090620 _Java_CoolPropJNI_set_1TTSESat_1LUT_1size@16 + 43 2A 00090730 _Java_CoolPropJNI_set_1TTSESinglePhase_1LUT_1range@44 + 44 2B 000906A0 _Java_CoolPropJNI_set_1TTSESinglePhase_1LUT_1size@20 + 45 2C 000908A0 _Java_CoolPropJNI_set_1TTSE_1mode@16 + 46 2D 0008FDA0 _Java_CoolPropJNI_set_1phase@12 + 47 2E 00090A20 _Java_CoolPropJNI_set_1reference_1stateD@44 + 48 2F 00090960 _Java_CoolPropJNI_set_1reference_1stateS@16 + 49 30 00090B00 _Java_CoolPropJNI_set_1standard_1unit_1system@12 + 50 31 0008FF50 _Java_CoolPropJNI_toSI@24 + 51 32 00090B20 _Java_CoolPropJNI_viscosity_1dilute@20 + 52 33 00090BA0 _Java_CoolPropJNI_viscosity_1residual@28 Summary - C000 .data - 61000 .rdata - 17000 .reloc - 14F000 .text + 1D000 .data + 7E000 .rdata + 1D000 .reloc + 17D000 .text diff --git a/wrappers/Java/exports_x64.txt b/wrappers/Java/exports_x64.txt index e19125fd..8b1655ec 100644 --- a/wrappers/Java/exports_x64.txt +++ b/wrappers/Java/exports_x64.txt @@ -9,71 +9,73 @@ File Type: DLL Section contains the following exports for CoolProp.dll 00000000 characteristics - 52776391 time date stamp Mon Nov 04 10:06:25 2013 + 52A22F0F time date stamp Fri Dec 06 15:09:51 2013 0.00 version 1 ordinal base - 50 number of functions - 50 number of names + 52 number of functions + 52 number of names ordinal hint RVA name - 1 0 000C8DA0 Java_CoolPropJNI_DerivTerms - 2 1 000C92F0 Java_CoolPropJNI_F2K - 3 2 000CADF0 Java_CoolPropJNI_HAHelp - 4 3 000CA880 Java_CoolPropJNI_HAProps - 5 4 000CAB00 Java_CoolPropJNI_HAProps_1Aux - 6 5 000C8BE0 Java_CoolPropJNI_IProps - 7 6 000CAC80 Java_CoolPropJNI_IceProps - 8 7 000C8CA0 Java_CoolPropJNI_IsFluidType - 9 8 000C9350 Java_CoolPropJNI_K2F - 10 9 000C8EE0 Java_CoolPropJNI_Phase - 11 A 000C9140 Java_CoolPropJNI_Phase_1Tp - 12 B 000C9010 Java_CoolPropJNI_Phase_1Trho - 13 C 000C8940 Java_CoolPropJNI_Props - 14 D 000C8AD0 Java_CoolPropJNI_Props1 - 15 E 000C86F0 Java_CoolPropJNI_PropsS - 16 F 000CADC0 Java_CoolPropJNI_UseIdealGasEnthalpyCorrelations - 17 10 000CAD90 Java_CoolPropJNI_UseIsothermCompressCorrelation - 18 11 000CAD60 Java_CoolPropJNI_UseVirialCorrelations - 19 12 000CAEB0 Java_CoolPropJNI_cair_1sat - 20 13 000CA600 Java_CoolPropJNI_conductivity_1background - 21 14 000CA520 Java_CoolPropJNI_conductivity_1critical - 22 15 000CA6E0 Java_CoolPropJNI_conformal_1Trho - 23 16 000C99E0 Java_CoolPropJNI_disable_1TTSE_1LUT - 24 17 000C9BC0 Java_CoolPropJNI_disable_1TTSE_1LUT_1writing - 25 18 000C98A0 Java_CoolPropJNI_enable_1TTSE_1LUT - 26 19 000C9A80 Java_CoolPropJNI_enable_1TTSE_1LUT_1writing - 27 1A 000C9450 Java_CoolPropJNI_get_1Fluid_1index - 28 1B 000C9EE0 Java_CoolPropJNI_get_1TTSESinglePhase_1LUT_1range - 29 1C 000C83A0 Java_CoolPropJNI_get_1fluid_1param_1string - 30 1D 000C8130 Java_CoolPropJNI_get_1global_1param_1string - 31 1E 000C94F0 Java_CoolPropJNI_get_1index_1units - 32 1F 000C93B0 Java_CoolPropJNI_get_1param_1index - 33 20 000CA310 Java_CoolPropJNI_get_1standard_1unit_1system - 34 21 000C9940 Java_CoolPropJNI_isenabled_1TTSE_1LUT - 35 22 000C9B20 Java_CoolPropJNI_isenabled_1TTSE_1LUT_1writing - 36 23 000C9720 Java_CoolPropJNI_psatL_1anc - 37 24 000C97E0 Java_CoolPropJNI_psatV_1anc - 38 25 000CAE10 Java_CoolPropJNI_returnHumAirCode - 39 26 000C95A0 Java_CoolPropJNI_rhosatL_1anc - 40 27 000C9660 Java_CoolPropJNI_rhosatV_1anc - 41 28 000C9C60 Java_CoolPropJNI_set_1TTSESat_1LUT_1size - 42 29 000C9DD0 Java_CoolPropJNI_set_1TTSESinglePhase_1LUT_1range - 43 2A 000C9D10 Java_CoolPropJNI_set_1TTSESinglePhase_1LUT_1size - 44 2B 000CA000 Java_CoolPropJNI_set_1TTSE_1mode - 45 2C 000C9270 Java_CoolPropJNI_set_1phase - 46 2D 000CA200 Java_CoolPropJNI_set_1reference_1stateD - 47 2E 000CA100 Java_CoolPropJNI_set_1reference_1stateS - 48 2F 000CA350 Java_CoolPropJNI_set_1standard_1unit_1system - 49 30 000CA380 Java_CoolPropJNI_viscosity_1dilute - 50 31 000CA440 Java_CoolPropJNI_viscosity_1residual + 1 0 000C9590 Java_CoolPropJNI_DerivTerms + 2 1 000C9AE0 Java_CoolPropJNI_F2K + 3 2 000CB840 Java_CoolPropJNI_HAHelp + 4 3 000CB2D0 Java_CoolPropJNI_HAProps + 5 4 000CB550 Java_CoolPropJNI_HAProps_1Aux + 6 5 000C93D0 Java_CoolPropJNI_IProps + 7 6 000CB6D0 Java_CoolPropJNI_IceProps + 8 7 000C9490 Java_CoolPropJNI_IsFluidType + 9 8 000C9B40 Java_CoolPropJNI_K2F + 10 9 000C96D0 Java_CoolPropJNI_Phase + 11 A 000C9930 Java_CoolPropJNI_Phase_1Tp + 12 B 000C9800 Java_CoolPropJNI_Phase_1Trho + 13 C 000C9130 Java_CoolPropJNI_Props + 14 D 000C92C0 Java_CoolPropJNI_Props1 + 15 E 000C8EE0 Java_CoolPropJNI_PropsS + 16 F 000CB810 Java_CoolPropJNI_UseIdealGasEnthalpyCorrelations + 17 10 000CB7E0 Java_CoolPropJNI_UseIsothermCompressCorrelation + 18 11 000CB7B0 Java_CoolPropJNI_UseVirialCorrelations + 19 12 000CB900 Java_CoolPropJNI_cair_1sat + 20 13 000CB050 Java_CoolPropJNI_conductivity_1background + 21 14 000CAF70 Java_CoolPropJNI_conductivity_1critical + 22 15 000CB130 Java_CoolPropJNI_conformal_1Trho + 23 16 000CA430 Java_CoolPropJNI_disable_1TTSE_1LUT + 24 17 000CA610 Java_CoolPropJNI_disable_1TTSE_1LUT_1writing + 25 18 000CA2F0 Java_CoolPropJNI_enable_1TTSE_1LUT + 26 19 000CA4D0 Java_CoolPropJNI_enable_1TTSE_1LUT_1writing + 27 1A 000C9BA0 Java_CoolPropJNI_fromSI + 28 1B 000C9EA0 Java_CoolPropJNI_get_1Fluid_1index + 29 1C 000CA930 Java_CoolPropJNI_get_1TTSESinglePhase_1LUT_1range + 30 1D 000C8B90 Java_CoolPropJNI_get_1fluid_1param_1string + 31 1E 000C8920 Java_CoolPropJNI_get_1global_1param_1string + 32 1F 000C9F40 Java_CoolPropJNI_get_1index_1units + 33 20 000C9E00 Java_CoolPropJNI_get_1param_1index + 34 21 000CAD60 Java_CoolPropJNI_get_1standard_1unit_1system + 35 22 000CA390 Java_CoolPropJNI_isenabled_1TTSE_1LUT + 36 23 000CA570 Java_CoolPropJNI_isenabled_1TTSE_1LUT_1writing + 37 24 000CA170 Java_CoolPropJNI_psatL_1anc + 38 25 000CA230 Java_CoolPropJNI_psatV_1anc + 39 26 000CB860 Java_CoolPropJNI_returnHumAirCode + 40 27 000C9FF0 Java_CoolPropJNI_rhosatL_1anc + 41 28 000CA0B0 Java_CoolPropJNI_rhosatV_1anc + 42 29 000CA6B0 Java_CoolPropJNI_set_1TTSESat_1LUT_1size + 43 2A 000CA820 Java_CoolPropJNI_set_1TTSESinglePhase_1LUT_1range + 44 2B 000CA760 Java_CoolPropJNI_set_1TTSESinglePhase_1LUT_1size + 45 2C 000CAA50 Java_CoolPropJNI_set_1TTSE_1mode + 46 2D 000C9A60 Java_CoolPropJNI_set_1phase + 47 2E 000CAC50 Java_CoolPropJNI_set_1reference_1stateD + 48 2F 000CAB50 Java_CoolPropJNI_set_1reference_1stateS + 49 30 000CADA0 Java_CoolPropJNI_set_1standard_1unit_1system + 50 31 000C9CD0 Java_CoolPropJNI_toSI + 51 32 000CADD0 Java_CoolPropJNI_viscosity_1dilute + 52 33 000CAE90 Java_CoolPropJNI_viscosity_1residual Summary - E000 .data - 16000 .pdata - 84000 .rdata + 27000 .data + 1F000 .pdata + AB000 .rdata 6000 .reloc - 1D4000 .text + 215000 .text 5000 data 2000 text diff --git a/wrappers/Labview/exports.txt b/wrappers/Labview/exports.txt index 7f174427..96c22a31 100644 --- a/wrappers/Labview/exports.txt +++ b/wrappers/Labview/exports.txt @@ -9,62 +9,64 @@ File Type: DLL Section contains the following exports for CoolProp.dll 00000000 characteristics - 527763B3 time date stamp Mon Nov 04 10:06:59 2013 + 52A22F3D time date stamp Fri Dec 06 15:10:37 2013 0.00 version 1 ordinal base - 44 number of functions - 44 number of names + 46 number of functions + 46 number of names ordinal hint RVA name - 1 0 0006BED0 DerivTerms = _DerivTerms - 2 1 0006BA80 F2K = _F2K - 3 2 000ABEE0 HAProps = _HAProps - 4 3 000ACEE0 HAProps_Aux = _HAProps_Aux - 5 4 00065830 IProps = _IProps - 6 5 000637B0 IsFluidType = _IsFluidType - 7 6 0006BA60 K2F = _K2F - 8 7 0006CDD0 Phase = _Phase_Tp - 9 8 0006CDD0 Phase_Tp = _Phase_Tp - 10 9 0006CE70 Phase_Trho = _Phase_Trho - 11 A 0006BAA0 PrintSaturationTable = _PrintSaturationTable - 12 B 0006B8E0 Props = _Props - 13 C 0006B980 Props1 = _Props1 - 14 D 0006B8A0 PropsS = _PropsS - 15 E 0006C900 conductivity_background = _conductivity_background - 16 F 0006C870 conductivity_critical = _conductivity_critical - 17 10 0006C520 conformal_Trho = _conformal_Trho - 18 11 0006D010 disable_TTSE_LUT = _disable_TTSE_LUT - 19 12 0006D120 disable_TTSE_LUT_writing = _disable_TTSE_LUT_writing - 20 13 0006CF60 enable_TTSE_LUT = _enable_TTSE_LUT - 21 14 0006D070 enable_TTSE_LUT_writing = _enable_TTSE_LUT_writing - 22 15 0006BF40 get_Fluid_index = _get_Fluid_index - 23 16 0006D2C0 get_TTSESinglePhase_LUT_range = _get_TTSESinglePhase_LUT_range - 24 17 0006CD20 get_fluid_param_string = _get_fluid_param_string - 25 18 0006CC90 get_global_param_string = _get_global_param_string - 26 19 0006BF90 get_index_units = _get_index_units - 27 1A 0006C4D0 get_param_index = _get_param_index - 28 1B 0006D3C0 get_standard_unit_system = _get_standard_unit_system - 29 1C 0006CFC0 isenabled_TTSE_LUT = _isenabled_TTSE_LUT - 30 1D 0006D0D0 isenabled_TTSE_LUT_writing = _isenabled_TTSE_LUT_writing - 31 1E 0006CAF0 psatL_anc = _psatL_anc - 32 1F 0006CBC0 psatV_anc = _psatV_anc - 33 20 0006C970 rhosatL_anc = _rhosatL_anc - 34 21 0006CA30 rhosatV_anc = _rhosatV_anc - 35 22 0006D180 set_TTSESat_LUT_size = _set_TTSESat_LUT_size - 36 23 0006D240 set_TTSESinglePhase_LUT_range = _set_TTSESinglePhase_LUT_range - 37 24 0006D1E0 set_TTSESinglePhase_LUT_size = _set_TTSESinglePhase_LUT_size - 38 25 0006C000 set_TTSE_mode = _set_TTSE_mode - 39 26 0006CF10 set_phase = _set_phase - 40 27 0006B830 set_reference_stateD = _set_reference_stateD - 41 28 0006B7B0 set_reference_stateS = _set_reference_stateS - 42 29 0006D3D0 set_standard_unit_system = _set_standard_unit_system - 43 2A 0006C710 viscosity_dilute = _viscosity_dilute - 44 2B 0006C7B0 viscosity_residual = _viscosity_residual + 1 0 0006BF60 DerivTerms = _DerivTerms + 2 1 0006BB10 F2K = _F2K + 3 2 000AD1C0 HAProps = _HAProps + 4 3 000AE1B0 HAProps_Aux = _HAProps_Aux + 5 4 00065DC0 IProps = _IProps + 6 5 00063E60 IsFluidType = _IsFluidType + 7 6 0006BAF0 K2F = _K2F + 8 7 0006CEC0 Phase = _Phase_Tp + 9 8 0006CEC0 Phase_Tp = _Phase_Tp + 10 9 0006CF60 Phase_Trho = _Phase_Trho + 11 A 0006BB30 PrintSaturationTable = _PrintSaturationTable + 12 B 0006B9D0 Props = _Props + 13 C 0006BA70 Props1 = _Props1 + 14 D 0006B990 PropsS = _PropsS + 15 E 0006C9F0 conductivity_background = _conductivity_background + 16 F 0006C960 conductivity_critical = _conductivity_critical + 17 10 0006C610 conformal_Trho = _conformal_Trho + 18 11 0006D100 disable_TTSE_LUT = _disable_TTSE_LUT + 19 12 0006D210 disable_TTSE_LUT_writing = _disable_TTSE_LUT_writing + 20 13 0006D050 enable_TTSE_LUT = _enable_TTSE_LUT + 21 14 0006D160 enable_TTSE_LUT_writing = _enable_TTSE_LUT_writing + 22 15 0006BFF0 fromSI = _fromSI + 23 16 0006C050 get_Fluid_index = _get_Fluid_index + 24 17 0006D3B0 get_TTSESinglePhase_LUT_range = _get_TTSESinglePhase_LUT_range + 25 18 0006CE10 get_fluid_param_string = _get_fluid_param_string + 26 19 0006CD80 get_global_param_string = _get_global_param_string + 27 1A 0006C0A0 get_index_units = _get_index_units + 28 1B 0006C5C0 get_param_index = _get_param_index + 29 1C 0006D4B0 get_standard_unit_system = _get_standard_unit_system + 30 1D 0006D0B0 isenabled_TTSE_LUT = _isenabled_TTSE_LUT + 31 1E 0006D1C0 isenabled_TTSE_LUT_writing = _isenabled_TTSE_LUT_writing + 32 1F 0006CBE0 psatL_anc = _psatL_anc + 33 20 0006CCB0 psatV_anc = _psatV_anc + 34 21 0006CA60 rhosatL_anc = _rhosatL_anc + 35 22 0006CB20 rhosatV_anc = _rhosatV_anc + 36 23 0006D270 set_TTSESat_LUT_size = _set_TTSESat_LUT_size + 37 24 0006D330 set_TTSESinglePhase_LUT_range = _set_TTSESinglePhase_LUT_range + 38 25 0006D2D0 set_TTSESinglePhase_LUT_size = _set_TTSESinglePhase_LUT_size + 39 26 0006C100 set_TTSE_mode = _set_TTSE_mode + 40 27 0006D000 set_phase = _set_phase + 41 28 0006B920 set_reference_stateD = _set_reference_stateD + 42 29 0006B8A0 set_reference_stateS = _set_reference_stateS + 43 2A 0006D4C0 set_standard_unit_system = _set_standard_unit_system + 44 2B 0006C020 toSI = _toSI + 45 2C 0006C800 viscosity_dilute = _viscosity_dilute + 46 2D 0006C8A0 viscosity_residual = _viscosity_residual Summary - C000 .data - 53000 .rdata - 15000 .reloc - 10B000 .text + 1D000 .data + 61000 .rdata + 1B000 .reloc + 124000 .text