Release of v4.1

Signed-off-by: Ian Bell <[email protected]>

CoolProp/CoolProp.i

@@ -7,19 +7,16 @@
     %ignore DerivTerms(char *Term, double T, double rho, Fluid * pFluid, bool SinglePhase, bool TwoPhase);
 #endif
 
-#ifdef SWIGCSHARP
-    %ignore get_global_param_string(char *param, char * Output);
-    %ignore get_fluid_param_string(char *fluid, char *param, char * Output);
-#endif
-
 // This stuff will get included verbatim in CoolProp_wrap.cpp
 %{
+#include "CoolPropTools.h"
 #include "CoolProp.h"
 #include "CoolPropDLL.h"
 #include "GlobalConstants.h"
 #include "HumidAirProp.h"
 %}
 
+%include "CoolPropTools.h"
 %include "CoolPropDLL.h"
 %include "GlobalConstants.h"
 %include "HumidAirProp.h"

CoolProp/CoolPropDLL.h

@@ -1,7 +1,7 @@
 #ifndef COOLPROPDLL_H
 #define COOLPROPDLL_H
 
-#include "CoolPropTools.h"
+    #include "CoolPropTools.h"
 
 	// When using SWIG, it is extremely difficult to deal with char* for output strings, so just use 
 	// the std::string version since SWIG can handle std::string just fine
@@ -18,10 +18,10 @@
 	// will be exported to the DLL
 
 	// They can only use data types that play well with DLL wrapping (int, long, double, char*, void, etc.)
-	EXPORT_CODE double CONVENTION PropsS     (char *Output,char* Name1, double  Prop1, char *Name2, double  Prop2, char *Ref);
-	EXPORT_CODE double CONVENTION Props      (char *Output,char  Name1, double  Prop1, char  Name2, double  Prop2, char *Ref);
-	EXPORT_CODE double CONVENTION PropsSI    (char *Output,char *Name1, double  Prop1, char *Name2, double  Prop2, char *Ref);
-	EXPORT_CODE double CONVENTION Props1     (char *Ref, char *Output);
+	EXPORT_CODE double CONVENTION PropsS(char *Output,char *Name1, double  Prop1, char *Name2, double  Prop2, char *Ref);
+	EXPORT_CODE double CONVENTION Props(char *Output,char  Name1, double  Prop1, char  Name2, double  Prop2, char *Ref);
+	EXPORT_CODE double CONVENTION PropsSI(char *Output,char *Name1, double  Prop1, char *Name2, double  Prop2, char *Ref);
+	EXPORT_CODE double CONVENTION Props1(char *Ref, char *Output);
 
 	// This version uses the indices in place of the strings for speed.  Get the parameter indices
 	// from get_param_index('D') for instance and the Fluid index from get_Fluid_index('Air') for instance

CoolProp/gitrevision.h

@@ -1 +1 @@
-std::string gitrevision = "7299dc06720bd7b5a81f8099438083c465e1fe85";
+std::string gitrevision = "b'28b7fda1eda7b8f891a958caca687ee8ad053374'";

CoolProp/version.h

@@ -1 +1 @@
-static char version [] ="4.0.0";
+static char version [] ="4.1.0";

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.0
+PROJECT_NUMBER                                 = 4.1.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 

MakeDistro.py

@@ -111,12 +111,9 @@ def EES():
         os.makedirs(os.path.join('dist_temp','EES'))
     except os.error: pass
 
-    process = subprocess.Popen(['BuildLIB.bat'],shell=True,cwd=os.path.join('wrappers','EES'))
-    process.wait()
-    process = subprocess.Popen(['BuildDLF.bat'],shell=True,cwd=os.path.join('wrappers','EES'))
-    process.wait()
-    process = subprocess.Popen(['BuildMSI.bat'],shell=True,cwd=os.path.join('wrappers','EES'))
-    process.wait()
+    subprocess.check_output(['BuildDLL.bat'],shell=True,cwd=os.path.join('wrappers','EES'))
+    subprocess.check_output(['BuildDLF.bat'],shell=True,cwd=os.path.join('wrappers','EES'))
+    subprocess.check_output(['BuildMSI.bat'],shell=True,cwd=os.path.join('wrappers','EES'))
 
     shutil.copy2(os.path.join('wrappers','EES','Debug','CoolProp_EES_installer.msi'),os.path.join('dist_temp','EES','CoolProp_EES_installer.msi'))
     shutil.copy2(os.path.join('wrappers','EES','CoolProp.htm'),os.path.join('dist_temp','EES','CoolProp.htm'))
@@ -158,6 +155,42 @@ def Python():
     for python_install in PYTHONVERSIONS:
         print subprocess.check_output([python_install,'setup.py','bdist','--format=wininst','--dist-dir=../../dist_temp/Python'],shell=True,cwd=os.path.join('wrappers','Python'))
 
