Commit Graph

1531 Commits

Author SHA1 Message Date
Jorrit Wronski
54519d7afe Updated handling of compile definitions and MSVC runtime selection 2022-08-12 11:07:18 +02:00
Julien Marrec
8aa50fc270 Fix mac sed (#2116)
* Minimum fix for sed: mac has a weird sed version...

* Make repalcement from python to avoid dealing with weird sed version on mac

* Try to get the size of the wheels (/!\ 100MB max per upload)

* move setting env vars up a block
2022-04-11 12:35:06 -04:00
Julien Marrec
6913fc41dc Format macros, they keep getting picked incrementally by clang format + Strip trailing whitespaces
```
find . -regextype posix-extended -regex '.*\.(cpp|hpp|c|h|cxx|hxx|py)$' | xargs -I@ sed -i 's/[ \t]*$//' "@"
```
2022-04-01 07:39:35 -04:00
Julien Marrec
a7a3c844e2 I think I know why mac is failing, it's because of the newline char (#2110) 2022-04-01 07:38:29 -04:00
Julien Marrec
76b48b35f2 Configure upload to pypi/testpypi (#2109)
* Enable upload to testpypi

* Figure out the next available version to avoid override (especially for testpypi, shouldn't happen for pypi as we should bump in CMakeLists)
2022-03-31 18:53:39 -04:00
Julien Marrec
c1ed08617e Bump Catch 1 to Catch v3.0.0-preview4 (#2105)
* Bump Catch2 to latest v3.0.0-preview4

Bump Catch2 to latest 2.x: 2.13.8

Rename submodule Catch to Catch2

Add catch2 to ctest

Fix missing ";" in catch tests

Use ctest for catch2: run once with little output, then 2nd time with verbose output for failed tests

Run through CatchTestRunner: TEMP: PICK A STYLE

Update Catch to v3.0.0-preview4

Try to migrate to catch2 v3

Ok it builds and runs, but I'm missing tests

Get all files that have inline tests, now I get same behavior as with catch1

Put back app sources

* Remove the link to coolprop lib since I am now using APP_SOURCES instead of just the specific files with tests
2022-03-31 18:47:00 -04:00
Julien Marrec
05c8cf503b Lint: use automated tooling to reformat C++ and CMakeLists files (#2103)
* Add initial clang tidy / clang format config files

* Clang format the entire codebase

```
find ./src -regextype posix-extended -regex '.*\.(cpp|hpp|c|h|cxx|hxx)$' | xargs clang-format-12 -style=file -i -fallback-style=none
find ./include -regextype posix-extended -regex '.*\.(cpp|hpp|c|h|cxx|hxx)$' | xargs clang-format-12 -style=file -i -fallback-style=none
find ./Web -regextype posix-extended -regex '.*\.(cpp|hpp|c|h|cxx|hxx)$' | xargs clang-format-12 -style=file -i -fallback-style=none
find ./dev -regextype posix-extended -regex '.*\.(cpp|hpp|c|h|cxx|hxx)$' | xargs clang-format-12 -style=file -i -fallback-style=none
find ./wrappers -regextype posix-extended -regex '.*\.(cpp|hpp|c|h|cxx|hxx)$' | xargs clang-format-12 -style=file -i -fallback-style=none
```

* Add a .cmake-format file and reformat CmakeLists.txt with it

https://github.com/cheshirekow/cmake_format

* Add a clang-format workflow


only runs on PRs, only on touched files
2022-03-31 10:51:48 -04:00
Julien Marrec
3b8ed97fbc Github Actions: add shared library and doxygen workflows. (#2098)
* First try at building shared library

* Rename artifact for clarity instead of putting them all in the same

* Add a doxygen worklow

* Extract version from CMakeLists to name the artifacts

* move the extract version bit to a script in dev/ so I can reuse for documentation too

* Disable fail-fast, and don't use fstrings in extract_version.py (mac has a too old python by default, and I don't want to call setuppython actions)

* Mac still picks up a too old python, whatever: just setup any 3.x (it's cached, so quick)

* First try for a Windows Installer package

* forgot to create the build dir

* forgot build type

* Try to re-enable catch2 tests

* adjust

* Leave the coolprop catch2 tests in a separate workflow, since many are currently failing
2022-03-31 10:16:34 -04:00
Julien Marrec
1ae92851f2 Add a cppcheck workflow (#2106) 2022-03-31 10:12:02 -04:00
Ian Bell
be204ce8d5 Implement ancillary equation for ammonia. See #2049 2021-10-24 13:29:17 -04:00
Ian Bell
fe7f6db631 Fix rounding for reducing density for nitrogen; closes #2055 2021-10-24 13:14:08 -04:00
Ian Bell
02746ef456 Fix reducing density for R236ea; #2054
Had been truncated to too few digits
2021-10-24 13:13:07 -04:00
Ian Bell
e6ba7dbee5 Fix typo in last digit for water; closes #2053 2021-10-24 13:10:58 -04:00
Ian Bell
6ce0cac5c3 Fix critical temperature for R-1234ze(E)
Simple typo, not updated when copying from old model
2020-12-29 17:03:11 -05:00
Ian Bell
aae0a21f83 Update nitrogen cp0
See #1982
2020-11-25 19:18:18 -05:00
Ian Bell
cc28edee96 Fix Methane cp0
See #1982
2020-11-25 18:26:28 -05:00
Ian Bell
f7dffbc04b Lay groundwork for cp0 to agree exactly with REFPROP and TREND
See #1982
2020-11-25 18:18:48 -05:00
ian
6ed825635e Fix REFPROP names for three fluids 2020-11-22 10:08:57 -05:00
ian
5c5ee7df47 Fix alias for R1243zf; closes #1980 2020-11-11 18:48:57 -05:00
Ian Bell
c903676096 Add aliases for R-1234ze(Z) 2020-10-21 19:50:32 -04:00
ian
158c3ed3d7 Fix Nitrogen reducing density; closes #1974 2020-10-14 19:51:08 -04:00
Ian Bell
eca6a2b16e Try to specify the java path when running java example; see #1963 2020-08-08 15:37:42 -04:00
Ian Bell
a70719ccb6 update the critical state for ammonia to match reducing state; closes #1962 2020-08-08 12:36:38 -04:00
whunter7
b2289e91b6 Update BaseObjects.py
Fixes https://github.com/CoolProp/CoolProp/issues/1931
2020-08-03 21:01:37 +02:00
Jorrit Wronski
2096e4f122 Disable the example generator when building the web docs. 2020-07-30 09:24:31 +02:00
Jorrit Wronski
779520d3f3 One more attempt to handle #1933 2020-07-29 11:02:39 +02:00
Zach Baird
4ef67b1685 fixed typo with units for sigma (#1949) 2020-06-16 12:49:05 -04:00
Ian Bell
dcac0d0427 32-bit builds 2020-06-06 00:33:42 -04:00
Ian Bell
2793b78810 Force 32-bit for 32-bit builds 2020-06-06 00:12:03 -04:00
ian
495c2d4e7a Another try
See #1940 #1942
2020-06-05 22:10:39 -04:00
Ian Bell
ca1ee1266d raw strings
See #1940 #1942
2020-06-05 21:40:11 -04:00
Ian Bell
b73fc96895 Maybe this will work? 2020-06-05 20:59:20 -04:00
Ian Bell
9af9c62750 Definitely print out stuff at the end from address sanitizer 2020-05-22 19:42:46 -04:00
Jorrit Wronski
51e03754cc One more permission change in the release script. 2020-05-11 09:59:28 +02:00
Jorrit Wronski
ff4c6e0eea Our hosting provider tags some files in the pybind module as potentially harmful and makes the unreadable. This seems to be what kept breaking the nightly builds... 2020-05-11 09:52:44 +02:00
Ian Bell
2a4bfbb772 Fix finding R 2020-05-10 20:51:59 -04:00
Jorrit Wronski
4950da7ab3 Add quadmath to fix the fortran example 2020-05-10 23:05:59 +02:00
ian
f08e5757e3 Fix indent 2020-05-08 23:28:30 -04:00
ian
b42b838226 No 32-bit shared libraries on OSX 2020-05-08 23:27:19 -04:00
Ian Bell
8dbde086e8 Fix path for 32-bit 2020-05-08 22:50:16 -04:00
Ian Bell
21bb9543f6 Maybe 32-bit python operational now? 2020-05-08 22:21:34 -04:00
Ian Bell
10cd9c5553 Try to also add pre to ctest for R? 2020-05-08 08:56:53 -04:00
Ian Bell
e575ec04ee Maybe MathCAD works on first try? 2020-05-07 23:09:32 -04:00
ian
2911fd5e79 Another try at proper escaping 2020-05-07 19:33:22 -04:00
ian
11a7918587 Join the commands properly 2020-05-07 17:13:38 -04:00
Ian Bell
581709b05e Another try with fortran builds 2020-05-07 16:32:06 -04:00
Ian Bell
e0bd54136d Put argument in the right place 2020-05-07 13:55:52 -04:00
Ian Bell
c9e910acde Workaround bug(?) in cmake 3.17 2020-05-07 10:20:46 -04:00
Ian Bell
15e6dc216e More mingw paths 2020-05-07 09:59:35 -04:00
Ian Bell
03c0ff6acb No cmake to python 2.7 build 2020-05-07 09:32:49 -04:00