Skip to content
This repository has been archived by the owner on Dec 14, 2017. It is now read-only.

Commit

Permalink
Prep for 4.0. Everything that uses VS now uses multiple processors to…
Browse files Browse the repository at this point in the history 
… compile for speed

Signed-off-by: Ian Bell <[email protected]>
  • Loading branch information
@ibell
ibell committed Dec 6, 2013
1 parent 14aaf92 commit 4c5efbe
Show file tree
Hide file tree
Showing 23 changed files with 211 additions and 192 deletions.
2 changes: 1 addition & 1 deletion CoolProp/gitrevision.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
std::string gitrevision = "9a179be2c74c667c262dd578b4f43ec569398cb4";
std::string gitrevision = "b'2c7ac1777e9c757b666ef69d3176e28a877219af'";
37 changes: 21 additions & 16 deletions MakeDistro.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'))
Expand Down Expand Up @@ -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()
# BuildDocs()
# UploadDocs()
2 changes: 1 addition & 1 deletion Web/changelog.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion wrappers/C#/BuildCsharpDLL.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
100 changes: 51 additions & 49 deletions wrappers/C#/exports.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion wrappers/EES/BuildDLF.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion wrappers/Excel/BuildDLL.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion wrappers/Excel/BuildDLLx64.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
100 changes: 51 additions & 49 deletions wrappers/Excel/exports.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 4c5efbe

Please sign in to comment.