Commit Graph

2365 Commits

Author SHA1 Message Date
Ian Bell
230c508460 Implement brainstorming for what input pairs will be supported for TTSE
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2015-02-23 20:23:06 -07:00
Ian Bell
bea9f8ad6b Merge branch 'master' into tabular 2015-02-22 23:34:39 -07:00
Ian Bell
aff594bb25 Fix reducing state access for REFPROP; closes #487
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2015-02-22 23:11:40 -07:00
Ian Bell
7361d715ef Refactored HAPropsSI and broke up into inputs and outputs parts; Closes #485
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2015-02-22 22:57:49 -07:00
Ian Bell
273ab276c9 Update TTSE checking script
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2015-02-22 21:39:25 -07:00
Ian Bell
66508262f9 Higher maximum enthalpy for gridded logph table
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2015-02-22 21:38:59 -07:00
Ian Bell
a43693de58 Single-phase HmolarP_INPUTS are working with TTSE 2015-02-22 21:08:32 -07:00
Ian Bell
58519d5fbf Good progress on tabular interpolation code - single-phase tables can be constructed and written to file and then reloaded 2015-02-22 02:27:13 -07:00
Ian Bell
2b7638bd53 Merge pull request #488 from mikekaganski/master
Some more static analyser warning fixes
2015-02-21 22:55:10 -07:00
mikekaganski
2bcfdf824c Simplify exception handling 2015-02-22 15:10:08 +10:00
mikekaganski
9710d80581 One leftover to previous commit 2015-02-22 15:01:58 +10:00
mikekaganski
0e3a9fe9af Fix static analyzer warnings "Local declaration hides local"
C6246 Local declaration hides local Local declaration of 'z' hides
declaration of the same name in outer scope. For additional information,
see previous declaration at line '187' of
'd:\documents\github\coolprop\src\coolprop.cpp'. CoolProp coolprop.cpp
230
C6246 Local declaration hides local Local declaration of 'fluid' hides
declaration of the same name in outer scope. For additional information,
see previous declaration at line '852' of
'd:\documents\github\coolprop\src\coolprop.cpp'. CoolProp coolprop.cpp
871
C6246 Local declaration hides local Local declaration of 'options' hides
declaration of the same name in outer scope. For additional information,
see previous declaration at line '743' of
'd:\documents\github\coolprop\src\backends\helmholtz\flashroutines.cpp'.
CoolProp flashroutines.cpp 778
C6246 Local declaration hides local Local declaration of 'h1' hides
declaration of the same name in outer scope. For additional information,
see previous declaration at line '1338' of
'd:\documents\github\coolprop\src\backends\helmholtz\flashroutines.cpp'.
CoolProp flashroutines.cpp 1367
C6246 Local declaration hides local Local declaration of 'el' hides
declaration of the same name in outer scope. For additional information,
see previous declaration at line '250' of
'd:\documents\github\coolprop\src\helmholtz.cpp'. CoolProp helmholtz.cpp
259
C6246 Local declaration hides local Local declaration of 'y' hides
declaration of the same name in outer scope. For additional information,
see previous declaration at line '1649' of
'd:\documents\github\coolprop\src\backends\helmholtz\helmholtzeosmixturebackend.cpp'.
CoolProp helmholtzeosmixturebackend.cpp 1756
C6246 Local declaration hides local Local declaration of 'iclosest'
hides declaration of the same name in outer scope. For additional
information, see previous declaration at line '415' of
'd:\documents\github\coolprop\src\backends\helmholtz\phaseenveloperoutines.cpp'.
CoolProp phaseenveloperoutines.cpp 467
C6246 Local declaration hides local Local declaration of 'crit' hides
declaration of the same name in outer scope. For additional information,
see previous declaration at line '181' of
'd:\documents\github\coolprop\src\backends\helmholtz\vleroutines.cpp'.
CoolProp vleroutines.cpp 284
C6246 Local declaration hides local Local declaration of 'crit' hides
declaration of the same name in outer scope. For additional information,
see previous declaration at line '925' of
'd:\documents\github\coolprop\src\backends\helmholtz\vleroutines.cpp'.
CoolProp vleroutines.cpp 950
2015-02-22 14:43:57 +10:00
mikekaganski
75b7d51f59 Return result of redirect_stdout to user
What happens if stdout had been closed and not reopen?
2015-02-22 13:58:00 +10:00
mikekaganski
b576789870 More compact and performant way to avoid NULL in fractions_ptr
I suppose it is preferrable because:
1. It stops as soon as the problem is apparent;
2. It avoids extra checks (tiny speed-up)
3. It is more compact.
2015-02-22 13:50:06 +10:00
Ian Bell
a7a14d7781 Update setup.py for python building
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2015-02-21 17:50:06 -07:00
Ian Bell
945f095c71 Added msgpack-c include path to CMakeLists.txt 2015-02-21 17:41:24 -07:00
Ian Bell
6fa33422b4 Update codelite project
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2015-02-21 17:36:57 -07:00
Ian Bell
8a1ce06f62 Writing to single-phase tabular tables works now using msgpack-c
Packed data can be read back into python using something like

