github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-04-01 03:00:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Small work on the docs - doxylink needs to be fed an absolute path, but otherwise seems good. Might need to generate the absolute path at runtime somehow. Its different between local and remote locations of HTML.

Browse Source 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
This commit is contained in:
Ian bell
2014-05-15 23:43:58 +02:00
parent cb315930b7
commit 463c40fcf0
6 changed files with 61 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Web/apidoc/AbstractState.rst Normal file
View File

@@ -0,0 +1,6 @@
AbstractState Module
====================
.. automodule:: CoolProp5.AbstractState
:members: AbstractState
:undoc-members:

1
Web/apidoc/modules.rst
View File

@@ -8,3 +8,4 @@ CoolProp
HumidAirProp
Plots
State
AbstractState

2
Web/conf.py
View File

@@ -20,7 +20,7 @@ import sys, os
sys.path.append(os.path.abspath('sphinxext'))
doxylink = {
'cpapi' : ('../CoolPropDoxyLink.tag', '_static/doxygen/html')
'cpapi' : ('../CoolPropDoxyLink.tag', 'file://C:\Users\Belli\Documents\Code\coolprop-v5-new\doc-v5\html')
}
# -- General configuration -----------------------------------------------------

4
dev/builder/main.py
View File

@@ -132,7 +132,7 @@ def build_all_targets(project_root, project_name):
build_target(target, project_root = project_root, cpp_sources = cpp_sources, project_name = project_name)
if __name__=='__main__':
# build_all_targets(project_root = '../../wrappers/EES', project_name = 'EES')
build_all_targets(project_root = '../../wrappers/EES', project_name = 'EES')
# build_all_targets(project_root = '../../wrappers/C#', project_name = 'Csharp')
# build_all_targets(project_root = '../../wrappers/Java', project_name = 'Java')
build_all_targets(project_root = '../../wrappers/SharedLibrary', project_name = 'SharedLibrary')
# build_all_targets(project_root = '../../wrappers/SharedLibrary', project_name = 'SharedLibrary')

73
src/main.cxx
View File

