Commit Graph

420 Commits

Author SHA1 Message Date
jowr
a57241bd62 Added checks and conversion functions 2014-07-09 18:18:02 +02:00
jowr
6c1bbd6510 Merge remote-tracking branch 'origin/eigenPolynomials' into eigenPolynomials 2014-07-09 17:00:34 +02:00
Ian Bell
c678bdb11a Merge branch 'eigenPolynomials' of https://github.com/coolprop/coolprop into eigenPolynomials 2014-07-09 10:31:34 +02:00
Ian Bell
8e8be7c629 Updated incompressible files
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-09 10:28:31 +02:00
Ian Bell
036179990f Added rapidjson_include value information structure
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-09 10:27:45 +02:00
jowr
32d3831b12 Merge branch 'master' into eigenPolynomials 2014-07-09 10:15:25 +02:00
jowr
10a7fa5a41 MatrixMath tests work 2014-07-09 10:14:40 +02:00
Ian Bell
61c614f183 Updated JSON files and Python files for incompressibles
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-08 16:43:12 +02:00
Ian Bell
bce90e4708 Update Octave build to use static libraries 2014-07-08 16:21:10 +02:00
jowr
bbd14f24ff Merge branch 'master' into eigenPolynomials 2014-07-08 15:41:42 +02:00
Ian Bell
4aa8c5ac61 Fixed incomp JSON files and added prototypes to incompressible backend
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-08 15:40:32 +02:00
Ian Bell
6482ced24a buildbot cron 2014-07-08 15:28:19 +02:00
Ian Bell
36d9c7f9e6 Fixed buildbot 2014-07-08 15:15:11 +02:00
Ian Bell
acc670587f Buildbot docs 2014-07-08 15:10:43 +02:00
Ian Bell
68c0fe914d Docs for buildbot-private 2014-07-08 15:08:02 +02:00
Ian Bell
90af4a0442 Turns out you don't need virtual environment 2014-07-08 14:58:53 +02:00
Ian Bell
55b7514736 Fix path for virtual environment 2014-07-08 13:58:15 +02:00
jowr
77fa6d9887 Moving files around 2014-07-08 13:49:58 +02:00
jowr
48515b98fd Fixed the coefficients!!!! A minus was missing. 2014-07-08 13:36:08 +02:00
Ian Bell
df5cded58c Find static libraries on OSX (others broken)
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-08 13:25:09 +02:00
Ian Bell
6779185349 Octave libraries are linked static
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-08 13:19:01 +02:00
Ian Bell
343f47f61a Updated CMakeLists.txt to give more verbose library information for Octave on OSX
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-08 11:18:27 +02:00
Ian Bell
b08a241a56 Remove apidoc from buildbot
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-08 00:03:41 +02:00
Ian Bell
4d235727d4 Fixed indentation in buildbot master.cfg
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-07 23:18:52 +02:00
Ian Bell
e1a93f5f6f Updated buildbot to build docs using sphinx
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-07 23:14:59 +02:00
Ian Bell
466b56a7a7 Updated BibTeX to close https://github.com/CoolProp/CoolProp/issues/57
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-07 21:54:29 +02:00
Ian Bell
5d06cfa7a5 Fixed JSON file
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-07 21:52:57 +02:00
Ian Bell
817510b29e Exported get_parameter_information_string in DLL
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-07 21:03:18 +02:00
Ian Bell
1fde42f562 Added missing parameters to DataStructures.cpp
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-07 21:02:13 +02:00
Ian Bell
2edc262f7b Small updates to website
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-07 20:26:38 +02:00
Ian Bell
76e49a3219 sphinx-apidoc does not make top-level modules.rst file anymore
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-07 20:25:49 +02:00
Ian Bell
a75dbefd7b Fixed bug with get_csv_parameter_list
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-07 20:25:16 +02:00
Ian Bell
67d85f72e1 Added csv parameter listing to get_global_parameter
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-07 20:08:51 +02:00
jowr
fb9421f6d0 Added some basic checks, still need to make sure that rows and columns are valid 2014-07-07 17:37:38 +02:00
Ian Bell
6c3cc004de More updates to windows C++ compilers
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-07 16:25:11 +02:00
Ian Bell
0ba580e854 Updated information on common prerequisites
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-07 15:42:46 +02:00
Ian Bell
4392e05412 Removed sphinxext, no longer needed, superceded by other extensions in IPython, MPL and sphinx itself
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-07 15:25:23 +02:00
Ian Bell
161608173c Merge branch 'master' of https://github.com/coolprop/coolprop 2014-07-07 15:23:52 +02:00
Ian Bell
2b12242b6d Update Octave docs 2014-07-07 15:23:38 +02:00
Ian Bell
24fac43c0b Modified edit_on_github.py to take path prefix, reverted matplotlib plot_directive in conf.py
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-07 15:19:29 +02:00
Ian Bell
368f418c2c Added edit on github links to pages
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-07 15:08:53 +02:00
Ian Bell
e7640020b8 More reorganization of the Web folder
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-07 14:55:34 +02:00
Ian Bell
68dad10806 Moved fluid property web docs files into new folder
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-07 14:27:55 +02:00
Ian Bell
edcbf0dec2 Work on docs and cleanup of wrappers folder
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-07 14:14:36 +02:00
jowr
f5a6cc4ef5 Merge branch 'master' into eigenPolynomials 2014-07-07 12:35:50 +02:00
jowr
d3ae8ead88 JSON string formatting, renamed example files 2014-07-07 12:27:14 +02:00
jowr
99e08bf252 Added conversion function for Melinder solutions 2014-07-07 12:11:46 +02:00
Ian Bell
8d3c49b692 Fixed buildbot master.cfg
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-07 00:50:45 +02:00
Ian Bell
054d5418ae moved buildbot authentication out of the master.cfg into private module 2014-07-07 00:27:55 +02:00
Ian Bell
84dacb965e Merge branch 'master' of https://github.com/coolprop/coolprop 2014-07-06 23:36:08 +02:00