``` python
import json
import msgpack
import numpy as np
import matplotlib.pyplot as plt

with open(r'C:\Users\Belli\Documents\Code\coolprop-v5-new\dev\codelite\Debug\single_phase.bin','rb') as fp:
    i, matrices = msgpack.load(fp)
    T,h,p,rho = np.array(matrices['T']), np.array(matrices['hmolar']), np.array(matrices['p']), np.array(matrices['rhomolar'])
    T[np.logical_or(np.isnan(T),np.isinf(T))] = np.nan
    rho[np.logical_or(np.isnan(rho),np.isinf(rho))] = np.nan
    h[np.logical_or(np.isnan(h),np.isinf(h))] = np.nan
    p[np.logical_or(np.isnan(p),np.isinf(p))] = np.nan

    plt.scatter(T, np.log(p), c = rho, linewidths = 0)
    plt.show()
```
2015-02-21 17:34:27 -07:00
Ian Bell
aef97f9755 Lots of little changes to squelch warnings
Closes #484
Closes #483

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2015-02-21 14:39:25 -07:00
Ian Bell
5c955d8bf3 Document which parameters are available in Props1SI; closes #471 2015-02-21 13:31:14 -07:00
Ian Bell
7cb2508192 Merge branch 'master' of https://github.com/coolprop/coolprop 2015-02-21 12:58:32 -07:00
Ian Bell
e2110153aa Finished cleanup of HAPropsSI internal code for now; Closes #468
Removed a lot of string comparisons, more can still be removed by making a function _HAPropsSI that takes enum values.  Should do this anyway

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2015-02-21 12:58:10 -07:00
Jorrit Wronski
d438d42eb8 ... they really are. 2015-02-21 19:59:46 +01:00
Jorrit Wronski
d35c17a435 PGF plots are a pain. 2015-02-21 19:58:42 +01:00
Ian Bell
bcecb774c2 Merge branch 'master' of https://github.com/coolprop/coolprop 2015-02-21 11:26:37 -07:00
Ian Bell
6d2f52f230 Squashed bugs found by @mikekaganski; See #483
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2015-02-21 11:26:24 -07:00
Jorrit Wronski
5ae43f32a9 Minor adjustments in Python plots and snippet that fixes #482 2015-02-21 18:09:32 +01:00
Ian Bell
0504516a01 Try to make release shared library and verbose makefiles again
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2015-02-20 21:51:34 -07:00
Ian Bell
82277c4f44 Remove unused variable; See #479
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2015-02-20 21:14:15 -07:00
Ian Bell
4b07026b36 Humid air transport evaluated at T,P for both water and air; Closes #470 2015-02-19 22:30:11 -05:00
Ian Bell
485f296fcd Fix bug with relative humidity
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2015-02-19 22:05:54 -05:00
Ian Bell
64c515cbab Merge branch 'master' of https://github.com/coolprop/coolprop 2015-02-19 22:02:13 -05:00
Ian Bell
ff614a923b Clean up relative humidity function; closes #479
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2015-02-19 22:02:01 -05:00
Ian Bell
0d782a1ead Slight wording change to Julia docs 2015-02-19 21:47:43 -05:00
Ian Bell
651363f221 Merge pull request #478 from JonWel/Julia-0.3-wrapper
Julia 0.3 wrapper
2015-02-19 21:46:44 -05:00
Ian Bell
b89f8f99fc Update the docs for SMath wrapper
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2015-02-19 21:45:12 -05:00
Ian Bell
6fc667ef80 Fix coolprop version encoded into SMath wrapper
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2015-02-19 21:40:26 -05:00
Ian Bell
60c46812dd Fix build_zip.bat.template for SMath Studio
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2015-02-19 21:26:38 -05:00
Ian Bell
1189142e82 Merge branch 'master' of https://github.com/coolprop/coolprop 2015-02-19 21:23:30 -05:00
Ian Bell
022b23cf63 Repair the revision to include the patch string ("dev" for instance)
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2015-02-19 21:22:47 -05:00
JonWel
4bd84ca19f Updated Julia config to match the new folder
wrappers/Julia/CoolProp.jl for Julia 0.4 and upper
wrappers/Julia/0.3/CoolProp.jl for Julia 0.3 and lower
2015-02-19 14:29:20 +01:00
JonWel
5c0c2ee330 Update index.rst
Add information about the separation of the wrapper in two versions.
2015-02-19 14:23:01 +01:00
JonWel
e8f5f29bc8 Delete CoolProp.jl
Moved to the Julia folder
2015-02-19 14:16:10 +01:00
JonWel
c4c57ccf8d Create CoolProp.jl
For Julia 0.4 an upper
2015-02-19 14:15:39 +01:00
JonWel
9c002660a2 Create CoolProp.jl 2015-02-19 14:00:10 +01:00
JonWel
627c2a1fbe Delete CoolProp.jl
Moved to 0.4+
2015-02-19 13:59:47 +01:00
JonWel
89f4c143de Merge pull request #1 from CoolProp/master
Update
2015-02-19 13:57:08 +01:00
Jorrit Wronski
3c65e96fc7 Added correct URL to close #476 2015-02-19 10:06:25 +01:00
Ian Bell
2717536bb6 Update docs
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2015-02-19 00:30:06 -05:00
Ian Bell
088b6c0723 config.ini should only include version number, no newline
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2015-02-19 00:28:50 -05:00