@@ -1,8 +1,8 @@
//#include <vld.h>
#include "Backends/REFPROPMixtureBackend.h"
#include "Backends/REFPROPBackend.h"
#include "Backends/REFPROP/REFPROPMixtureBackend.h"
#include "Backends/REFPROP/REFPROPBackend.h"
#include <time.h>
#include "AbstractState.h"
#include "DataStructures.h"
@@ -11,11 +11,15 @@
using namespace CoolProp;
#include "rapidjson/rapidjson_include.h"
#include "Fluids\FluidLibrary.h"
#include "Backends/Helmholtz/Fluids/FluidLibrary.h"
#ifdef ENABLE_CATCH
#include "Tests.h"
#include "CoolPropDLL.h"
#endif
#include "SpeedTest.h"
#include <vld.h>
void generate_melting_curve_data(const char* file_name, const char *fluid_name, double Tmin, double Tmax)
{
@@ -76,9 +80,25 @@ int main()
generate_melting_curve_data("CycloHexane.mlt","cyclohex",279.7,2000);
generate_melting_curve_data("CarbonDioxide.mlt","CO2",217,2000);
}
if (1)
if (0)
{
CoolProp::compare_REFPROP_and_CoolProp("Water",QT_INPUTS,1,350,100000);
std::cout << "Water DmolarT at 1e-3,300 \n-----------------\n";
CoolProp::compare_REFPROP_and_CoolProp("Water",DmolarT_INPUTS, 1e-3, 300, 10000, 0, 1e-8);
std::cout << "Water PT at 101325,300 \n-----------------\n";
CoolProp::compare_REFPROP_and_CoolProp("Water",PT_INPUTS, 101325, 300, 10000, 0, 1e-8);
std::cout << "Water QT at 350 K\n-----------------\n";
CoolProp::compare_REFPROP_and_CoolProp("Water",QT_INPUTS, 1, 350, 10000, 0, 1e-8);
std::cout << "Water PQ at 101325 Pa\n-----------------\n";
CoolProp::compare_REFPROP_and_CoolProp("Water",PQ_INPUTS, 101325, 1, 10000, 1e-2, 0);
std::cout << "R134a DmolarT at 1e-3,300 \n-----------------\n";
CoolProp::compare_REFPROP_and_CoolProp("R134a",DmolarT_INPUTS, 1e-3, 300, 10000, 0, 1e-8);
std::cout << "R134a PT at 101325,300 \n-----------------\n";
CoolProp::compare_REFPROP_and_CoolProp("R134a",PT_INPUTS, 101325, 300, 10000, 0, 1e-8);
std::cout << "R134a QT at 350 K\n-----------------\n";
CoolProp::compare_REFPROP_and_CoolProp("R134a",QT_INPUTS, 1, 350, 10000, 0, 1e-8);
std::cout << "R134a PQ at 101325 Pa\n-----------------\n";
CoolProp::compare_REFPROP_and_CoolProp("R134a",PQ_INPUTS, 101325, 1, 10000, 1e-2, 0);
}
if (0)
{
@@ -92,12 +112,17 @@ int main()
}
}
if (1)
{
AbstractState *ASS = AbstractState::factory("HEOS","Water");
ASS->update(DmassT_INPUTS, 1e-10, 300);
delete ASS;
}
if (0)
{
std::vector<std::string> tags;
tags.push_back("[RP1485]");
run_user_defined_tests(tags);
//std::vector<std::string> tags;
//tags.push_back("[RP1485]");
//run_user_defined_tests(tags);
//run_tests();
std::string fl = get_global_param_string("FluidsList");
double rr = PropsSI("D", "P", 3e5, "T", 300, "Nitrogen");
@@ -123,7 +148,7 @@ int main()
o = PropsSI(in1,in2,T,in3,P,Ref,z);
double tr = 0;
}
if (1)
if (0)
{
// First type (slowest, most string processing, exposed in DLL)
double r0A = PropsSI("Dmolar","T",298,"P",1e5,"Propane[0.5]&Ethane[0.5]"); // Default backend is HEOS
@@ -136,27 +161,21 @@ int main()
double r1B = PropsSI("Dmolar","T",298,"P",1e5,"HEOS::Propane&Ethane", z);
double r1C = PropsSI("Dmolar","T",298,"P",1e5,"REFPROP::Propane&Ethane", z);
const double *pz = &(z[0]);
int n = z.size();
// Third type (DLL)
double r2A = PropsSIZ("Dmolar","T",298,"P",1e5,"Propane&Ethane", pz, n);
double r2B = PropsSIZ("Dmolar","T",298,"P",1e5,"HEOS::Propane&Ethane", pz, n);
double r2C = PropsSIZ("Dmolar","T",298,"P",1e5,"REFPROP::Propane&Ethane", pz, n);
//const double *pz = &(z[0]);
//int n = z.size();
//// Third type (DLL)
//double r2A = PropsSIZ("Dmolar","T",298,"P",1e5,"Propane&Ethane", pz, n);
//double r2B = PropsSIZ("Dmolar","T",298,"P",1e5,"HEOS::Propane&Ethane", pz, n);
//double r2C = PropsSIZ("Dmolar","T",298,"P",1e5,"REFPROP::Propane&Ethane", pz, n);
double tt = 0;
}
if (0)
{
//AbstractState *propane = AbstractState::factory("HEOS","CO2");
//propane->update(DmolarP_INPUTS,203.69, 600000);
//double d1 = propane->rhomolar();
//AbstractState *propaneRP = AbstractState::factory("REFPROP","propane");
//propaneRP->update(QT_INPUTS,1,85.525);
//double d2 = propaneRP->rhomolar();
//double rr = (d2/d1-1)*100;
//delete(propane); delete(propaneRP);
#ifdef ENABLE_CATCH
run_tests();
#endif
}
if (0)
{
@@ -261,7 +280,7 @@ int main()
delete Mix; delete MixRP;
double rr = 0;
}
if (1)
if (0)
{
int N = 2;
std::vector<long double> z(N, 1.0/N);

5
wrappers/Python/CoolProp5/AbstractState.pyx
View File

@@ -2,6 +2,9 @@
from __future__ import division
cdef class AbstractState:
"""
This class is a one-to-one python wrapper of the :cpapi:`AbstractState` class
"""
def __cinit__(self, string backend, string fluid):
self.thisptr = cAbstractState.factory(backend, fluid)
@@ -10,6 +13,7 @@ cdef class AbstractState:
del self.thisptr
cpdef update(self, long ipair, double Value1, double Value2):
""" Update :cpapi:`AbstractState::update` """
self.thisptr.update(ipair, Value1, Value2)
## ----------------------------------------
@@ -17,6 +21,7 @@ cdef class AbstractState:
## ----------------------------------------
cpdef double keyed_output(self, long iOutput) except *:
""" Update :cpapi:`AbstractState::update` """
return self.thisptr.keyed_output(iOutput)
cpdef double T(self) except *: