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 <[email protected]>
ibell · Dec 6, 2013 · aa5be70 · aa5be70
1 parent 4c5efbe
commit aa5be70
Show file tree

Hide file tree

Showing 17 changed files with 489 additions and 470 deletions.
diff --git a/CoolProp/HumidAirProp.cpp b/CoolProp/HumidAirProp.cpp
diff --git a/CoolProp/gitrevision.h b/CoolProp/gitrevision.h
@@ -1 +1 @@
-std::string gitrevision = "b'2c7ac1777e9c757b666ef69d3176e28a877219af'";
+std::string gitrevision = "4c5efbe7c47364771541575b5de18d28bcb4efa6";
diff --git 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
@@ -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()
+    BuildDocs()
+    UploadDocs()
diff --git a/Web/_templates/index.html b/Web/_templates/index.html
@@ -13,17 +13,17 @@ <h2> Languages/Environments Supported </h2>
 
   <ul>
   <li> C++, 
-  <a href="http://sourceforge.net/projects/coolprop/files/CoolProp/4.0.0beta/Python"> Python (2.x, 3.x) </a>, 
-  <a href="http://sourceforge.net/projects/coolprop/files/CoolProp/4.0.0beta/Modelica"> Modelica </a>, 
-  <a href="http://sourceforge.net/projects/coolprop/files/CoolProp/4.0.0beta/Labview"> Labview </a>, 
-  <a href="http://sourceforge.net/projects/coolprop/files/CoolProp/4.0.0beta/MATLAB"> MATLAB </a>, 
-  <a href="http://sourceforge.net/projects/coolprop/files/CoolProp/4.0.0beta/EES"> EES </a>, 
-  <a href="http://sourceforge.net/projects/coolprop/files/CoolProp/4.0.0beta/Octave"> Octave </a>, 
-  <a href="http://sourceforge.net/projects/coolprop/files/CoolProp/4.0.0beta/Excel and DLL"> Microsoft Excel </a>, 
-  <a href="http://sourceforge.net/projects/coolprop/files/CoolProp/4.0.0beta/C%23"> C# </a>,
-  <a href="http://sourceforge.net/projects/coolprop/files/CoolProp/4.0.0beta/MathCAD"> MathCAD </a>,
-  <a href="http://sourceforge.net/projects/coolprop/files/CoolProp/4.0.0beta/Java"> Java </a>,
-  <a href="http://sourceforge.net/projects/coolprop/files/CoolProp/4.0.0beta/Javascript"> Javascript </a>
+  <a href="http://sourceforge.net/projects/coolprop/files/CoolProp/4.0.0/Python"> Python (2.x, 3.x) </a>, 
+  <a href="http://sourceforge.net/projects/coolprop/files/CoolProp/4.0.0/Modelica"> Modelica </a>, 
+  <a href="http://sourceforge.net/projects/coolprop/files/CoolProp/4.0.0/Labview"> Labview </a>, 
+  <a href="http://sourceforge.net/projects/coolprop/files/CoolProp/4.0.0/MATLAB"> MATLAB </a>, 
+  <a href="http://sourceforge.net/projects/coolprop/files/CoolProp/4.0.0/EES"> EES </a>, 
+  <a href="http://sourceforge.net/projects/coolprop/files/CoolProp/4.0.0/Octave"> Octave </a>, 
+  <a href="http://sourceforge.net/projects/coolprop/files/CoolProp/4.0.0/Excel and DLL"> Microsoft Excel </a>, 
+  <a href="http://sourceforge.net/projects/coolprop/files/CoolProp/4.0.0/C%23"> C# </a>,
+  <a href="http://sourceforge.net/projects/coolprop/files/CoolProp/4.0.0/MathCAD"> MathCAD </a>,
+  <a href="http://sourceforge.net/projects/coolprop/files/CoolProp/4.0.0/Java"> Java </a>,
+  <a href="http://sourceforge.net/projects/coolprop/files/CoolProp/4.0.0/Javascript"> Javascript </a>
   </ul>
 
   <h2> Platforms supported </h2>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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