From 7bcb3b8b8685216bbbcce340504d1c77070862ef Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Tue, 18 Nov 2014 00:32:06 +0100 Subject: [PATCH] Added DTU TES to the supporters since we are using their servers and my time, plus some config stuff for buildbot. --- Web/_static/dtu_mekanik.png | Bin 0 -> 4738 bytes Web/index.rst | 17 ++++++++++++----- dev/buildbot/master/master.cfg | 4 ++-- 3 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 Web/_static/dtu_mekanik.png diff --git a/Web/_static/dtu_mekanik.png b/Web/_static/dtu_mekanik.png new file mode 100644 index 0000000000000000000000000000000000000000..263a90daa0a48893ccb09aa64b7896794d16219a GIT binary patch literal 4738 zcmbVQc|4Ts-<~4NSSKV~gvve(V;F;MgTe?!iehFkSw=IXu}8>~{U;)nB}>T?QW1__ zWQgpHwHYK?Dx$p8Ij8f!f1J1%*~8# z0DuE6thPKC2kS0QLi(^CViXexiY?KNLUkeG0R}jtD_+Lj+r=GkgLlCNT<^xC001@| z!Onr=U}=HG61~-2eqq%7y?t41005=$@9To~#8YHk@$Lj4UD>tzCRrH*PFL0*ZV9pU zHNtxk%mPVx+dwNjY@jDr8z-x;Cxh}wvIM;G6c-tPZ!aG*(qC8hPhBLd{c9L3EAuCW z;;Ae9ms1Xw)-py!5?%(b22sUAG$AsYP&KH!1_FUlk%2*=5HJJ=hQd^#2&6g;34zG` zeaW({k#KHE8)Nj}wpcw~Sq}=u7YPPasZ=$px*Cz>4u)!LYyZ-K!BklYRdRq2#l>IM zhb;G7!5B}*k_f&O0?|k2m!gX+(T}1l%kuQE5WIaYE&mbrA^)8yR?5KsF1}!>8U*a^ z{VT3N(PWAZ{(s&0S2Wo!z!wj;!IO!8BrIz^+~j_fS-Jb~hJFEA-XJj~0&7uRyo`xh zKX1Gb#oSm|mNlb>BjAvRP;~(0t@GsUi z(T3VkZ4(1+En}A7tfg8jj@E)hWdG*k{y!N5vz!6{DvkeBD!+$V_4lj! zPvNsV|7;z+4{N`WSQ~>xH5UW`_-o9K4eb2KKRQjFpGOHDSsUB^a-p*5mYBJy@&wg;wx5RsXRgL-#z{=jhTfEBot1NsKS<)3L3h`sgLV!UQB z+zYG~gn{klu4_q9B5HPQb94Gk)at6!hnxHxLs1p;DAf&(K3g<>>b)?2Q;I=ID^|da z1Z3So?M*;1<|Y>z0myt9CY*y~u-ETr8@?erP;$5P7uhxajY2Z-x3ucex7U;LK zo+UnPoIqL5)+J|05qV3?LGMAqpb$b&#@&Ikgxhr;y6d0YpKFgH@hF zxRYF3cVAOQYS*Yfj~tC-F*EgJ37)3$3#cBzHvcm2=ZLElN`Wg(4_VRqnJ3pQx3jZn$tH$5nRW~H1r54N zo7~$xCiO$>V$GXRn9Xc=&z&b4@6oxX;$vt^j;Ht*zFVL!hr;V?A1Ayk>|UzZT;NJ* zW%`VRoLlx8R~HPUkWn1y~h$(n3LKd7*D#aBMOKRn2`EZS;Drz65+P_R*l zIuvvzzuJa#@wDt=imvu{wiff|_c%6x_;glq(SEPbEHL}rY1_h5Ir;&M>PL_ekKT=w zAWf^*tiXLk?YgVMJ;^bO;1Rod$&HQ~;bqDD;e>jme4@L3PHLmzQlb1>nn#ZZ(7I3M zGbKo+$d=F2?|EiGu zgmsdLIvrq%{&L^=qPCgbw4>E#N2@>PP}YasN4(q+c*pt5;K39v4xT08A`TM69JngO zE~ZXwlaP77*x>`AAb$lx8ut5 z9U^yX?S5kK_SnmAhJexLR|m9PdQwLj8S*}j-hO-G#@X+K2x4(|G&;{Zn9FojsH4oA z{qxi;djb4i&zJGiqLZAn5mcmqq6*Tw4=Ls1FxOkaH&}H>2fB)oeU)9I`2A(MZ)I%p zf#IM(K(_*Wd zu_fdE5`mNkJ^wR#4RYc#Cp<~F>K?Kgw1>qK#J#Je-TOyEGv^wLkp@w&cM|)>9j6Z= zB4U;v+l!=zuq zyv;VOx@h|1As3%111dHXGM}3`@1B~P^69wlgJx>*%?~w)EYBCrkE%$Ie+Vo-UF|s) zy%b||@uJC8X+b0Qdv7O)*K4f8x58T-iCeh(O)7yW@ClPEEb*lG8x2YO{*yUwms>

