github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-02-09 05:15:45 -05:00
Code Issues Packages Projects Releases Wiki Activity
45 Commits 36 Branches 30 Tags
33b719bf11da70138c12a92bc9f4c23702bfb7b1
Commit Graph

45 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ian bell
d9d75b9280 nocache version of the derivatives; proper destruction of the the SatL and SatV classes 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-15 22:30:08 +02:00
Ian bell
d1ecc0293e Removed Props1 function for now, might put it back 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-15 22:28:56 +02:00
Ian bell
d39ec1d4b7 Fixed destructor for CoolPropFluid 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-15 22:28:14 +02:00
Ian bell
59c7b95a30 Added missing string.h header include 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-15 22:27:32 +02:00
Ian bell
df0127edea Updated speed test (does it work? not sure) 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-15 22:26:22 +02:00
Ian bell
9e5ce10e25 Renamed Cmake example file so that it doesn't get compiled in cpp search 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-15 22:24:49 +02:00
Ian bell
1f7c67ae7a Doxygen now spits out tag files 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-15 22:24:02 +02:00
Ian bell
c20676537b Updated .gitignore to allow us to commit .lib files needed for EES 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-15 22:23:08 +02:00
Ian bell
4cbac1c1af Web files now use doxylink to allow us to cross-reference to doxygen things from Sphinx files. 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-15 22:22:31 +02:00
Ian bell
5edd9415ba Updated script to generate constants module by parsing the parameters enum 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-15 22:21:15 +02:00
Ian bell
0d7d17b9d8 Updated Javascript builder 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-15 22:20:40 +02:00
Ian bell
56ccdbc4ac Renamed python wrapper files for now to CoolProp5 - python wrapper is coming together. Dropped xdress and building it manually. 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-15 22:19:53 +02:00
Ian bell
7099c5b8fb Added updated nice wrapper for EES 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-15 22:16:39 +02:00
jowr
4f4904cd22 PolyMath generalisation 2014-05-15 19:17:15 +02:00
jowr
849da310e2 PolyMath is not fully implemented, but seems to work. There is a main method for testing. 2014-05-15 19:01:28 +02:00
jowr
3245b7ab74 Did we get anywhere with Polymath? 2014-05-15 18:34:33 +02:00
Ian bell
74520911dd Moved Fluids into the Helmholtz backend folder and corrected includes 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-14 13:24:39 +02:00
Ian bell
e32b074fc6 Reorganized backends folder 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-14 13:09:36 +02:00
Ian bell
f92c86da52 Docs for FlashRoutines.h 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-14 13:04:26 +02:00
Ian bell
b3847c7522 Initial commit for v5, but this time with the right line endings 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-14 12:46:24 +02:00