github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-04-23 03:00:17 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,874 Commits 47 Branches 30 Tags
f4bbb244716f9471b520f53ebffaf34a31503cd1
Commit Graph

4874 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ian Bell
f4bbb24471 Remove unused imports (besides they are Py 2.x only) 2019-01-11 22:34:24 -07:00
Ian Bell
5978731374 Should be an error if docker run fails 2019-01-11 22:00:49 -07:00
Ian Bell
94d862eea9 Fix bind mount path 2019-01-11 21:35:03 -07:00
Ian Bell
a73e447f92 Revert changes for FMT; should have been done in branch (sorry @jowr) 2019-01-11 21:27:56 -07:00
Ian Bell
bfb11aaa43 Fix path for docker compose 2019-01-11 21:22:55 -07:00
Ian Bell
70b618345f Two missing FMT libraries 2019-01-11 21:08:34 -07:00
Ian Bell
a83b13d05c Python should add FMT header only? 2019-01-11 20:57:44 -07:00
Ian Bell
aabca1275d Another missing include 2019-01-11 20:30:16 -07:00
Ian Bell
7410947713 Fix some windows build failures 2019-01-11 20:27:46 -07:00
Ian Bell
b1fd926ef3 First attempt at moving FMTLIB away from header-only; speed up builds maybe? 2019-01-11 20:01:01 -07:00
Ian Bell
8419fd846d Put R back into CMakeLists.txt (oops) 2019-01-11 19:46:25 -07:00
Ian Bell
1a0447dc7a Goodbye to MATLAB and scilab info in CMakeLists.txt; all support is via Python 2019-01-11 19:37:22 -07:00
Ian Bell
e1c50fbb59 Fix typo in buildbot config 2019-01-11 19:21:04 -07:00
Ian Bell
1cbacf25eb Stop on any error 2019-01-11 19:06:35 -07:00
Ian Bell
b5da19706a Fix typo in master.cfg 2019-01-11 19:03:50 -07:00
Ian Bell
1d8939d378 Switch over to new documentation builder 2019-01-11 19:02:14 -07:00
Ian Bell
7b8314671f Add changes to consistency plots: 2019-01-11 18:58:28 -07:00
Ian Bell
0749936bc3 Use new linux example runner 2019-01-11 18:58:28 -07:00
Ian Bell
51449edef1 Switch over to new example script 2019-01-11 18:58:28 -07:00
Ian Bell
037e587f41 Fix execfile in Python 3 2019-01-11 18:58:28 -07:00
Ian Bell
f6ae1499e2 Added files to run doc generation 2019-01-11 18:58:28 -07:00
Ian Bell
93a1729ff7 Fix bug with conditional 2019-01-11 18:58:28 -07:00
Ian Bell
feacf2abf3 Make example runner run in python 3 on linux 2019-01-11 18:58:28 -07:00
spinnau
cd48615207 Make wrapper for LibreOffice an extension (#1773) 
* Make wrapper for LibreOffice an extension

The LibreOffice wrapper is changed to be a real extension for LibreOffice.
Just as with the current solution, Python is used for the calculations in
the background.

* The extension now contains the complete wrapper code. Thus, there is
  no need anymore to use a special prepared LibreOffice template file.

* The wrapper is extended to contain all high-level interface functions
  and includes descriptions for the cell formulas.

* The extension contains a helper function to download and install the
  CoolProp Python package within the extension directory. This function
  can be called from the LibreOffice options menu. On macOS the Python
  certifi package will be used to verify certificates for https downloads.

* Update web documentation for new LibreOffice extension

* Installation and usage instructions

* Create CMake target for building of the LibreOffice wrapper

* Prepare and bundle all files as .oxt extension file
 2019-01-11 12:16:08 -07:00
Jorrit Wronski
fe7c8f1805 Feature/recent compilers (#1783) 
This fixes many issues: 
- Python packages can be built with XCode 10, closes #1782 
- Handling of CMake options for OSX stdc++ is streamlined
- TR1 warnings from MSVC 2017 have been silenced
- Nightly builds fixed, closes #1778 
- Documentation builds fixed, closes #1762 
- Python source packages are updated with recent Cython, closes #1777
 2019-01-11 11:42:55 +01:00
Ian Bell
277d86b9c0 A little tolerance for the melting line 2019-01-10 22:24:15 -07:00
Ian Bell
5e900a8310 Fix typo with Householder call 2019-01-10 20:46:15 -07:00
Ian Bell
502bf0b506 Reduce the number of includes from DataStructures.h 2019-01-10 20:45:44 -07:00
Ian Bell
b0b9fe47be Updated EOS from Ryo Akasaka for R-1234ze(Z) 2019-01-10 20:44:24 -07:00
Ian Bell
54dab7e73a Fix R path 2019-01-10 15:49:21 -07:00
Ian Bell
9edec452df Fix .so prefix for OSX 2019-01-10 15:22:42 -07:00
Ian Bell
30b0aea348 Add some more pure-virtual destructors 2019-01-10 14:58:13 -07:00
Ian Bell
aee1aaffdc Remove --use-wheel option (removed) 2019-01-10 14:40:21 -07:00
Ian Bell
900b3c9bae A real virtual destructor this time 2019-01-10 14:34:02 -07:00
Ian Bell
957f7c6191 Added virtual destructor to silence warnings 2019-01-10 14:33:31 -07:00
Ian Bell
7479175fc6 Typo in setup.py 2019-01-10 14:27:00 -07:00
Ian Bell
6c46d7d257 A possibly naive solution for 10.14 2019-01-10 14:23:48 -07:00
Ian Bell
4990c934ea Fix typo 2019-01-10 13:28:31 -07:00
Ian Bell
76c4f05cba Fallback to /opt/refprop by default on non-windows 2019-01-10 13:25:24 -07:00
Ian Bell
477b9db463 Also print out the REFPROP loading error 2019-01-10 13:17:01 -07:00
Ian Bell
4ba2492f80 Get Octave 4.4 working 2019-01-10 10:50:31 -07:00
Ian Bell
ede4fec6f6 Don't force OSX 10.5 compat 2019-01-09 23:36:04 -07:00
Ian Bell
246729555a One more cmake path 2019-01-09 22:36:46 -07:00
Ian Bell
b8058a5808 More debugging of octave paths 2019-01-09 22:34:56 -07:00
Ian Bell
4fc7572877 print out octave lib 2019-01-09 22:29:13 -07:00
Ian Bell
55c6532ebd R is installed from homebrew, path changed 2019-01-09 22:04:48 -07:00
Ian Bell
dcfef1d838 Add humid air testing script to docs 2019-01-09 09:46:24 -07:00
Ian Bell
1c6497a92f Fix a lot of failures in humid air code. So far all tests seem to pass: 
``` python
import CoolProp.CoolProp as CP
import numpy as np
import itertools
from multiprocessing import Pool

def generate_values(TR,P=101325):
    T,R = TR
    psi_w = CP.HAPropsSI('psi_w','T',T,'R',R,'P',P)
    other_output_keys = ['T_wb','T_dp','Hda','Sda','Vda','Omega']
    outputs = {'psi_w':psi_w,'T':T,'P':P,'R':R}
    for k in other_output_keys:
        outputs[k] = CP.HAPropsSI(k,'T',T,'R',R,'P',P)
    return outputs

def get_supported_input_pairs():
    good_ones = []
    inputs = generate_values((300, 0.5))
    for k1, k2 in itertools.product(inputs.keys(), inputs.keys()):
        if 'P' in [k1,k2] or k1==k2:
            continue
        args = 'psi_w',k1,inputs[k1],k2,inputs[k2],'P',inputs['P']
        try:
            psi_w_new = CP.HAPropsSI(*args)
            good_ones.append((k1,k2))
        except BaseException as BE:
            pass
            if 'currently at least one of' in str(BE) or 'cannot provide two inputs' in str(BE):
                pass
            else:
                print(BE)
                good_ones.append((k1,k2))
    return good_ones

def calculate(inputs):
    errors = []
    supported_pairs = get_supported_input_pairs()
    for k1, k2 in supported_pairs:
        psi_w_input = inputs['psi_w']
        args = 'psi_w',k1,inputs[k1],k2,inputs[k2],'P',inputs['P']
        try:
            psi_w_new = CP.HAPropsSI(*args)
        except BaseException as BE:
            errors.append((str(BE),args, inputs))
    return errors

if __name__ == '__main__':
    TR = itertools.product(np.linspace(240, 360, 31), np.linspace(0, 1, 31))
    with Pool(processes=2) as pool:
        input_values = pool.map(generate_values, TR)
        errors = pool.map(calculate, input_values)
        for err in itertools.chain.from_iterable(errors):
            print(err)
 2019-01-09 09:30:10 -07:00
Ian Bell
b469e42248 Fix typos in humid air code 2019-01-09 09:28:55 -07:00
Ian Bell
b462ce0179 Don't allow two water content inputs 2019-01-09 09:02:32 -07:00