Commit Graph

246 Commits

Author SHA1 Message Date
Ian Bell
1d16cc14e1 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-06-10 00:09:30 +02:00
Ian Bell
47486f81e0 Fixed creation of src folder for GCC builds
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-10 00:09:00 +02:00
Ian Bell
db6e794dba Now octave works on xubuntu with main CMake file - have to mkdir src folder - not sure why. 2014-06-09 23:58:29 +02:00
Ian Bell
62e9a2d4de Octave wrapper works on windows with MINGW builds of Octave
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-09 23:46:43 +02:00
Ian Bell
895c1de278 CMake now working for 64-bit DLL 32-bit/cdecl DLL and 32-bit/stdcall DLL. Swig ones are next.
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-09 21:08:04 +02:00
Ian Bell
a866ad88a3 EES DLF file can now build using CMake - works
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-09 19:50:10 +02:00
Ian Bell
1fd88a8087 Updated a few melting lines
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-09 18:44:10 +02:00
Ian Bell
64946e6017 Added melting lines for many fluids - nearly all that are in REFPROP
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-09 15:48:52 +02:00
Ian Bell
2b32a18e13 Updated .gitignore
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-08 22:40:17 +02:00
Ian Bell
3bfbecd6f8 Added IncompressibleFluid.h
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-08 21:31:47 +02:00
Ian Bell
8b43f59eae Fixed relative paths for copying Catch header
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-08 21:22:54 +02:00
Ian Bell
9d80e4aa37 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-06-08 21:16:08 +02:00
Ian Bell
6b27b5675e Copy Catch header as part of build process
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-08 21:15:16 +02:00
Ian Bell
ec04f41ba4 Update README.rst 2014-06-08 20:39:09 +02:00
Ian Bell
a98041e506 Added README.rst for buildbot instructions 2014-06-08 20:37:16 +02:00
Ian Bell
b5c447ed6b Updated web stuff
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-06 21:46:25 +02:00
Ian Bell
e45bee6267 Updated code::blocks project
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-06 21:38:15 +02:00
Ian Bell
b9582a45e1 Added structure of incompressible library and backend - the core is there, implementation is empty.
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-06 21:22:48 +02:00
Ian Bell
9093f636b1 speed of sound added back to high level wrapper
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-06 21:21:12 +02:00
Ian Bell
50ca26842e Decreased step size in numerical derivative for Helmholtz tester
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-06 21:19:42 +02:00
Ian Bell
514e406eea Fixed dDelta3 for Gaussian Helmholtz term (70 tests fail)
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-06 19:05:13 +02:00
Ian Bell
da7b9c7793 docs for dTau3 derivation from Lemmon2005
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-06 18:54:35 +02:00
Ian Bell
69c21800bb Fixed derivatives for Lemmon2005
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-06 18:51:39 +02:00
Ian Bell
356e0a6897 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-06-06 14:22:47 +02:00
Ian Bell
9ed1fdadb7 Updated web files
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-06 14:22:39 +02:00
Ian Bell
37549787af Fixed loading bugs of new JSON files
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-06 14:13:08 +02:00
Ian Bell
6e287e9454 Update parsing of the fluid JSON files for the new state architecture
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-06 12:05:55 +02:00
Ian Bell
7896845a5d Added minimum saturation states to fluid files
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-06 10:01:09 +02:00
Ian Bell
88ec40895c Added triple point states
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-06 09:48:33 +02:00
Ian Bell
d5f9c0a382 critical state moved into STATES in json files
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-06 09:29:25 +02:00
jowr
132c9b602e More TTSE stuff 2014-06-05 13:21:53 +02:00
Ian Bell
81cea06746 JSON packaging is slightly improved - no injection every time; Build incompressible JSON library
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-05 11:14:31 +02:00
Ian Bell
eba0b9c0f0 Fixed typo in incompressible fluid files
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-05 11:11:35 +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
072f1eb9aa Fixed SF6 based on information from Marcia Huber
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-03 23:12:16 +02:00
Ian Bell
abc9aa872c Removed old Code::Blocks project 2014-06-03 22:24:27 +02:00
Ian Bell
51389300e6 Moved coolprop project file 2014-06-03 22:20:54 +02:00
Ian Bell
a45765ae8f Fixed to shared_ptr header
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-03 22:02:51 +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
Ian Bell
a82160c4bf Clean up shared_ptr mess
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-03 21:34:26 +02:00
Ian Bell
1bd5088dab Added Code::Blocks project
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-03 21:33:42 +02:00
Ian Bell
bffb36cc41 Merge branch 'master' of https://github.com/coolprop/coolprop
Conflicts:
	src/Helmholtz.cpp
	src/main.cxx

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-03 21:01:50 +02:00
Ian Bell
aa76065f5a Updated coefficient for transport correlations, HS reference code in main.cxx
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-03 20:59:55 +02:00
Ian Bell
cb497b443c Added crossplatform_shared_ptr to allow shared_ptr cleanly on all architectures without needing variable namespace definition 2014-06-03 20:58:24 +02:00
Ian Bell
a7363b067c Merge remote-tracking branch 'origin/master' 2014-06-03 20:28:48 +02:00
Ian Bell
5e288cb8bf More reliable platform determination 2014-06-03 20:25:49 +02:00
Ian Bell
781fb5b47a Slight improvement in water critical conductivity term - all within 0.02% error now
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-03 18:52:54 +02:00
Ian Bell
331690de8c Water viscosity can now be evaluated at the critical point
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-03 17:49:23 +02:00
Ian Bell
a069e68720 Fixed limit for R123 conductivity validation
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-03 17:01:51 +02:00
Ian Bell
3ff3dc898a Relaxed viscosity at critical point to account for not using critical contribution to viscosity (same as in REFPROP)
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-03 16:58:28 +02:00