Commit Graph

196 Commits

Author SHA1 Message Date
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
Ian Bell
bbcc76771f Rename README.rst to README.md 2014-06-02 08:56:09 +02:00
Ian Bell
d537899bf0 Docs for factory function
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-01 21:59:43 +02:00
Ian Bell
06066c52f0 Reference state can now be set to one of IIR, ASHRAE, NBP or RESET. Still need to allow for default reference state values to agree with REFPROP.
Docs updated.

Still need to implement setting state based on numerical values.

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-01 21:43:25 +02:00
Ian Bell
02f24549e4 Docs for get_fluid_param_string 2014-06-01 20:49:50 +02:00
Ian Bell
261ec01c71 Added REFPROP names for all fluids - renovated get_fluid_param_string 2014-06-01 20:20:33 +02:00
Ian Bell
3168f15efc Implemented dDelta3; test passes
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-01 19:46:30 +02:00
Ian Bell
c468339768 Implemented test for GERG 2008 residual term and changed include from <tr1/memory> to <memory>
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-01 19:29:09 +02:00
Ian Bell
eef1f9d315 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-05-30 17:17:06 +02:00
Ian Bell
fdd329fb7b main.cxx update
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-30 17:15:33 +02:00
Ian Bell
873eab5baa Helmholtz derivative testing gives almost 100% coverage - missing HS offset term
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-30 17:13:23 +02:00
Ian Bell
c63b0e95e2 Implemented conductivity for CO2 from Scalabrin. All CO2 tests pass now.
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-30 15:16:32 +02:00
Ian Bell
9e72f88d7d Merge remote-tracking branch 'origin/master' 2014-05-30 12:03:13 +02:00
Ian Bell
10aaae4649 Added tr1/memory include for linux compilation 2014-05-30 12:02:32 +02:00
Ian Bell
9ac42beb4c Update README.rst 2014-05-30 11:36:17 +02:00
Ian Bell
b5f0227392 Update README.rst
Instructions for how to get VxWorks PPC cross-compiler
2014-05-30 11:35:16 +02:00
jowr
29ba6cf86f Added more plotting routines 2014-05-29 20:06:23 +02:00
Ian Bell
43255cfd5f Docs for abstract state
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-28 19:55:05 +02:00
Ian Bell
7b8606f323 No more deletes used anywhere in the codebase. Only std::tr1::shared_ptr are used. Should be portable solution.
All tests run, no memory leaks according to VLD

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-28 19:45:04 +02:00
Ian Bell
d023f1ed99 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-05-28 19:15:53 +02:00
Ian Bell
f93aa76210 ECS conductivity work - nearly works, just need to sort out the conformal state solver.
Goodbye to AbstractStateWrapper - can use std::tr1::shared_ptr, much nicer

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-28 19:15:34 +02:00
jowr
4e12c4cdf4 Added TTSE scripts, just a starting point 2014-05-28 18:28:30 +02:00
Ian Bell
118d7e9ad2 Set critical parameters in the CoolPropFluid class
Pre-processing of R124 viscosity is all working

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-28 14:34:48 +02:00
Ian Bell
cb15a00699 Added critical parameters for all fluids from CoolProp 4.2
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-28 13:07:35 +02:00
Ian Bell
3367b089fd First cut at adding code for ECS for viscosity. Starting with R124 2014-05-28 12:57:30 +02:00
Ian Bell
d741df4e2d All fluid specific transport property correlations implemented - a few tests fail still, need to figure out why
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-27 18:30:30 +02:00
Ian Bell
bb4035467e Added ammonia conductivity
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-27 11:49:46 +02:00
Ian Bell
c2a1fa7317 R23 conductivity hardcoded
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-27 10:00:28 +02:00