diff --git a/Web/_static/dtu_mekanik.png b/Web/_static/dtu_mekanik.png new file mode 100644 index 00000000..263a90da Binary files /dev/null and b/Web/_static/dtu_mekanik.png differ diff --git a/Web/index.rst b/Web/index.rst index 210c29dc..ba43540f 100644 --- a/Web/index.rst +++ b/Web/index.rst @@ -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 ` or :ref:`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 diff --git a/dev/buildbot/master/master.cfg b/dev/buildbot/master/master.cfg index 8a080a86..1f7bad4a 100644 --- a/dev/buildbot/master/master.cfg +++ b/dev/buildbot/master/master.cfg @@ -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"