Commit Graph

65 Commits

Author SHA1 Message Date
Ian Bell
ee36d65eba Prepared prepare_pypi for CoolProp5 -> CoolProp reversion 2014-08-12 18:00:17 +02:00
Ian Bell
e4c8d3f061 Python wrapper is more or less back in action completely. Additional testing is required.
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-12 16:25:33 +02:00
Ian Bell
a98ef9c44a Renamed python module
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-12 15:09:38 +02:00
Ian Bell
802495cad3 Last commit before rename of python module to CoolProp
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-12 15:07:57 +02:00
Ian Bell
c594a3c3c8 Implemented 2-input form of PropsSI function again in Python
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-12 12:22:36 +02:00
Ian Bell
b7bd58d986 More work on flash routines, number of failures is rapidly decreasing - still have problems for low pressure sat_p calcs
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-12 11:21:12 +02:00
Ian Bell
36d601490f Lots more work on melting curves, can now make pretty phase diagram for water including the melting line 2014-08-10 19:28:04 +02:00
Ian Bell
584b975b4b Fixed python files for py3.x I think, though I hate python 3 string handling 2014-08-07 23:27:37 +02:00
Ian Bell
f69a95ffcd Fixed EES code
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-06 09:47:50 +02:00
Ian Bell
80b9f45850 Fixed coolprop function is EES by calling the correct function
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-06 09:42:45 +02:00
Ian Bell
aa3cade87d First cut at Javascript docs
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-05 23:29:28 +02:00
Ian Bell
4fd84a7eba Added necessary functions to Python in order to generate parameter table
Built table in RST using python script Web/coolprop/build_parametric_table.py for High-Level API

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-05 21:37:36 +02:00
Ian Bell
4d80cf159a Added shorthand function to CoolProp to get CoolProp.global_param_string without all the typing
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-05 15:28:48 +02:00
Ian Bell
c9237a0b0b Fixed sample for EES to include mixture properties
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-05 14:35:38 +02:00
Ian Bell
c506fdd3be Added coolpropsi function to EES wrapper and added COOLPROP_EES installer to CMake install listing
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-05 12:06:29 +02:00
Ian Bell
5df9b0fdcf EES wrapper now works/builds/debugs etc. with v5 - much better debugging enabled - see Readme.txt in wrappers/EES
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-05 11:25:37 +02:00
Ian Bell
d08d3b85c5 Added Inno installer input file for EES
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-05 08:48:50 +02:00
Ian Bell
1ca9494a1f Broke up incompressible list into pure and solutions for use in Python
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-04 17:34:25 +02:00
Ian Bell
776c13c048 Add incompressible list
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-04 16:31:02 +02:00
Ian Bell
e9ac0bcc9d python wrapper work
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-03 20:43:42 +02:00
Ian Bell
a2f45e29da Added functionality for trivial outputs
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-03 18:55:52 +02:00
Ian Bell
c0a95b9f42 Fixed setup.py to not try to import CoolProp
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-03 17:19:26 +02:00
Ian Bell
34584095d9 work on buildbot for python
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-03 17:07:49 +02:00
Ian Bell
906b8edf51 python buildbot modifications
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-03 16:45:00 +02:00
Ian Bell
4235013fea Merge branch 'master' of https://github.com/coolprop/coolprop 2014-08-03 15:58:15 +02:00
Ian Bell
1c093c757e prepared for python on buildbot
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-03 15:54:10 +02:00
Ian Bell
18899a5cc3 Fixed files to compile for python on OSX 2014-08-03 14:29:07 +02:00
Ian Bell
a14731783e python builders work!!
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-03 14:00:46 +02:00
Ian Bell
df17eaf6cc python wrapper builds with vs2008 (fixed bug in Eigen)
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-03 11:37:17 +02:00
Ian Bell
87aae7eef7 A bit more work on the python packaging. Currently broken, still a work in progress.
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-02 19:52:36 +02:00
Ian Bell
459f0f43d3 Completely reorganized python scripts
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-02 18:31:03 +02:00
Ian Bell
01511f3c46 Trying again with MATLAB
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-30 23:24:16 +02:00
Ian Bell
945c016134 Fixed matlab building on linux hopefully
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-30 23:21:42 +02:00
Ian Bell
44ee752877 Update default flags for python
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-09 20:12:10 +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
Ian Bell
2baf6f0354 Removed StaticLibrary folder from wrappers
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-06 16:51:49 +02:00
Ian Bell
fc70dab066 Uppercase first letter of Octave example
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-06 16:37:55 +02:00
Ian Bell
57b3f3daf3 C# tests run on windows with
cmake ..\.. -G "Visual Studio 10" -DCOOLPROP_CSHARP_MODULE=ON -DBUILD_TESTING=ON && cmake --build . --target INSTALL && ctest --verbose -C "Release"

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-06 13:14:12 +02:00
Ian Bell
2cbc4b8ec4 Updated cython wrapper
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-30 17:11:44 +02:00
Ian Bell
2468bc1b08 Added simple example for cross compiling for compact rio - needs the VxWorks cross compiler, see README 2014-06-27 02:07:45 +02:00
Ian Bell
02e6a70aa3 Updated FORTRAN 77 wrapper - works at a rudimentary level, just need to re-enable other functions
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-26 01:50:20 +02:00
Ian Bell
032826e70f Updated FORTRAN wrapper docs
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-20 13:39:36 +02:00
Ian Bell
5197b469b2 Updated docs for FORTRAN example, tidied up example.
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-20 13:05:28 +02:00
Ian Bell
d87ef29780 Added modular FORTRAN wrapper files using ISO_C_BINDING
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-20 12:58:33 +02:00
Ian Bell
315806d9f7 Detailed example working with gfortran/g++ mixed compilation, but without module
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-20 12:40:35 +02:00
Ian Bell
96c216110d Added simple example for mixed-mode FORTRAN/c++ compilation - works
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-20 11:56:35 +02:00
Ian Bell
3127ace162 MATLAB works on windows - 32-bit and 64-bit
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-11 12:16:48 +02:00
Ian Bell
226dc8ed09 Added mass-based methods to python wrapper
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-10 15:56:21 +02:00
Ian Bell
869f9f183d Moved FindOctave.cmake
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-03 23:38:06 +02:00
Ian Bell
d545376efd Got Javascript wrapper working again - required changing all std::tr1::shared_ptr to shared_ptr
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-03 21:59:41 +02:00