i59OZ^ees)`=Wjx4eIPJvJ;Q z&oB6!pp2_cBkrwaP&Gc?5geF-Ap^vlF!^Z;^%|i+Q!+5582qF@=yF6Jo)Q5h(br^ zerC|5gVKR?F5-yi$KkaJdehCM+Lv_^m(@aSFKgs3KHHw{idaLT`ZjTM)X<9Dke{PM zPS34^roCTq|L9r?3b+$-XJ4cz=%skY;|5fcH~EvOzeMV)Xz@;Utm)4ex)mEFuzvE- zG4efgtHHdl==Kb1_B_#z{Pzk;`9WAbWtiRiCQZ@ z?exU@W4v5jU*=*C*^FbBUFx{ls2t2{c!pldCc<%#F5r;PNwYYSb}F3t*pzn6+R1)P zDkCVBQQhYX>`>05%PqGdw)FL}L{YJV>jf|?i|f1Hsz~W9WS>kRe@U+Lwc_OEbjsVF zqW;I@)>@U2eXj|a}!;?YIb>Ea}>PpHHMfjxN zjh9*r>Xfct>)g_#f=4OBhHhX|?O+__Q2>B8v1?kaD&=@OBDu_!Bkan|{g+z@H=+vb z)ZF!spgNk3&d@$DP7>3VjCInwt6&045`Fwr$v>%l4N{R?$poZB3jHjc4!knj1Y8E7A#~t8Relfki)bPstz`w&{8-@oL|h-&z+icS2K3X^UV!;(@H#Aw@)ikX>7XA z5#YZ}l8NFO~mITs(;1_bj&hupvzJK5$xWlNcZhJ1KZ7T6|$*&ko~TKZ9XYbQIjGp6T5 zfcXcy3#02saQ!g{!;#5>+aO~D3wKW5B=7rYM;{8>Ufks~#ue0t@h(KgXcZn{5cGXS zb!L`?LO62Q!m_7p;31u>>3LN`u;&5%E`m5o*gWZSKs=<&V*mL2^@wE)vn%|HP@>au z+DZS|4yo=(qEdOHqlpKW+8UFoHr44U>Q;4VtmMnp!|$dlqssW0tBvsrQtAR-;5u*i zYQY1{gr}Ph=q+G-v0o&__4S8R!R0P8tofV?PW$N_?3Sx$HUYyx;3U4UNtt!uFv}?o;hb=17l;_1NS{IDF{E9 z0$s4oD74hkOt4!k!TQQ?3^wE(`60X)EN^Y6s2k=P~T8q2MNkC~cv zlzFDpzkEIHS2OyKsFa_2yu#Ev@`b9Ye|1zu?>n;}ll>*yQ63CR!WUnS=M*zkMm5-U z`}M*uo4BAPkns!1J`e!tbN#ebMkxJcDDSo+?h`{7dROH+gTRK;`uc_fl^a}EJtHeq zB6Z54#4B18&m%OPqDO^Osh_KrK0LF!<|zTk=@C^FV~=VpExq?TR<)BaqIqv{tBi;?eIOJ@;P3J`_3F1YV&_FU|3=&Je%KiE4Fd zeq9{uL*m{2W44{I5Iy(B7et&v-UFc;?P5h$%(mx^SBkWj`#a1o@@_Xw$D!Zn9;ne6 zbGji=eQVcDH47;;=XF2Bv1lQrRef3@v!$(w zZj)O2u;OvZyymM*$5$-+QQ*wiW^D`;?xu=})0;$h0_V2W{W*&Y!&$x{J^ISxZb;+~ zlXh5i1^+tEiPPzF&bt8Q-ZZ-GEAR5O=={jow@i9fHW8Ucgg@)vDVU T^d9~CD`akBWn6A}_16CYvNDQC literal 0 HcmV?d00001 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"