github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-02-08 21:05:14 -05:00
Code Issues Packages Projects Releases Wiki Activity
223 Commits 36 Branches 30 Tags
356e0a6897dfa22349ad9ef88041fcfc414744a1
Commit Graph

223 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ian Bell
5101ac01dd Implemented the Helium critical conductivity using REFPROP coefficients - relaxed tolerances on testing values due to uncertainty of origin of coefficients and other issues 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-03 16:31:28 +02:00
Ian Bell
71c8875df4 Added tests for the reference states for fluids in REFPROP 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-03 15:38:38 +02:00
Ian Bell
13ba2cfc82 Updated reference states for a few fluids 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-03 15:37:56 +02:00
Ian Bell
cf3158fa06 Fixed bug in Aly-Lee extend function (skipped new elements) 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-03 15:36:59 +02:00
Ian Bell
615c641530 Added asserts for the lengths of the residual HE vectors loaded 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-03 14:34:34 +02:00
Ian Bell
6e7cf60aee Fixed bug in Helmholtz energy Lemon2005 term (was using integer powers rather than the correct power) 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-03 14:32:02 +02:00
Ian Bell
17bffeb91f Added failing tests for same reference state between REFPROP and Coolprop for enthalpy and entropy 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-03 12:54:57 +02:00
Ian Bell
b78439b72c Added passing tests for generalized PE term 2014-06-03 12:54:26 +02:00
Ian Bell
daed4b862b NBP reference states are now set 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-03 12:27:30 +02:00
Ian Bell
44a97e9fcb Added docs for conversion of PlankEinstein and PlanckEinstein2 forms to generalized form 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-03 12:25:24 +02:00
Ian Bell
bff7e2afeb PlanckEinstein and PlanckEinstein2 classes replaced with PlanckEinsteinGeneralized. Docs to follow. 
Aly-Lee not yet removed.  Next step.

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-03 12:04:16 +02:00
Ian Bell
6db102b47f Merge branch 'master' of https://github.com/coolprop/coolprop 2014-06-02 21:18:48 +02:00
Ian Bell
92f6f7c20b Added derivation for Plank-Einstein generalized form - will work nicely, simplifying PlanckEinstein, PlankEinstein2 and Aly-Lee all into one form. To be implemented tomorrow. 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-02 21:18:30 +02:00
jowr
d0dcad755b Changed to R245fa, things start to look worse... 2014-06-02 17:14:08 +02:00
jowr
2c41fc6eb7 Cleaning the script 2014-06-02 17:14:08 +02:00
jowr
aa4889cc4a More graphs to determine the TTSE ranges 2014-06-02 17:14:07 +02:00
Ian Bell
5accf645d9 IIR HS references set for real this time 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-02 13:21:06 +02:00
Ian Bell
409e2a2d1f Fluids using IIR reference state now all agree with REFPROP 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-02 13:03:17 +02:00
Ian Bell
f830d93b33 Fixed CPO for HFE143m.json 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-02 11:42:02 +02:00
Ian Bell
61b2f28c0b Added mass-based high-level functions for h,s,u, etc. 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-02 09:59:18 +02:00
Ian Bell
cf14301f60 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-06-02 09:01:16 +02:00
Ian Bell
8e14022ddd Update README.md 2014-06-02 08:59:54 +02:00
Ian Bell
ae715f9b22 Update README.md 2014-06-02 08:59:12 +02:00