diff --git a/CoolProp/gitrevision.h b/CoolProp/gitrevision.h index 5fff86b5..26526df5 100644 --- a/CoolProp/gitrevision.h +++ b/CoolProp/gitrevision.h @@ -1 +1 @@ -std::string gitrevision = "9a179be2c74c667c262dd578b4f43ec569398cb4"; \ No newline at end of file +std::string gitrevision = "b'2c7ac1777e9c757b666ef69d3176e28a877219af'"; \ No newline at end of file diff --git a/MakeDistro.py b/MakeDistro.py index 2bab1f5d..55e35ec4 100644 --- a/MakeDistro.py +++ b/MakeDistro.py @@ -160,15 +160,20 @@ def Python(): def MathCAD(): try: - os.makedirs(os.path.join('dist_temp','MathCAD')) + os.makedirs(os.path.join('dist_temp','MathCAD','Prime')) except os.error: pass process = subprocess.check_output(['BuildDLL.bat'],shell=True,cwd=os.path.join('wrappers','MathCAD')) + process = subprocess.check_output(['BuildDLL.bat'],shell=True,cwd=os.path.join('wrappers','MathCAD','Prime')) shutil.copy2(os.path.join('wrappers','MathCAD','CoolPropMathcadWrapper.dll'),os.path.join('dist_temp','MathCAD','CoolPropMathcadWrapper.dll')) shutil.copy2(os.path.join('wrappers','MathCAD','CoolPropFluidProperties.xmcd'),os.path.join('dist_temp','MathCAD','CoolPropFluidProperties.xmcd')) shutil.copy2(os.path.join('wrappers','MathCAD','README.rst'),os.path.join('dist_temp','MathCAD','README.rst')) + shutil.copy2(os.path.join('wrappers','MathCAD','Prime','CoolPropMathcadWrapper.dll'),os.path.join('dist_temp','MathCAD','Prime','CoolPropMathcadWrapper.dll')) + shutil.copy2(os.path.join('wrappers','MathCAD','Prime','CoolPropFluidProperties.mcdx'),os.path.join('dist_temp','MathCAD','Prime','CoolPropFluidProperties.xmcd')) + shutil.copy2(os.path.join('wrappers','MathCAD','Prime','README.rst'),os.path.join('dist_temp','MathCAD','Prime','README.rst')) + def Modelica(): try: os.makedirs(os.path.join('dist_temp','Modelica')) @@ -263,21 +268,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/changelog.rst b/Web/changelog.rst index a9ce074d..8ccccc25 100644 --- a/Web/changelog.rst +++ b/Web/changelog.rst @@ -8,7 +8,7 @@ Changelog for CoolProp * MAJOR: Internally all units are SI, functions should do the necessary conversions using conversion_factor() and get/set_standard_unit_system() * MAJOR: Brines and incompressible liquids are added to CoolPropStateClass * MAJOR: Preparing to phase out of DerivTerms function, Props now handles derivatives as well. -* Wrappers added for Java, Javascript, MathCAD +* Wrappers added for Java, Javascript, MathCAD, MathCAD Prime * Improved wrapper for Labview (Thanks to the Sergei and guys at UGent) * Improved plotting in Python (Thanks Logan) * Improved Modelica wrapper and added incompressible fluids with p,T and p,h as state variables diff --git a/wrappers/C#/BuildCsharpDLL.bat b/wrappers/C#/BuildCsharpDLL.bat index 7675ab8b..54fa752a 100644 --- a/wrappers/C#/BuildCsharpDLL.bat +++ b/wrappers/C#/BuildCsharpDLL.bat @@ -8,7 +8,7 @@ swig.exe -csharp -dllimport "CoolProp" -c++ -outcurrentdir ../../CoolProp/CoolPr cl /c /I../../CoolProp /EHsc CoolProp_wrap.cxx REM ~ REM ******* compile all the sources *************** -cl /c /I../../CoolProp /EHsc ../../CoolProp/*.cpp +cl /c /MP4 /I../../CoolProp /EHsc ../../CoolProp/*.cpp link /DLL CoolProp_wrap.obj *.obj /OUT:CoolProp.dll dumpbin /EXPORTS CoolProp.dll > exports.txt erase *.obj diff --git a/wrappers/C#/exports.txt b/wrappers/C#/exports.txt index b4d6e1b7..776a2983 100644 --- a/wrappers/C#/exports.txt +++ b/wrappers/C#/exports.txt @@ -9,21 +9,21 @@ File Type: DLL Section contains the following exports for CoolProp.dll 00000000 characteristics - 5277615B time date stamp Mon Nov 04 09:56:59 2013 + 52A22A98 time date stamp Fri Dec 06 14:50:48 2013 0.00 version 1 ordinal base - 53 number of functions - 53 number of names + 55 number of functions + 55 number of names ordinal hint RVA name 1 0 00001520 _CSharp_DerivTerms@24 2 1 000016D0 _CSharp_F2K@8 - 3 2 000020C0 _CSharp_HAHelp@0 - 4 3 00001F00 _CSharp_HAProps@40 - 5 4 00001FA0 _CSharp_HAProps_Aux@32 + 3 2 00002180 _CSharp_HAHelp@0 + 4 3 00001FC0 _CSharp_HAProps@40 + 5 4 00002060 _CSharp_HAProps_Aux@32 6 5 00001460 _CSharp_IProps@32 - 7 6 00002010 _CSharp_IceProps@20 + 7 6 000020D0 _CSharp_IceProps@20 8 7 000014D0 _CSharp_IsFluidType@8 9 8 00001700 _CSharp_K2F@8 10 9 00001580 _CSharp_Phase@24 @@ -32,48 +32,50 @@ File Type: DLL 13 C 00001410 _CSharp_Props1@8 14 D 00001390 _CSharp_Props@32 15 E 00001300 _CSharp_PropsS@32 - 16 F 000020A0 _CSharp_UseIdealGasEnthalpyCorrelations@4 - 17 10 00002080 _CSharp_UseIsothermCompressCorrelation@4 - 18 11 00002060 _CSharp_UseVirialCorrelations@4 - 19 12 00002110 _CSharp_cair_sat@8 - 20 13 00001E20 _CSharp_conductivity_background@20 - 21 14 00001DD0 _CSharp_conductivity_critical@20 - 22 15 00001E70 _CSharp_conformal_Trho@32 - 23 16 00001970 _CSharp_disable_TTSE_LUT@4 - 24 17 00001A30 _CSharp_disable_TTSE_LUT_writing@4 - 25 18 000018F0 _CSharp_enable_TTSE_LUT@4 - 26 19 000019B0 _CSharp_enable_TTSE_LUT_writing@4 - 27 1A 00001770 _CSharp_get_Fluid_index@4 - 28 1B 00001B70 _CSharp_get_TTSESinglePhase_LUT_range@20 - 29 1C 000011B0 _CSharp_get_fluid_param_string@8 - 30 1D 000010B0 _CSharp_get_global_param_string@4 - 31 1E 000017B0 _CSharp_get_index_units@8 - 32 1F 00001730 _CSharp_get_param_index@4 - 33 20 00001D00 _CSharp_get_standard_unit_system@0 - 34 21 00001930 _CSharp_isenabled_TTSE_LUT@4 - 35 22 000019F0 _CSharp_isenabled_TTSE_LUT_writing@4 - 36 23 00001870 _CSharp_psatL_anc@12 - 37 24 000018B0 _CSharp_psatV_anc@12 - 38 25 000020D0 _CSharp_returnHumAirCode@4 - 39 26 000017F0 _CSharp_rhosatL_anc@12 - 40 27 00001830 _CSharp_rhosatV_anc@12 - 41 28 00001A70 _CSharp_set_TTSESat_LUT_size@8 - 42 29 00001B00 _CSharp_set_TTSESinglePhase_LUT_range@36 - 43 2A 00001AB0 _CSharp_set_TTSESinglePhase_LUT_size@12 - 44 2B 00001BF0 _CSharp_set_TTSE_mode@8 - 45 2C 000016A0 _CSharp_set_phase@4 - 46 2D 00001C90 _CSharp_set_reference_stateD@36 - 47 2E 00001C40 _CSharp_set_reference_stateS@8 - 48 2F 00001D20 _CSharp_set_standard_unit_system@4 - 49 30 00001D40 _CSharp_viscosity_dilute@12 - 50 31 00001D80 _CSharp_viscosity_residual@20 - 51 32 00001070 _SWIGRegisterExceptionArgumentCallbacks_CoolProp@12 - 52 33 00001000 _SWIGRegisterExceptionCallbacks_CoolProp@44 - 53 34 000010A0 _SWIGRegisterStringCallback_CoolProp@4 + 16 F 00002160 _CSharp_UseIdealGasEnthalpyCorrelations@4 + 17 10 00002140 _CSharp_UseIsothermCompressCorrelation@4 + 18 11 00002120 _CSharp_UseVirialCorrelations@4 + 19 12 000021D0 _CSharp_cair_sat@8 + 20 13 00001EE0 _CSharp_conductivity_background@20 + 21 14 00001E90 _CSharp_conductivity_critical@20 + 22 15 00001F30 _CSharp_conformal_Trho@32 + 23 16 00001A30 _CSharp_disable_TTSE_LUT@4 + 24 17 00001AF0 _CSharp_disable_TTSE_LUT_writing@4 + 25 18 000019B0 _CSharp_enable_TTSE_LUT@4 + 26 19 00001A70 _CSharp_enable_TTSE_LUT_writing@4 + 27 1A 00001730 _CSharp_fromSI@16 + 28 1B 00001830 _CSharp_get_Fluid_index@4 + 29 1C 00001C30 _CSharp_get_TTSESinglePhase_LUT_range@20 + 30 1D 000011B0 _CSharp_get_fluid_param_string@8 + 31 1E 000010B0 _CSharp_get_global_param_string@4 + 32 1F 00001870 _CSharp_get_index_units@8 + 33 20 000017F0 _CSharp_get_param_index@4 + 34 21 00001DC0 _CSharp_get_standard_unit_system@0 + 35 22 000019F0 _CSharp_isenabled_TTSE_LUT@4 + 36 23 00001AB0 _CSharp_isenabled_TTSE_LUT_writing@4 + 37 24 00001930 _CSharp_psatL_anc@12 + 38 25 00001970 _CSharp_psatV_anc@12 + 39 26 00002190 _CSharp_returnHumAirCode@4 + 40 27 000018B0 _CSharp_rhosatL_anc@12 + 41 28 000018F0 _CSharp_rhosatV_anc@12 + 42 29 00001B30 _CSharp_set_TTSESat_LUT_size@8 + 43 2A 00001BC0 _CSharp_set_TTSESinglePhase_LUT_range@36 + 44 2B 00001B70 _CSharp_set_TTSESinglePhase_LUT_size@12 + 45 2C 00001CB0 _CSharp_set_TTSE_mode@8 + 46 2D 000016A0 _CSharp_set_phase@4 + 47 2E 00001D50 _CSharp_set_reference_stateD@36 + 48 2F 00001D00 _CSharp_set_reference_stateS@8 + 49 30 00001DE0 _CSharp_set_standard_unit_system@4 + 50 31 00001790 _CSharp_toSI@16 + 51 32 00001E00 _CSharp_viscosity_dilute@12 + 52 33 00001E40 _CSharp_viscosity_residual@20 + 53 34 00001070 _SWIGRegisterExceptionArgumentCallbacks_CoolProp@12 + 54 35 00001000 _SWIGRegisterExceptionCallbacks_CoolProp@44 + 55 36 000010A0 _SWIGRegisterStringCallback_CoolProp@4 Summary - C000 .data - 5F000 .rdata - 17000 .reloc - 148000 .text + 1D000 .data + 7D000 .rdata + 1D000 .reloc + 175000 .text diff --git a/wrappers/EES/BuildDLF.bat b/wrappers/EES/BuildDLF.bat index f5a4a848..984f0e48 100644 --- a/wrappers/EES/BuildDLF.bat +++ b/wrappers/EES/BuildDLF.bat @@ -3,7 +3,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" call "C:\Program Files\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" REM ******* compile all the sources from CoolProp*************** -cl /c /EHsc /I../../CoolProp ../../CoolProp/*.cpp +cl /c /MP4 /EHsc /I../../CoolProp ../../CoolProp/*.cpp cl /c /EHsc /I../../CoolProp main.cpp link /DLL main.obj *.obj /OUT:COOLPROP_EES.dlf diff --git a/wrappers/Excel/BuildDLL.bat b/wrappers/Excel/BuildDLL.bat index f39d865c..baf8ba72 100644 --- a/wrappers/Excel/BuildDLL.bat +++ b/wrappers/Excel/BuildDLL.bat @@ -3,7 +3,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" call "C:\Program Files\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" REM ******* compile all the sources *************** -cl /c /I../../CoolProp /EHsc /DCOOLPROP_LIB ../../CoolProp/*.cpp +cl /c /MP4 /I../../CoolProp /EHsc /DCOOLPROP_LIB ../../CoolProp/*.cpp link /DLL *.obj /OUT:CoolProp.dll dumpbin /EXPORTS CoolProp.dll > exports.txt diff --git a/wrappers/Excel/BuildDLLx64.bat b/wrappers/Excel/BuildDLLx64.bat index 5557b3aa..8a4c1a11 100644 --- a/wrappers/Excel/BuildDLLx64.bat +++ b/wrappers/Excel/BuildDLLx64.bat @@ -3,7 +3,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd6 call "C:\Program Files\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64 REM ******* compile all the sources *************** -cl /c /I../../CoolProp /EHsc /DCOOLPROP_LIB ../../CoolProp/*.cpp +cl /c /MP4 /I../../CoolProp /EHsc /DCOOLPROP_LIB ../../CoolProp/*.cpp link /DLL CoolProp.obj *.obj /OUT:CoolProp_x64.dll dumpbin /EXPORTS CoolProp_x64.dll > exports_x64.txt diff --git a/wrappers/Excel/exports.txt b/wrappers/Excel/exports.txt index 3481bd78..1d431e86 100644 --- a/wrappers/Excel/exports.txt +++ b/wrappers/Excel/exports.txt @@ -9,62 +9,64 @@ File Type: DLL Section contains the following exports for CoolProp.dll 00000000 characteristics - 5289E999 time date stamp Mon Nov 18 11:19:05 2013 + 52A22963 time date stamp Fri Dec 06 14:45:39 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 0008A4C0 _DerivTerms@24 - 2 1 0008A000 _F2K@8 - 3 2 000DB0F0 _HAProps@40 - 4 3 000DC5E0 _HAProps_Aux@32 - 5 4 0007F620 _IProps@32 - 6 5 0007CAF0 _IsFluidType@8 - 7 6 00089FE0 _K2F@8 - 8 7 0008AF70 _Phase@24 - 9 8 0008AFE0 _Phase_Tp@24 - 10 9 0008B050 _Phase_Trho@24 - 11 A 0008A020 _PrintSaturationTable@24 - 12 B 00089EB0 _Props1@8 - 13 C 00089E50 _Props@32 - 14 D 00089E10 _PropsS@32 - 15 E 0008AB80 _conductivity_background@20 - 16 F 0008AB00 _conductivity_critical@20 - 17 10 0008A700 _conformal_Trho@32 - 18 11 0008B170 _disable_TTSE_LUT@4 - 19 12 0008B230 _disable_TTSE_LUT_writing@4 - 20 13 0008B0F0 _enable_TTSE_LUT@4 - 21 14 0008B1B0 _enable_TTSE_LUT_writing@4 - 22 15 0008A520 _get_Fluid_index@4 - 23 16 0008B360 _get_TTSESinglePhase_LUT_range@20 - 24 17 0008AF00 _get_fluid_param_string@12 - 25 18 0008AEA0 _get_global_param_string@8 - 26 19 0008A550 _get_index_units@8 - 27 1A 0008A6D0 _get_param_index@4 - 28 1B 0008B420 _get_standard_unit_system@0 - 29 1C 0008B130 _isenabled_TTSE_LUT@4 - 30 1D 0008B1F0 _isenabled_TTSE_LUT_writing@4 - 31 1E 0008AD40 _psatL_anc@12 - 32 1F 0008ADF0 _psatV_anc@12 - 33 20 0008ABE0 _rhosatL_anc@12 - 34 21 0008AC90 _rhosatV_anc@12 - 35 22 0008B270 _set_TTSESat_LUT_size@8 - 36 23 0008B300 _set_TTSESinglePhase_LUT_range@36 - 37 24 0008B2B0 _set_TTSESinglePhase_LUT_size@12 - 38 25 0008A5A0 _set_TTSE_mode@8 - 39 26 0008B0C0 _set_phase@4 - 40 27 00089DC0 _set_reference_stateD@36 - 41 28 00089D80 _set_reference_stateS@8 - 42 29 0008B430 _set_standard_unit_system@4 - 43 2A 0008A9B0 _viscosity_dilute@12 - 44 2B 0008AA30 _viscosity_residual@20 + 1 0 0008A540 _DerivTerms@24 + 2 1 0008A080 _F2K@8 + 3 2 000DD3C0 _HAProps@40 + 4 3 000DE8B0 _HAProps_Aux@32 + 5 4 0007F500 _IProps@32 + 6 5 0007CC90 _IsFluidType@8 + 7 6 0008A060 _K2F@8 + 8 7 0008B040 _Phase@24 + 9 8 0008B0B0 _Phase_Tp@24 + 10 9 0008B120 _Phase_Trho@24 + 11 A 0008A0A0 _PrintSaturationTable@24 + 12 B 0008A020 _Props1@8 + 13 C 00089FC0 _Props@32 + 14 D 00089F80 _PropsS@32 + 15 E 0008AC30 _conductivity_background@20 + 16 F 0008ABB0 _conductivity_critical@20 + 17 10 0008A7B0 _conformal_Trho@32 + 18 11 0008B240 _disable_TTSE_LUT@4 + 19 12 0008B300 _disable_TTSE_LUT_writing@4 + 20 13 0008B1C0 _enable_TTSE_LUT@4 + 21 14 0008B280 _enable_TTSE_LUT_writing@4 + 22 15 0008A590 _fromSI@16 + 23 16 0008A5D0 _get_Fluid_index@4 + 24 17 0008B430 _get_TTSESinglePhase_LUT_range@20 + 25 18 0008AFD0 _get_fluid_param_string@12 + 26 19 0008AF70 _get_global_param_string@8 + 27 1A 0008A600 _get_index_units@8 + 28 1B 0008A780 _get_param_index@4 + 29 1C 0008B4F0 _get_standard_unit_system@0 + 30 1D 0008B200 _isenabled_TTSE_LUT@4 + 31 1E 0008B2C0 _isenabled_TTSE_LUT_writing@4 + 32 1F 0008AE10 _psatL_anc@12 + 33 20 0008AEC0 _psatV_anc@12 + 34 21 0008AC90 _rhosatL_anc@12 + 35 22 0008AD50 _rhosatV_anc@12 + 36 23 0008B340 _set_TTSESat_LUT_size@8 + 37 24 0008B3D0 _set_TTSESinglePhase_LUT_range@36 + 38 25 0008B380 _set_TTSESinglePhase_LUT_size@12 + 39 26 0008A650 _set_TTSE_mode@8 + 40 27 0008B190 _set_phase@4 + 41 28 00089F30 _set_reference_stateD@36 + 42 29 00089EF0 _set_reference_stateS@8 + 43 2A 0008B500 _set_standard_unit_system@4 + 44 2B 0008A5B0 _toSI@16 + 45 2C 0008AA60 _viscosity_dilute@12 + 46 2D 0008AAE0 _viscosity_residual@20 Summary 1D000 .data - 7D000 .rdata + 7E000 .rdata 1D000 .reloc - 16D000 .text + 17A000 .text diff --git a/wrappers/Excel/exports_x64.txt b/wrappers/Excel/exports_x64.txt index 96125cb3..d9dbca6e 100644 --- a/wrappers/Excel/exports_x64.txt +++ b/wrappers/Excel/exports_x64.txt @@ -9,65 +9,67 @@ File Type: DLL Section contains the following exports for CoolProp_x64.dll 00000000 characteristics - 52776021 time date stamp Mon Nov 04 09:51:45 2013 + 52A2296D time date stamp Fri Dec 06 14:45:49 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 000C0F50 DerivTerms - 2 1 000C0990 F2K - 3 2 00130D80 HAProps - 4 3 00132670 HAProps_Aux - 5 4 00004B30 IProps - 6 5 00001840 IsFluidType - 7 6 000C0960 K2F - 8 7 000C1B10 Phase - 9 8 000C1BC0 Phase_Tp - 10 9 000C1C70 Phase_Trho - 11 A 000C09C0 PrintSaturationTable - 12 B 000C0810 Props - 13 C 000C08D0 Props1 - 14 D 000C07B0 PropsS - 15 E 000C1760 conductivity_background - 16 F 000C16D0 conductivity_critical - 17 10 000C1230 conformal_Trho - 18 11 000C1E00 disable_TTSE_LUT - 19 12 000C1EF0 disable_TTSE_LUT_writing - 20 13 000C1D60 enable_TTSE_LUT - 21 14 000C1E50 enable_TTSE_LUT_writing - 22 15 000C0FC0 get_Fluid_index - 23 16 000C2070 get_TTSESinglePhase_LUT_range - 24 17 000C1A40 get_fluid_param_string - 25 18 000C19B0 get_global_param_string - 26 19 000C1000 get_index_units - 27 1A 000C11F0 get_param_index - 28 1B 000C2140 get_standard_unit_system - 29 1C 000C1DB0 isenabled_TTSE_LUT - 30 1D 000C1EA0 isenabled_TTSE_LUT_writing - 31 1E 000C18D0 psatL_anc - 32 1F 000C1940 psatV_anc - 33 20 000C17D0 rhosatL_anc - 34 21 000C1850 rhosatV_anc - 35 22 000C1F40 set_TTSESat_LUT_size - 36 23 000C1FF0 set_TTSESinglePhase_LUT_range - 37 24 000C1F90 set_TTSESinglePhase_LUT_size - 38 25 000C1070 set_TTSE_mode - 39 26 000C1D20 set_phase - 40 27 000C0740 set_reference_stateD - 41 28 000C06C0 set_reference_stateS - 42 29 000C2160 set_standard_unit_system - 43 2A 000C15B0 viscosity_dilute - 44 2B 000C1640 viscosity_residual + 1 0 000C1750 DerivTerms + 2 1 000C1190 F2K + 3 2 00133350 HAProps + 4 3 00134C40 HAProps_Aux + 5 4 00004E00 IProps + 6 5 00001BC0 IsFluidType + 7 6 000C1160 K2F + 8 7 000C2410 Phase + 9 8 000C24C0 Phase_Tp + 10 9 000C2570 Phase_Trho + 11 A 000C11C0 PrintSaturationTable + 12 B 000C1020 Props + 13 C 000C10E0 Props1 + 14 D 000C0FC0 PropsS + 15 E 000C2020 conductivity_background + 16 F 000C1F90 conductivity_critical + 17 10 000C1AF0 conformal_Trho + 18 11 000C2700 disable_TTSE_LUT + 19 12 000C27F0 disable_TTSE_LUT_writing + 20 13 000C2660 enable_TTSE_LUT + 21 14 000C2750 enable_TTSE_LUT_writing + 22 15 000C1800 fromSI + 23 16 000C1880 get_Fluid_index + 24 17 000C2970 get_TTSESinglePhase_LUT_range + 25 18 000C2340 get_fluid_param_string + 26 19 000C22B0 get_global_param_string + 27 1A 000C18C0 get_index_units + 28 1B 000C1AB0 get_param_index + 29 1C 000C2A40 get_standard_unit_system + 30 1D 000C26B0 isenabled_TTSE_LUT + 31 1E 000C27A0 isenabled_TTSE_LUT_writing + 32 1F 000C21B0 psatL_anc + 33 20 000C2230 psatV_anc + 34 21 000C2090 rhosatL_anc + 35 22 000C2120 rhosatV_anc + 36 23 000C2840 set_TTSESat_LUT_size + 37 24 000C28F0 set_TTSESinglePhase_LUT_range + 38 25 000C2890 set_TTSESinglePhase_LUT_size + 39 26 000C1930 set_TTSE_mode + 40 27 000C2620 set_phase + 41 28 000C0F50 set_reference_stateD + 42 29 000C0ED0 set_reference_stateS + 43 2A 000C2A60 set_standard_unit_system + 44 2B 000C1840 toSI + 45 2C 000C1E70 viscosity_dilute + 46 2D 000C1F00 viscosity_residual Summary - E000 .data - 16000 .pdata - 84000 .rdata + 27000 .data + 1F000 .pdata + AA000 .rdata 6000 .reloc - 1D0000 .text + 212000 .text 5000 data 2000 text diff --git a/wrappers/Java/build_win32.bat b/wrappers/Java/build_win32.bat index 37226682..bcf89bb9 100644 --- a/wrappers/Java/build_win32.bat +++ b/wrappers/Java/build_win32.bat @@ -8,7 +8,7 @@ call "C:\Program Files\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" REM ******* compile all the sources *************** swig -java -c++ -outcurrentdir ../../CoolProp/CoolProp.i cl /c /I../../CoolProp /I"C:\Program Files\Java\jdk1.7.0_40\include" /I"C:\Program Files\Java\jdk1.7.0_40\include\win32" /EHsc *.cxx -cl /c /I../../CoolProp /I"C:\Program Files\Java\jdk1.7.0_40\include" /I"C:\Program Files\Java\jdk1.7.0_40\include\win32" /EHsc ../../CoolProp/*.cpp +cl /c /MP4 /I../../CoolProp /I"C:\Program Files\Java\jdk1.7.0_40\include" /I"C:\Program Files\Java\jdk1.7.0_40\include\win32" /EHsc ../../CoolProp/*.cpp link /DLL *.obj /OUT:CoolProp.dll dumpbin /EXPORTS CoolProp.dll > exports.txt mkdir win32 diff --git a/wrappers/Java/build_x64.bat b/wrappers/Java/build_x64.bat index a198e304..0469f68d 100644 --- a/wrappers/Java/build_x64.bat +++ b/wrappers/Java/build_x64.bat @@ -7,7 +7,7 @@ call "C:\Program Files\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64 REM ******* compile all the sources *************** swig -java -c++ -outcurrentdir ../../CoolProp/CoolProp.i cl /c /I../../CoolProp /I"C:\Program Files\Java\jdk1.7.0_40\include" /I"C:\Program Files\Java\jdk1.7.0_40\include\win32" /EHsc *.cxx -cl /c /I../../CoolProp /I"C:\Program Files\Java\jdk1.7.0_40\include" /I"C:\Program Files\Java\jdk1.7.0_40\include\win32" /EHsc ../../CoolProp/*.cpp +cl /c /MP4 /I../../CoolProp /I"C:\Program Files\Java\jdk1.7.0_40\include" /I"C:\Program Files\Java\jdk1.7.0_40\include\win32" /EHsc ../../CoolProp/*.cpp link /DLL *.obj /OUT:CoolProp.dll dumpbin /EXPORTS CoolProp.dll > exports_x64.txt mkdir x64 diff --git a/wrappers/Labview/BuildDLL.bat b/wrappers/Labview/BuildDLL.bat index 14e86113..59b5c712 100644 --- a/wrappers/Labview/BuildDLL.bat +++ b/wrappers/Labview/BuildDLL.bat @@ -2,7 +2,7 @@ REM ******** set the variables ************ call "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" REM ******* compile all the sources *************** -cl /O2 /Oi /GL /I "..\..\CoolProp" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "LABVIEW_RT_EXPORTS" /D "COOLPROP_LIB" /D "CONVENTION=__cdecl" /D "_WINDLL" /FD /EHsc /MT /Gy /W3 /c /Zi /TP ..\..\CoolProp\*.cpp +cl /MP4 /O2 /Oi /GL /I "..\..\CoolProp" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "LABVIEW_RT_EXPORTS" /D "COOLPROP_LIB" /D "CONVENTION=__cdecl" /D "_WINDLL" /FD /EHsc /MT /Gy /W3 /c /Zi /TP ..\..\CoolProp\*.cpp link /OUT:"CoolProp.dll" /INCREMENTAL:NO /NOLOGO /DLL /MANIFEST:NO /DEBUG /SUBSYSTEM:WINDOWS /OPT:REF /OPT:ICF /LTCG /DYNAMICBASE /NXCOMPAT /MACHINE:X86 /ERRORREPORT:PROMPT kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib *.obj diff --git a/wrappers/MathCAD/BuildDLL.bat b/wrappers/MathCAD/BuildDLL.bat index 675dde1e..8626dccf 100644 --- a/wrappers/MathCAD/BuildDLL.bat +++ b/wrappers/MathCAD/BuildDLL.bat @@ -3,7 +3,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" call "C:\Program Files\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" REM ******* compile all the sources *************** -cl /c /I../../CoolProp /EHsc /DEXTERNC ../../CoolProp/*.cpp +cl /c /MP4 /I../../CoolProp /EHsc /DEXTERNC ../../CoolProp/*.cpp cl /c /I../../CoolProp /EHsc /DEXTERNC /DCOOLPROPMATHCADWRAPPER_EXPORTS CoolPropMathcad.cpp link /DLL *.obj mcaduser.lib /OUT:CoolPropMathcadWrapper.dll /ENTRY:"DllEntryPoint" diff --git a/wrappers/MathCAD/CoolPropMathcad.cpp b/wrappers/MathCAD/CoolPropMathcad.cpp index 901b831a..ac198af0 100644 --- a/wrappers/MathCAD/CoolPropMathcad.cpp +++ b/wrappers/MathCAD/CoolPropMathcad.cpp @@ -8,11 +8,17 @@ #endif #endif +#include + #include "mcadincl.h" +// Why does MathCAD use min and max macros??? +#undef min +#undef max + #include "CoolProp.h" #include "FluidClass.h" #include "HumidAirProp.h" -#include "string.h" + #define MUST_BE_REAL 1 #define NUMBER_OF_ERRORS 1 diff --git a/wrappers/MathCAD/Prime/README.rst b/wrappers/MathCAD/Prime/README.rst index e5a0aeb3..1ea47717 100644 --- a/wrappers/MathCAD/Prime/README.rst +++ b/wrappers/MathCAD/Prime/README.rst @@ -12,6 +12,8 @@ To Use/Build * Compiled for MathCAD Prime 3.0 64-bit version - the .lib file is for 64-bit, if you want a 32-bit version you need access to the 32-bit version of the mcaduser.lib file for Prime 3.0 -* The mcaduser.lib and mcadincl.h files from MathCAD need to be included and linked when building the “CoolProp 4.0 Beta Mathcad Prime 3.0 Wrapper.cpp” file. If you have Mathcad Prime 3.0 installed, the default location of the compiled DLL is: C:\Program Files\PTC\Mathcad Prime 3.0\Custom Functions +* The mcaduser.lib and mcadincl.h files from MathCAD need to be included and linked when building the “CoolProp 4.0 Beta Mathcad Prime 3.0 Wrapper.cpp” file. + +* If you have Mathcad Prime 3.0 installed, you need to put the DLL in the folder: C:\Program Files\PTC\Mathcad Prime 3.0\Custom Functions , or wherever your MathCAD is installed * There is a copy of the CoolProp wrapper Mathcad demonstration and documentation worksheet, converted to Prime 3.0 format (*.mcdx). \ No newline at end of file diff --git a/wrappers/MathCAD/exports.txt b/wrappers/MathCAD/exports.txt index 22136e07..d4018d38 100644 --- a/wrappers/MathCAD/exports.txt +++ b/wrappers/MathCAD/exports.txt @@ -8,7 +8,7 @@ File Type: DLL Summary - C000 .data - 60000 .rdata - 17000 .reloc - 14D000 .text + 1D000 .data + 7E000 .rdata + 1D000 .reloc + 17A000 .text diff --git a/wrappers/Modelica/BuildLIB-VS2008.bat b/wrappers/Modelica/BuildLIB-VS2008.bat index ae5c542c..a17c97fb 100644 --- a/wrappers/Modelica/BuildLIB-VS2008.bat +++ b/wrappers/Modelica/BuildLIB-VS2008.bat @@ -4,7 +4,7 @@ call "C:\Program Files\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" call "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" REM ******* compile all the sources from CoolProp *************** -cl /c /Ox /fp:fast /I../../CoolProp /MD /EHsc ../../CoolProp/*.cpp +cl /c /Ox /MP4 /fp:fast /I../../CoolProp /MD /EHsc ../../CoolProp/*.cpp cl /c /Ox /fp:fast /I../../CoolProp /MD /EHsc src/*.cpp mkdir bin\VS2008 diff --git a/wrappers/Modelica/BuildLIB-VS2010.bat b/wrappers/Modelica/BuildLIB-VS2010.bat index 165ba9aa..a24a80bf 100644 --- a/wrappers/Modelica/BuildLIB-VS2010.bat +++ b/wrappers/Modelica/BuildLIB-VS2010.bat @@ -4,7 +4,7 @@ call "C:\Program Files\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" REM ******* compile all the sources from CoolProp *************** -cl /c /Ox /fp:fast /I../../CoolProp /MD /EHsc ../../CoolProp/*.cpp +cl /c /Ox /MP4 /fp:fast /I../../CoolProp /MD /EHsc ../../CoolProp/*.cpp cl /c /Ox /fp:fast /I../../CoolProp /MD /EHsc src/*.cpp mkdir bin\VS2010 diff --git a/wrappers/Modelica/BuildLIB-VS2012.bat b/wrappers/Modelica/BuildLIB-VS2012.bat index 88ef1ca7..9f5377e2 100755 --- a/wrappers/Modelica/BuildLIB-VS2012.bat +++ b/wrappers/Modelica/BuildLIB-VS2012.bat @@ -4,7 +4,7 @@ call "C:\Program Files\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" REM ******* compile all the sources from CoolProp *************** -cl /c /Ox /fp:fast /I../../CoolProp /MD /EHsc ../../CoolProp/*.cpp +cl /c /Ox /MP4 /fp:fast /I../../CoolProp /MD /EHsc ../../CoolProp/*.cpp cl /c /Ox /fp:fast /I../../CoolProp /MD /EHsc src/*.cpp mkdir bin\VS2012 diff --git a/wrappers/StaticLibrary/BuildLIB-VS2008.bat b/wrappers/StaticLibrary/BuildLIB-VS2008.bat index 1fb07c49..f3a4e696 100644 --- a/wrappers/StaticLibrary/BuildLIB-VS2008.bat +++ b/wrappers/StaticLibrary/BuildLIB-VS2008.bat @@ -4,21 +4,21 @@ call "C:\Program Files\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" call "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" REM ******* compile all the sources from CoolProp *************** -cl /c /I../../CoolProp /EHsc /MDd ../../CoolProp/*.cpp +cl /c /MP4 /I../../CoolProp /EHsc /MDd ../../CoolProp/*.cpp lib *.obj /OUT:VS2008/CoolPropLib_MDd.lib erase *.obj REM ******* compile all the sources from CoolProp *************** -cl /c /I../../CoolProp /EHsc /MD ../../CoolProp/*.cpp +cl /c /MP4 /I../../CoolProp /EHsc /MD ../../CoolProp/*.cpp lib *.obj /OUT:VS2008/CoolPropLib_MD.lib erase *.obj REM ******* compile all the sources from CoolProp *************** -cl /c /I../../CoolProp /EHsc /MT ../../CoolProp/*.cpp +cl /c /MP4 /I../../CoolProp /EHsc /MT ../../CoolProp/*.cpp lib *.obj /OUT:VS2008/CoolPropLib_MT.lib erase *.obj REM ******* compile all the sources from CoolProp *************** -cl /c /I../../CoolProp /EHsc /MTd ../../CoolProp/*.cpp +cl /c /MP4 /I../../CoolProp /EHsc /MTd ../../CoolProp/*.cpp lib *.obj /OUT:VS2008/CoolPropLib_MTd.lib erase *.obj \ No newline at end of file diff --git a/wrappers/StaticLibrary/BuildLIB-VS2010.bat b/wrappers/StaticLibrary/BuildLIB-VS2010.bat index 2279462b..de7fc09d 100644 --- a/wrappers/StaticLibrary/BuildLIB-VS2010.bat +++ b/wrappers/StaticLibrary/BuildLIB-VS2010.bat @@ -4,8 +4,8 @@ call "C:\Program Files\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" REM ******* compile all the sources from CoolProp *************** -cl /c /I../../CoolProp /MD /EHsc ../../CoolProp/*.cpp -cl /c /I../../CoolProp /MD /EHsc src/*.cpp +cl /c /MP4 /I../../CoolProp /MD /EHsc ../../CoolProp/*.cpp +cl /c /MP4 /I../../CoolProp /MD /EHsc src/*.cpp lib CoolProp.obj *.obj /OUT:bin/VS2010/CoolPropLib.lib erase *.obj diff --git a/wrappers/StaticLibrary/BuildLIB-VS2012.bat b/wrappers/StaticLibrary/BuildLIB-VS2012.bat index 5a54c27f..37a9e84d 100644 --- a/wrappers/StaticLibrary/BuildLIB-VS2012.bat +++ b/wrappers/StaticLibrary/BuildLIB-VS2012.bat @@ -4,8 +4,8 @@ call "C:\Program Files\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" REM ******* compile all the sources from CoolProp *************** -cl /c /I../../CoolProp /MD /EHsc ../../CoolProp/*.cpp -cl /c /I../../CoolProp /MD /EHsc src/*.cpp +cl /c /MP4 /I../../CoolProp /MD /EHsc ../../CoolProp/*.cpp +cl /c /MP4 /I../../CoolProp /MD /EHsc src/*.cpp lib CoolProp.obj *.obj /OUT:bin/VS2012/CoolPropLib.lib erase *.obj