1536 Commits

Author SHA1 Message Date
Jorrit Wronski
0868356b91 Working on the docs... 2014-09-11 14:01:02 +02:00
Jorrit Wronski
95479bac2c Reduced significant digits, again. 2014-09-11 14:01:01 +02:00
Ian Bell
91bedf919a Dry air mixtures are default to GERG model to agree with REFPROP
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-11 02:14:02 +02:00
Ian Bell
447f5c9ad1 Added aliases to depature functions to agree with REFPROP
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-11 02:13:21 +02:00
Ian Bell
86f52bdf4e Phase Envelope calculations now include Tsat_max and psat_max, along with indices thereof.
The Tsat_max and psat_max values are calculated using exact solution based on finding dT/dP and dp/dT equaling zero by a 1D solution in rhov.

See also https://github.com/CoolProp/CoolProp/issues/133

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-10 15:17:19 +02:00
Ian Bell
472643db4d Merge branch 'master' of https://github.com/coolprop/coolprop 2014-09-08 20:48:14 +02:00
Ian Bell
865aee0a6a Updated REFPROP aliases for all fluids + test to close https://github.com/CoolProp/CoolProp/issues/130
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-08 20:48:01 +02:00
Jorrit Wronski
ed788df198 Added generators for the incompressibles. The makefile handles the build process of the report pdfs, we have to avoid building them as much as we can... 2014-09-08 20:32:44 +02:00
Ian Bell
068e737388 TP flash basically working again for mixtures
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-08 00:08:18 +02:00
Ian Bell
a9bf174e86 Updated codelite project
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-07 02:15:25 +02:00
Ian Bell
a586af18bd Added JSON schema for reducing functions for mixtures
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-07 02:13:45 +02:00
Ian Bell
2f87567951 Octave on windows should be compiled with MinGW
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-07 01:28:32 +02:00
Ian Bell
1efc3b3a35 Fixed module finder for windows for octave
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-06 22:25:08 +02:00
Ian Bell
8fdd1fddaf Refactor of mixing parameters successful
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-06 15:41:33 +02:00
Ian Bell
8294acb71e Updated generate_headers.py for the new structure of reducing and departure functions
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-05 16:46:45 +01:00
Ian Bell
c0ea8e82d7 Finished refactor of reducing parameters at the level of JSON
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-05 16:39:17 +01:00
Ian Bell
a2c318f7df First step of refactoring of reducing and departure functions
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-05 16:34:56 +01:00
Ian Bell
905fec810d Phase envelope code and data structures set up
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-05 10:09:36 +01:00
Ian Bell
9b211f2145 Updated saturation spline curves
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-03 17:31:04 +01:00
Ian Bell
fca950907f Implemented benzene viscosity correlation of Avgeri et al. from JPCRD, 2014
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-02 14:56:04 +01:00
Ian Bell
928a0df8b5 Pressures in Pa for genetic ancillary fitter
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-26 23:18:51 +02:00
Ian Bell
8b388f65a4 Updated ancillaries for R245fa
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-26 23:13:20 +02:00
Ian Bell
bbc97ac230 Added methanol viscosity correlation to close https://github.com/CoolProp/CoolProp/issues/82
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-26 23:12:16 +02:00
Ian Bell
5fea309764 Fixed R11 ancillaries
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-26 18:39:42 +02:00
Ian Bell
0e3f10e0e6 Added mixture derivatives files to codelite project
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-26 14:57:11 +02:00
Ian Bell
3f6b6b4e35 Genetic ancillary fitter now uses PropsSI and CP v5
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-26 14:01:51 +02:00
Ian Bell
4299a27490 Improved ancillaries for R11
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-25 00:47:42 +02:00
Ian Bell
4b082029c4 Finally repaired flash routines.
Some edge cases remain

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-24 13:40:46 +02:00
Ian Bell
69bbdc693b Reimplemented critical region splines all the way from scripts to build to C++ code
Closes https://github.com/CoolProp/CoolProp/issues/94

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-22 22:14:48 +02:00
Ian Bell
921ec87c20 Updated constants module generator script
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-21 09:13:09 +02:00
Ian Bell
ec069fa84f Updated codelite project
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-21 02:51:59 +02:00
Ian Bell
2f448a0a4a Also output the python -mjson.tool output for incompressibles
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-21 00:55:12 +02:00
Ian Bell
b4ff7a8cc5 Implemented viscosity for cyclohexane from Tariq, 2014.
Added unit tests, reformulated initial density term

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-21 00:50:57 +02:00
Ian Bell
3c3ffa66c4 generate_headers.py gives slightly more useful output if JSON fluid file cannot be decoded
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-21 00:48:38 +02:00
Ian Bell
89c09ebf91 Tidied up the R134a JSON file
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-20 20:39:50 +02:00
Ian Bell
70c6b26ab1 Reverted pseudo-pure fluid pressure ancillary equations to close https://github.com/CoolProp/CoolProp/issues/65
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-20 20:39:16 +02:00
Ian Bell
e5055d195a Added conductivity for R134a and test to close https://github.com/CoolProp/CoolProp/issues/101
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-20 17:16:51 +02:00
Ian Bell
7cf5f3515a Bumped up max temp for propane melting curve
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-18 19:24:06 +02:00
Ian Bell
f7464fcaa2 Implemented Eigen solution for all() function, speed testing next
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-17 21:09:27 +02:00
Ian Bell
2270f9f076 Helmholtz derivatives are all calculated using parallel code - next step is to remove classes from Helmholtz
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-15 21:16:41 +02:00
Ian Bell
42a4c68ee4 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-08-15 16:05:36 +02:00
Ian Bell
2136f417b9 Updated codelite and added Tabular backend structure
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-15 15:44:55 +02:00
Ian Bell
fd55d9a479 sphinx build does a local install of python 2014-08-15 00:44:52 +02:00
Ian Bell
1df2ae8512 Fixed python buildbot
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-14 23:14:51 +02:00
Ian Bell
be859fb9cb And again
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-14 12:39:08 +02:00
Ian Bell
dcf0ac88f3 Once more with feeling
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-14 12:37:09 +02:00
Ian Bell
933090b370 EES is now built in release mode
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-14 12:31:32 +02:00
Ian Bell
956165b00f sphinx docs do a local install 2014-08-14 00:54:51 +02:00
Ian Bell
d7701fa0a1 Once more into the breach
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-14 00:20:12 +02:00
Ian Bell
6a9cd07e75 Fixed error with undefined cmake_args
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-14 00:15:40 +02:00