github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-02-12 06:44:59 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,989 Commits 36 Branches 30 Tags
f86952109bf7329e1f8febc60bc1e0de2d399974
Commit Graph

1989 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ian Bell
f86952109b Implement calc_melting_line for incompressibles; closes #347 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-12-18 20:05:16 -06:00
Ian Bell
d064baf230 Fix bug with PhaseSI function (at DLL level) taking Output parameter as first parameter 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-12-18 18:18:45 -06:00
Ian Bell
b8737628ae Merge pull request #360 from CoolProp/asan_rpversion 
RPversion call needs to take in a longer string than it should require
 2014-12-18 16:39:55 -06:00
Ian Bell
6f245cfd4d Increase length of string passed to RPversion function 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-12-18 16:31:36 -06:00
Ian Bell
9bc5a78d97 Merge branch 'master' into asan_rpversion 2014-12-18 16:10:31 -06:00
Ian Bell
71e59e3410 Disable the clearing of FPU exceptions on platforms that do not support it 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-12-18 16:03:27 -06:00
Ian Bell
b4e8dad1f3 On gcc/clang, always turn on FPU clearing; See #353 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-12-18 15:16:19 -06:00
Ian Bell
5393becae5 Merge pull request #358 from CoolProp/matlab_hide_enums 
Matlab hide enums
 2014-12-18 10:24:03 -06:00
Ian Bell
c1b193fc5a hide some more enums, but only to MATLAB 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-12-18 10:16:30 -06:00
Ian Bell
e2230c00c0 ignore some more enums in SWIG 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-12-18 10:12:42 -06:00
Ian Bell
ecfa3227ea Hide some enums to get MSVC to compile the MATLAB wrapper 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-12-18 10:01:49 -06:00
Ian Bell
55c0e89609 Clear FPU bits for non-MSVC compilers; See #353 2014-12-18 00:47:15 +01:00
Jorrit Wronski
ef59b281d6 Merge branch 'develop' 2014-12-17 16:54:40 +01:00
Jorrit Wronski
c53c50382d Changed the docs and added a new reference 2014-12-17 16:52:30 +01:00
Jorrit Wronski
04c26a7ebe New reference state calculations seem to work fine and employ fewer calls to property functions 2014-12-17 13:08:21 +01:00
Jorrit Wronski
f594136451 Fixed the docs, changed the calculation of the reference state, we are half - does not work properly 2014-12-17 11:23:43 +01:00
Jorrit Wronski
69c3a9642b Started to work on the new incompressible enthalpy formulation 2014-12-17 10:42:55 +01:00
Jorrit Wronski
ef69b90ef3 Merge branch 'master' into develop 2014-12-17 10:41:14 +01:00
Jorrit Wronski
9708284c60 cleaned up and added some gitignore files 2014-12-17 10:39:16 +01:00
Jorrit Wronski
79bd4c9f22 Added the Python module to the docs again 2014-12-17 10:23:58 +01:00
Jorrit Wronski
92ecd816c0 Reenable API-docs 
sphinx-apidoc was commented out, this hopefully closes #350 ...
 2014-12-16 23:05:38 +01:00
Ian Bell
77d019076f Merge pull request #348 from CoolProp/hide_rapidjson 
Hide rapidjson header in SWIG wrappers
 2014-12-13 01:02:42 +01:00
Ian Bell
5f4574fb5c try to define SWIG macro before including Configuration.h 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-12-12 18:58:20 -05:00
Ian Bell
7cdf05cb32 Hide getter/setter from SWIG as well. 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-12-12 18:51:11 -05:00
Ian Bell
9e95f0bd4f Merge branch 'master' of https://github.com/coolprop/coolprop 2014-12-12 18:25:55 -05:00
Ian Bell
0e766ab75a REFPROP now silently ignores warning on loading fluids. 
Closes #342

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-12-12 17:15:16 -05:00
Ian Bell
bc71cc8f11 Fix bug with RPVersion function call 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-12-12 01:27:22 -05:00
Ian Bell
8cef862a1e Merge pull request #345 from CoolProp/excel_woes 
One more try with excel 64-bit
 2014-12-12 06:15:44 +01:00
Ian Bell
87365ad5f8 One more try with excel 64-bit 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-12-12 00:09:44 -05:00
Ian Bell
a888f0f176 Merge pull request #340 from CoolProp/excel_woes 
Excel woes
 2014-12-11 06:27:42 +01:00
Ian Bell
a6caaff87a Fixed one path in xlam where it should have been CoolProp_x64.dll instead of CoolProp.dll 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-12-11 00:25:16 -05:00
Ian Bell
7499ec78b3 DLL now use static linkage of the MS c runtime 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-12-11 00:22:32 -05:00
Ian Bell
93726173b8 Try to hide rapidjson header to swig for some wrappers that get confused 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-12-10 23:39:17 -05:00
Ian Bell
7bc685647c Merge pull request #338 from CoolProp/xylene_transport 
Xylene transport
 2014-12-11 05:17:53 +01:00
Ian Bell
bf3cd4a614 Update the ECS solver, all transport tests pass 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-12-10 23:00:28 -05:00
Ian Bell
4a76cb1d4b Merge branch 'master' into xylene_transport 2014-12-10 17:06:41 -05:00
Ian Bell
28c7b1dccd ECS ESRR need to be updated after conformal state solver - closes #337 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-12-10 17:00:58 -05:00
Ian Bell
15755c8ef5 Updated tests 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-12-10 16:59:24 -05:00
Ian Bell
438693962f Added (failing) tests for transport of xylenes 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-12-10 16:20:11 -05:00
Ian Bell
4c82aca6df First cut at conductivity for xylenes 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-12-10 15:47:02 -05:00
Ian Bell
6b028024e9 Fix OSX wrapper for Excel on OSX 10.10? See #331 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-12-10 13:32:15 -05:00
Ian Bell
a5d1ab55cd Implemented viscosity for xylenes 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-12-10 13:16:25 -05:00
Ian Bell
76c10b14f9 Merge pull request #335 from CoolProp/REFPROP_wrapper_cleanup 
Refprop wrapper cleanup
 2014-12-10 18:22:30 +01:00
Ian Bell
4f52e5242a handle name mangling properly in REFPROP shared library 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-12-10 12:13:01 -05:00
Ian Bell
33d420b942 Chomp variable names using the power of XMacros - currently windows only 
Removed almost 1000 lines of code!

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-12-10 11:50:00 -05:00
Ian Bell
e7afcdbe7b Remove all the *_NAME macros 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-12-10 09:59:08 -05:00
Ian Bell
5fe24de11f Fixed two aliases for 64-bit excel - closes #331 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-12-10 09:40:54 -05:00
Ian Bell
a75932d7d4 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-12-10 02:32:29 -05:00
Ian Bell
40fdfbc1a9 Added surface tension to list of fluids 
See also #314

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-12-10 02:32:14 -05:00
Ian Bell
36c5246725 Merge pull request #328 from CoolProp/expose_config 
Expose config
 2014-12-10 07:27:45 +01:00