Commit Graph

343 Commits

Author SHA1 Message Date
Ian Bell
fd209a20d5 Some progress getting Octave working on OSX, still not working yet 2014-07-06 19:05:37 +02:00
Ian Bell
f4396afdcf Run find_package(Mono) twice again 2014-07-06 15:40:18 +02:00
Ian Bell
1dfe2e49d6 Update index.md 2014-07-06 15:37:06 +02:00
Ian Bell
05bd380394 Made CTest docs for C# 2014-07-06 15:33:05 +02:00
Ian Bell
038b7a914e Better failure message for CMake if C# not installed 2014-07-06 15:17:13 +02:00
Ian Bell
22d7d0dcaa Fixed C# finders for OSX (and linux)? 2014-07-06 13:59:48 +02:00
Ian Bell
a66e05ad58 Fixed Java testing on linux - run with
cmake ../.. -DCOOLPROP_JAVA_MODULE=ON -DBUILD_TESTING=ON && make install && ctest --verbose
2014-07-06 13:22:07 +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
19a9e1a802 C# testing works on linux with
cmake ../.. -DCOOLPROP_CSHARP_MODULE=ON -DBUILD_TESTING=ON && make install && ctest --verbose
2014-07-06 12:42:37 +02:00
Ian Bell
2311531c82 Java testing working on linux now 2014-07-06 11:57:24 +02:00
Ian Bell
15f94c5c4c Merge branch 'master' of https://github.com/coolprop/coolprop 2014-07-06 11:42:22 +02:00
Ian Bell
7d9c0bffdf Fixed Eigen include in CMake and moved num_rows and num_cols to placate gcc 2014-07-06 11:31:19 +02:00
Ian Bell
0e958aeb50 Updated bibtex file
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-06 11:18:59 +02:00
Ian Bell
acac55d63c generate_headers.py prints error when JSON file cannot be loaded to localize problem
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-06 11:17:45 +02:00
Ian Bell
313d13afe9 Updated CMake file to include testing for Java - works!
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-06 11:17:10 +02:00
Ian Bell
9202fbce4d Changes to mixture VLE code
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-30 17:17:32 +02:00
Ian Bell
e2a595cbe4 Updates to main.cxx
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-30 17:14:12 +02:00
Ian Bell
fce105ec15 Fixed resizing bug with Excess HE
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-30 17:13:28 +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
4810f8256e REFPROP backend can calculate molar mass
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-30 17:10:52 +02:00
Ian Bell
3d3cf9dea6 Additional error checking and debugging in Solvers 2014-06-30 17:10:08 +02:00
Ian Bell
cac20d47e2 Updated MatrixMath.cpp
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-30 17:09:41 +02:00
Ian Bell
54d3b45584 Resort Helmholtz.h
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-30 17:08:39 +02:00
Ian Bell
0f602c342a Merge branch 'master' of https://github.com/coolprop/coolprop
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-30 17:04:44 +02:00
Ian Bell
d251ff4cea Updated Code::Blocks project
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-30 16:53:18 +02:00
Ian Bell
f2f9eb1866 CMake file works for SWIG MATLAB, started adding install paths for DLL
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-30 16:52:43 +02:00
Ian Bell
748f5f64f5 Added some CMake docs
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-30 16:50:25 +02:00
jowr
5778067a39 Merge branch 'eigenPolynomials' 2014-06-29 19:15:58 +02:00
jowr
3b02f98879 Merge branch 'master' into eigenPolynomials
Conflicts:
	externals/eigen
	include/MatrixMath.h
	include/PolyMath.h
	src/Backends/Helmholtz/Fluids/Incompressible.cpp
	src/Backends/Helmholtz/Fluids/Incompressible.h
	src/PolyMath.cpp
2014-06-29 18:26:06 +02:00
Jorrit Wronski
134297644a Update CMakeLists.txt
Added Eigen folder
2014-06-29 18:19:51 +02:00
jowr
00e9ddf291 Added 2D function to JSON readers, fixed 2D polynomial fitting 2014-06-29 18:03:37 +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
01cf51b979 Updated Catch submodule
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-26 01:33:22 +02:00
Ian Bell
62448d8357 Uppercase eigen external folder
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-26 01:30:48 +02:00
Ian Bell
de6cfd670e Changed verbosity of header generation
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-26 01:28:43 +02:00
Ian Bell
5ee6627f65 Updated the F77 wrapper functions in the DLL
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-26 01:04:58 +02:00
Ian Bell
cd9009e91f Combined several scripts into generate_headers.py
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-26 01:00:26 +02:00
jowr
fb5c56a937 Incompressibles passed all tests 2014-06-24 16:55:02 +02:00
jowr
de03057f48 Added the first incompressible test cases and it seems to work... 2014-06-23 17:34:37 +02:00
Ian Bell
1ee68e7a28 CoolPropTools.h
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-21 00:00:40 +02:00
Ian Bell
35ec080139 CoolPropTools.h
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-20 23:58:58 +02:00
jowr
864df6d590 Double-checked entropy equations 2014-06-20 17:02:44 +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
5c5e077a66 Added COOLPROP_LIB and CONVENTION=__cdecl to static library. Will only impact c-style exports, so should be safe.
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-20 13:06:39 +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
jowr
c7a28152ad Ready to merge to incompressibles 2014-06-20 10:26:20 +02:00