Ian bell
de78977e76
Merge branch 'master' of https://github.com/coolprop/coolprop
2014-05-18 22:09:42 +02:00
Ian bell
23e846e38e
Baby steps towards transport properties.
2014-05-18 22:09:29 +02:00
jowr
70fdcf2613
Added build directory to ignore, more on polymath and incompressibles
2014-05-18 17:23:15 +02:00
Ian bell
8987cf3954
Merge branch 'master' of https://github.com/coolprop/coolprop
2014-05-18 01:20:46 +02:00
Ian bell
0aa3a8d404
Fixed json packing on py2.7
...
Signed-off-by: Ian bell <ian.h.bell@gmail.com >
2014-05-18 01:20:32 +02:00
Ian bell
1c5d9a44b6
Fixed Cmake file on windows
...
Signed-off-by: Ian bell <ian.h.bell@gmail.com >
2014-05-18 01:20:10 +02:00
Ian Bell
69a3e5409c
Merge branch 'master' of https://github.com/CoolProp/CoolProp
2014-05-18 00:11:04 +02:00
Ian Bell
8328c271c6
Fixed initialization bug, Octave example compiles and runs on linux now
2014-05-18 00:10:51 +02:00
Ian Bell
2a24f7a192
Merge pull request #29 from Rod-Persky/cmake
...
Cmake
2014-05-17 23:45:19 +02:00
Ian bell
ca68a2356b
Fixed generate_headers.py machinery on py3; More fluid surface tension injected
...
Signed-off-by: Ian bell <ian.h.bell@gmail.com >
2014-05-17 23:44:13 +02:00
Ian Bell
50c4e054f9
Cmake file for Octave works, but seg faults on ubuntu (?)
2014-05-17 22:39:22 +02:00
Ian Bell
18759d1b13
Fixed header generator (typo)
2014-05-17 22:37:59 +02:00
Ian bell
7e34a8550a
Merge branch 'master' of https://github.com/coolprop/coolprop
2014-05-17 19:54:42 +02:00
Ian bell
eeab8e18fe
Use cpversion.h instead of version.h to reduce name clashing in headers
...
Signed-off-by: Ian bell <ian.h.bell@gmail.com >
2014-05-17 19:54:28 +02:00
Ian bell
d23e9447fa
First cut at octave + Cmake. Seems there is a problem with MSVC and octave now - used to work.
...
Signed-off-by: Ian bell <ian.h.bell@gmail.com >
2014-05-17 19:51:32 +02:00
Rod Persky
8f3f6566f6
Update .travis.yml
2014-05-18 01:19:14 +10:00
Rod Persky
8fec6fec13
Update .travis.yml
2014-05-18 01:13:09 +10:00
Rod Persky
d92c6c5ba1
Update .travis.yml
...
Change language to cpp
2014-05-18 01:08:35 +10:00
Rod Persky
ffe6cb4e2d
remove old cmakelists from src/
2014-05-18 00:03:47 +10:00
Rod Persky
0c2068277d
Update travis to debug config and be more verbose
2014-05-17 23:35:13 +10:00
Rod Persky
fd43d3848b
working
2014-05-17 18:13:30 +10:00
Rod Persky
ed98e56ad8
fix
2014-05-17 18:10:25 +10:00
Rod Persky
56c68664ed
fix
2014-05-17 18:09:49 +10:00
Rod Persky
affa330456
fix
2014-05-17 18:01:16 +10:00
Rod Persky
cb1de19840
fix
2014-05-17 17:57:30 +10:00
Rod Persky
33b719bf11
travis
2014-05-17 17:52:41 +10:00
Rod Persky
58aa23c95b
test travis
2014-05-17 17:44:21 +10:00
Rod Persky
e9e4f5d824
match PolyMath.cpp old
...
Define -DCATCH_CONFIG_MAIN in src/PolyMath.cpp using the cmake build
2014-05-17 17:13:14 +10:00
Rod Persky
38a21932ed
PolyMath.cpp
...
If this is the test entry point should define this in a makefile with -D
or in the cmake file. Then it's more clear? unless this is absolutely needed
2014-05-17 17:06:27 +10:00
Rod Persky
ffd9c007e5
CMake
...
Can now compile with catch with no errors, although there are errors within the
test cases. Also added a check in the generate_headers.py file to see if the
headers have already been generated (this is a proposal and can be removed)
because it's time consuming when there is no changes to those files. the change
is fairly dumb (check if file .JSON_done exists) and doesn't consider the
modification time of the files.
2014-05-17 17:00:38 +10:00
Rod Persky
f41dbe60e2
added dl
2014-05-17 12:34:34 +10:00
Rod Persky
baaf197fd0
CmakeLists
...
playing to try and get catch to build
2014-05-17 11:48:57 +10:00
Rod Persky
fb29df56e7
Updated CMakeLists.txt
...
CMakeLists with prebuild only worked with vs, now using dependency instead. Also findpythoninterp wasn't correcly getting the desired python version, fixed to select python 2.7. Test exec definition also moved around a tad, code is missing catch thouth which is an issue?
2014-05-17 11:09:50 +10:00
jowr
47bb064717
Playing with CMake...
2014-05-16 13:47:49 +02:00
Ian bell
312744f14d
Merge branch 'master' of https://github.com/coolprop/coolprop
2014-05-16 12:08:33 +02:00
Ian bell
5f591e4931
Updated Catch Macro blocks
...
Signed-off-by: Ian bell <ian.h.bell@gmail.com >
2014-05-16 12:08:21 +02:00
jowr
8e71eebc3b
Added catch tests for polymath
2014-05-16 11:45:25 +02:00
jowr
a884794457
Started on tests
2014-05-16 10:04:04 +02:00
Jorrit Wronski
55c8a292fa
Merge pull request #25 from Rod-Persky/python-args
...
Added parameter for path to JSON_to_CPP.py
2014-05-16 09:13:22 +02:00
Jorrit Wronski
6081d63bc1
Merge pull request #27 from Rod-Persky/cmake
...
Cmake
2014-05-16 09:12:51 +02:00
Rod Persky
df425fba4a
readme stub in dev/
...
Basic description of how to build coolprop.
2014-05-16 16:48:28 +10:00
Rod Persky
89d566a2fc
corrected dynamic headers program
...
JSON_to_CPP replaced with generate_headers.py. See python-args branch
and #1
2014-05-16 16:38:37 +10:00
Rod Persky
cd571e6797
Path
...
generate_headers.py may not be called from the correct path, so get the
path of generate_headers.py and determine the base path from there
assuming generate_headers.py will be in dev/
2014-05-16 16:36:44 +10:00
jowr
d830f8a835
Fixed a path typo (Windows, Windows...)
2014-05-16 08:15:27 +02:00
Jorrit Wronski
3f6a8d124f
Merge pull request #26 from Rod-Persky/cmake
...
Added cmake. Thank you for the contribution. We thought about CMake for a while, but I never got it to work properly. I am sure there will be some more questions very soon, but I'll merge it for now. Thanks again!
2014-05-16 08:00:16 +02:00
Rod Persky
b54ea14027
Added cmake
...
CMakeLists.txt is usually placed in the root folder, this is a basic
cmake file that will do everything nessesary to build the program as
either as a library of another program or by itself.
2014-05-16 15:56:46 +10:00
Rod Persky
cad756ba18
Added parameter for path to JSON_to_CPP.py
...
set path through --path that is the root directory for the code. The
default is None as this was the previous behavior, however this does not
make sense.
Also the path name is normalised as, depending on OS there is confusion
on slash direction.
2014-05-16 15:43:42 +10:00
Ian bell
463c40fcf0
Small work on the docs - doxylink needs to be fed an absolute path, but otherwise seems good. Might need to generate the absolute path at runtime somehow. Its different between local and remote locations of HTML.
...
Signed-off-by: Ian bell <ian.h.bell@gmail.com >
2014-05-15 23:43:58 +02:00
Ian bell
cb315930b7
EES wrapper progress - going to be super nice, easy to handle mixtures
...
Signed-off-by: Ian bell <ian.h.bell@gmail.com >
2014-05-15 22:54:55 +02:00
Ian bell
703bbfcec1
Merge branch 'master' of https://github.com/coolprop/coolprop
2014-05-15 22:30:54 +02:00