+def Maple():
+    try:
+        os.makedirs(os.path.join('dist_temp','Maple'))
+    except os.error: pass
+
+    process = subprocess.check_output(['BuildDLLx64.bat'],shell=True,cwd=os.path.join('wrappers','Maple'))
+
+    listing = ['Analysis of a Refrigeration Cycle with CoolProp.mw','sample_file.mw','CoolProp_x64.dll']
+
+    for file in listing:
+        shutil.copy2(os.path.join('wrappers','Maple',file),os.path.join('dist_temp','Maple',file))
+
+def Mathematica():
+    try:
+        os.makedirs(os.path.join('dist_temp','Mathematica'))
+    except os.error: pass
+
+    process = subprocess.check_output(['BuildDLL.bat'],shell=True,cwd=os.path.join('wrappers','Mathematica'))
+
+    listing = ['README.rst','example.nb','CoolProp.dll']
+
+    for file in listing:
+        shutil.copy2(os.path.join('wrappers','Mathematica',file),os.path.join('dist_temp','Mathematica',file))
+
+def Scilab():
+    try:
+        os.makedirs(os.path.join('dist_temp','Scilab'))
+    except os.error: pass
+
+    process = subprocess.check_output(['BuildDLL.bat'],shell=True,cwd=os.path.join('wrappers','Scilab'))
+
+    listing = ['README.rst','sample.sce','CoolProp_x64.dll','CoolProp.dll']
+
+    for file in listing:
+        shutil.copy2(os.path.join('wrappers','Scilab',file),os.path.join('dist_temp','Scilab',file))
+
 def MathCAD():
     try:
         os.makedirs(os.path.join('dist_temp','MathCAD','Prime'))
@@ -220,7 +253,7 @@ def BuildDocs():
     # Inject the revision number into the docs main pages for the link
     lines = open('Web/_templates/index.html','r').readlines()
     import CoolProp
-    languages = ['Python','Modelica','Labview','MATLAB','EES','Octave','Excel','C#','Java','Javascript','MathCAD']
+    languages = ['Python','Modelica','Labview','MATLAB','EES','Octave','Excel','C#','Java','Javascript','MathCAD','Maple','Mathematica','Scilab']
     for i in range(len(lines)):
         if (lines[i].find('http://sourceforge.net/projects/coolprop/files/CoolProp/') > -1
             and any([lines[i].find(a) > -1 for a in languages])
@@ -229,9 +262,9 @@ def BuildDocs():
             lines[i] = lines[i][:].replace(oldVersion,CoolProp.__version__)
     open('Web/_templates/index.html','w').write(''.join(lines))
 
+    print subprocess.check_output(['run_examples.bat'],shell=True,cwd='Web/examples')
     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():
@@ -250,17 +283,9 @@ def Superpacks():
     except WindowsError:
         pass
     shutil.copy2(os.path.join('dist_temp/CoolProp-'+CoolProp.__version__+'-source_code.zip'),os.path.join('dist_temp','windows_superpack','CoolProp-'+CoolProp.__version__+'-source_code.zip'))
-    shutil.copytree(os.path.join('dist_temp','Excel and DLL'), os.path.join('dist_temp','windows_superpack','Excel and DLL'))
-    shutil.copytree(os.path.join('dist_temp','Python'), os.path.join('dist_temp','windows_superpack','Python'))
-    shutil.copytree(os.path.join('dist_temp','C#'), os.path.join('dist_temp','windows_superpack','C#'))
-    shutil.copytree(os.path.join('dist_temp','Octave'), os.path.join('dist_temp','windows_superpack','Octave'))
-    shutil.copytree(os.path.join('dist_temp','MATLAB'), os.path.join('dist_temp','windows_superpack','MATLAB'))
-    shutil.copytree(os.path.join('dist_temp','EES'), os.path.join('dist_temp','windows_superpack','EES'))
-    shutil.copytree(os.path.join('dist_temp','Labview'), os.path.join('dist_temp','windows_superpack','Labview'))
-    shutil.copytree(os.path.join('dist_temp','Modelica'), os.path.join('dist_temp','windows_superpack','Modelica'))
-    shutil.copytree(os.path.join('dist_temp','Java'), os.path.join('dist_temp','windows_superpack','Java'))
-    shutil.copytree(os.path.join('dist_temp','Javascript'), os.path.join('dist_temp','windows_superpack','Javascript'))
-    shutil.copytree(os.path.join('dist_temp','MathCAD'), os.path.join('dist_temp','windows_superpack','MathCAD'))
+
+    for folder in ['Excel and DLL','Python','C#','Octave','MATLAB','EES','Labview','Modelica','Maple','Scilab','Mathematica','Java','Javascript','MathCAD']:
+        shutil.copytree(os.path.join('dist_temp',folder), os.path.join('dist_temp','windows_superpack',folder))
 
     subprocess.check_call(['7z','a','-r','dist_temp/CoolProp-'+CoolProp.__version__+'-windows_superpack.zip','dist_temp/windows_superpack/*.*'])
     shutil.rmtree(os.path.join('dist_temp','windows_superpack'))
@@ -275,6 +300,9 @@ def Superpacks():
 #     Csharp()
 #     Octave()
 #     MATLAB()
+#     Maple()
+#     Mathematica()
+#     Scilab()
 #     EES()
 #     Javascript()
 #     Java()

Web/examples/C++/Output.txt

@@ -1,5 +1,5 @@
 CoolProp version:	4.1.0
-CoolProp gitrevision:	d914c91d7d91606edb0c525bf287fc2e0a30b0a4
+CoolProp gitrevision:	b'28b7fda1eda7b8f891a958caca687ee8ad053374'
 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),R161,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,7 +20,10 @@ P,H -> T,D : 56.072763, 634.733626 -> 300.000000, 1.000000
 
 ************ USING TTSE ***************
 TWO PHASE INPUTS (Pressure)
