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

Merge branch 'master' of https://github.com/coolprop/coolprop

Browse Source
This commit is contained in:
Ian Bell
2014-11-17 18:57:38 -05:00
parent 0228289b43 7bcb3b8b86
commit 58758ce22d
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Web/_static/dtu_mekanik.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.6 KiB

17
Web/index.rst
View File

@@ -3,7 +3,7 @@
Welcome to CoolProp
*******************
These pages help you to get started using CoolProp and provide detailed information for the
These pages help you to get started using CoolProp and provide detailed information for the
returning user. Please feel free to browse the pages and use the menu on the left to navigate
on this website.
@@ -39,9 +39,9 @@ High-Level Interface Example
In most languages, the code to calculate density ``D`` of Nitrogen at a temperature ``T`` of 298 K and a pressure ``P`` of 101325 Pa is something like::
rho = PropsSI('D', 'T', 298.15, 'P', 101325, 'Nitrogen')
See more examples of PropsSI usage at :ref:`High-Level API <high_level_api>` or :ref:`Examples <examples>`
Help
----
@@ -75,7 +75,7 @@ Supporters
:height: 100px
:alt: labothap
:target: http://www.labothap.ulg.ac.be/
.. image:: _static/logo_ORCNext.jpg
:height: 100px
:alt: ORCNext
@@ -87,8 +87,15 @@ Supporters
:height: 100px
:alt: Herrick
:target: https://engineering.purdue.edu/Herrick/index.html
.. image:: _static/maplesoft_logo.png
:height: 100px
:alt: Maple
:target: http://www.maplesoft.com
\
.. image:: _static/dtu_mekanik.png
:height: 36px
:alt: DTU Mechanical Engineering - Section for Thermal Energy
:target: http://www.mek.dtu.dk/english/Sections/TES

4
dev/buildbot/master/master.cfg
View File

@@ -378,7 +378,7 @@ def fortranFactory(platform=1,bitness=1):
if bitness==bitnessID["32bit"]:
cmake_args = ["-DCOOLPROP_EXTERNC_STATIC_LIBRARY=ON","-G", "\"MinGW Makefiles\""]
else:
cmake_args = ["-DSTATIC_LIBRARY=ON","-G", "\"MinGW Makefiles\""]
cmake_args = ["-DCOOLPROP_STATIC_LIBRARY=ON","-G", "\"MinGW Makefiles\""]
cp_cmd = "copy /Y *.f90 ..\\..\\..\\build"
build_cmd = "gfortran -c -Wall cpinterface.f90 cool_fortran_bind.f90"
link_cmd = "gfortran -o main *.o libCoolProp.a -lstdc++"
@@ -387,7 +387,7 @@ def fortranFactory(platform=1,bitness=1):
if bitness==bitnessID["32bit"]:
cmake_args = ["-DCOOLPROP_EXTERNC_STATIC_LIBRARY=ON"]
else:
cmake_args = ["-DSTATIC_LIBRARY=ON"]
cmake_args = ["-DCOOLPROP_STATIC_LIBRARY=ON"]
cp_cmd = "cp *.f90 ../../../build/"
build_cmd = "gfortran -c -Wall cpinterface.f90 cool_fortran_bind.f90"
link_cmd = "gfortran -o main *.o libCoolProp.a -lstdc++ -ldl"