mirror of
https://github.com/CoolProp/CoolProp.git
synced 2026-02-11 22:35:16 -05:00
Merge branch 'master' of https://github.com/coolprop/coolprop
This commit is contained in:
@@ -26,14 +26,17 @@ surface tension N/m
|
||||
*/
|
||||
|
||||
#include "CoolPropTools.h"
|
||||
#if defined(__ISWINDOWS__)
|
||||
#include <windows.h>
|
||||
HINSTANCE RefpropdllInstance=NULL;
|
||||
char refpropPath[] = "";
|
||||
#if defined(__powerpc__)
|
||||
void *RefpropdllInstance=NULL;
|
||||
char refpropPath[] = "/opt/refprop";
|
||||
#elif defined(__ISLINUX__)
|
||||
#include <dlfcn.h>
|
||||
void *RefpropdllInstance=NULL;
|
||||
char refpropPath[] = "/opt/refprop";
|
||||
#elif defined(__ISWINDOWS__)
|
||||
#include <windows.h>
|
||||
HINSTANCE RefpropdllInstance=NULL;
|
||||
char refpropPath[] = "";
|
||||
#elif defined(__ISAPPLE__)
|
||||
#include <dlfcn.h>
|
||||
void *RefpropdllInstance=NULL;
|
||||
|
||||
@@ -6,6 +6,11 @@
|
||||
|
||||
#include <time.h>
|
||||
|
||||
// A hack to make powerpc happy since sysClkRateGet not found
|
||||
#if defined(__powerpc__)
|
||||
#define CLOCKS_PER_SEC 1000
|
||||
#endif
|
||||
|
||||
namespace CoolProp{
|
||||
|
||||
void compare_REFPROP_and_CoolProp(std::string fluid, CoolProp::input_pairs inputs, double val1, double val2, std::size_t N, double d1, double d2)
|
||||
|
||||
Reference in New Issue
Block a user