-0.096 to build both two phase tables
+0.074 to build both two phase tables
+1.669 to build single phase table with p,h
+9.307 to build single phase table for T,rho
+write time: 0.07
 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
 

Web/examples/CSharp/Output.txt

@@ -1,5 +1,5 @@
 CoolProp version: 4.1.0
-CoolProp gitrevision: d914c91d7d91606edb0c525bf287fc2e0a30b0a4
+CoolProp gitrevision: b'28b7fda1eda7b8f891a958caca687ee8ad053374'
 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),R161,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.108 to build both two phase tables
-2.26 to build single phase table with p,h
-12.682 to build single phase table for T,rho
-write time: 0.073
+0.133 to build both two phase tables
+2.762 to build single phase table with p,h
+14.076 to build single phase table for T,rho
+write time: 0.093
 Density of saturated liquid Propane at 101.325 kPa: 580.882952265691 kg/m^3
 Density of saturated vapor R290 at 101.325 kPa: 2.41613600655147 kg/m^3
 TWO PHASE INPUTS (Temperature)

Web/examples/Java/Output.txt

@@ -1,5 +1,5 @@
 CoolProp version: 4.1.0
-CoolProp gitrevision: d914c91d7d91606edb0c525bf287fc2e0a30b0a4
+CoolProp gitrevision: b'28b7fda1eda7b8f891a958caca687ee8ad053374'
 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),R161,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.00000000000017,0.99999999
 ************ USING TTSE ***************
 
 TWO PHASE INPUTS (Pressure)
-0.084 to build both two phase tables
+0.178 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.41613600655147 kg/m^3
 TWO PHASE INPUTS (Temperature)

Web/examples/MATLAB/Output.txt

@@ -2,15 +2,8 @@
   To get started, type one of these: helpwin, helpdesk, or demo.
   For product information, visit www.mathworks.com.
 
-{Warning: Could not find an exact (case-sensitive) match for 'example'.
-C:\Users\Belli\Documents\Code\CoolProp\Web\examples\MATLAB\Example.m is a case-insensitive match and will be used instead.
-You can improve the performance of your code by using exact
-name matches and we therefore recommend that you update your
-usage accordingly. Alternatively, you can disable this warning using
-warning('off','MATLAB:dispatcher:InexactCaseMatch').
-This warning will become an error in future releases.} 
 CoolProp version: 4.1.0
-CoolProp gitrevision: d914c91d7d91606edb0c525bf287fc2e0a30b0a4
+CoolProp gitrevision: b'28b7fda1eda7b8f891a958caca687ee8ad053374'
 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),R161,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 *************

Web/examples/Octave/Output.txt

@@ -20,7 +20,7 @@ For information about changes from previous versions, type `news'.
  - Graphics backend: qt.
 
 CoolProp version: 4.1.0
-CoolProp gitrevision: d914c91d7d91606edb0c525bf287fc2e0a30b0a4
+CoolProp gitrevision: b'28b7fda1eda7b8f891a958caca687ee8ad053374'
 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),R161,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.061 to build both two phase tables
+0.071 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)

Web/examples/Python/Output.txt

@@ -19,7 +19,7 @@ P,H -> T,D 56.0727627483 , 634.733625928 --> 300.0 , 1.0
 ************ USING TTSE ***************
 
 TWO PHASE INPUTS (Pressure)
-0.056 to build both two phase tables
+0.055 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)

version.txt

@@ -1 +1 @@
-4.0.0
+4.1.0