From 46d96dc85583feabd5fe281178168f5c5fd8f88a Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 25 Mar 2010 14:42:29 +0100 Subject: [PATCH 01/11] BUG: remove old wmake/rules/*/{dirToString,wmkdep} binaries --- wmake/rules/linux64Gcc/dirToString | Bin 9744 -> 0 bytes wmake/rules/linux64Gcc/wmkdep | Bin 32427 -> 0 bytes wmake/rules/linux64Gcc42/dirToString | Bin 9657 -> 0 bytes wmake/rules/linux64Gcc42/wmkdep | Bin 31867 -> 0 bytes wmake/rules/linuxGcc/dirToString | Bin 7218 -> 0 bytes wmake/rules/linuxGcc/wmkdep | Bin 26672 -> 0 bytes 6 files changed, 0 insertions(+), 0 deletions(-) delete mode 100755 wmake/rules/linux64Gcc/dirToString delete mode 100755 wmake/rules/linux64Gcc/wmkdep delete mode 100755 wmake/rules/linux64Gcc42/dirToString delete mode 100755 wmake/rules/linux64Gcc42/wmkdep delete mode 100755 wmake/rules/linuxGcc/dirToString delete mode 100755 wmake/rules/linuxGcc/wmkdep diff --git a/wmake/rules/linux64Gcc/dirToString b/wmake/rules/linux64Gcc/dirToString deleted file mode 100755 index 8a0125352dd2d2038723a69600ad144c85c8f24d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9744 zcmcgyeQaCR6~BHjPTa3FZRiLstOgutwZ%^QMJX-V`DpFdZ9|i6-6*^`wv(7Swr4+g z>BdI242G2kg0`_vV-uRRP1^ogk){a-Xz2nJBs4l9G{hf(7;Gt}Q`s0oVvzmLefQYU zFNs=U+DYC!_x$cT_nv$1$Gg7o-Psl0skvN&NfS2;lDzJqgseM~E2XHgt->RMqFG!e zYJs?M1!WF#E5&?D70ukE^mOnVN^1(xf>uKD%PmPTXAg-}eH99-q{XAE0_JFm%qKhY zwOi$Pd-^5Lyh-`7j{Q+~B$C~zvKv))%qOW}5OZ!HwT-UJRe6_dK}aMAiHWW9Ug0tp zz`EZw6O?|i&Qf@=E+`YseHJX3v)#?GBR?;e*v~*ZHLztF^^VMO*DxuO{t1v8P#&^=o;p&mDnCFahbIoshOd9Q z&^$OeIEnx8M7t|oaz6p3*-M_1TH~vJLnhb1oPYgk_m7cuQFXUGJ8hYe+2CYfcx=aa zHB^Lp&DD=ko5;6@KjctRq%{3(X!ft9_w2OgW#|iCZSRHpLQhbnLcP)P=C^dO=I-313qbDQ|S#^sS4I-{EUT;I~= z{eW^mA{O8l+4eMu+m$kIM6Pv(>9WUP=}?_Jl^ z*VE;V(q3deb{(JEXe0J9)y2$3K9M({yqK!^(45o6eYjgACaU7c6L3P>>z-sEWJp|TjTL^UPsf;OV+*%Nl$IW&JAh~L5en#xF z65SW+$GH_$nmCF}6YaQrT-V}G6et$*fkHkW$i?Dci47$Sf%d*gv@`$i&Gn5-^!hdRaLFh1`Xx(l#PX*j>9LYEn}BXxa>J5H<4sF7ES2tS zM5GZOyH<#X+P+%dv&PfxX{0eS7r7d!Ca$17*9Y~>aF;(HF%VoLl}VZYII@JeAD1R% z|2ow^R$PQoog+uuB8|tGzSy;=xFgWIM{~giu}I^YqBptrXl@JR*`oVgS`DDD{V$!O z-cnBSEL&anhUb~S9Nv(JG-^67e(6(@EDUG!rkCbLI-41iiDIUZ8pl8=*QMJx+#E+>NN<+a;&iw#K?ippzaeH6^d*Lq} z88Kr6;AY<9!<<6nllh$RXR>C}A8L=Zn6V)x$)BhG;aFi<_!CDmD8u4rUigPHMgQSs zzL3ghsssahcrL}rK&5hNQ~0TCgx^e#;ywrgdD%qFj0t~o*ci;mMv}&G0=6s(f85OG z3#iayx5tr*GGimDI4aDd7~K4_Y^$7s0<`1Vk&z_2)1OEV6o-shK9<2U#$v8GfC4IV zDl?enyx71%K6#iW{H{-O8j<3pD$d?FpCr8oMl=a{za+FEB#;7V4{9elVQc`cCUv;j z{&Fn{sd8@Ol~U!#`#?t8kg(ft*Mc%@yDE_PTN1?0X}=v9t#e#I?=KH3V3RT=9U|V> zaXIb4u(+1(dH*@7?5B`NREvw+&i3rrZeX@mBDG^^mL@XBir+S z@o8n>pp@Bv)?-fR0kjuonfIeFDf?Ds@AO~6B7+3Qg6+%uUlpLRQsnxb?H_g6^M1Np z+4tM*={JJY{@cJPuH+vPuSX}8J;&L~o!kH4M26j-*P&;WJw3T?3G!bJH=NJ*%Pc;pb;iqS|Cqy`PDY6O zmEwi${|H@s{d6oslvDQ3`keA9=+f9@|M~Y4pBK|_aUvd{Y|nn3MxMQXK8N#QS4QL< zziiL^Md;Y=`S+_=*>9DlRBmj?{1u1&!NvVj`Jl3AKe+_9WBCmv2;=q-EBoP#v_At| z6(TNDa<*UW$aIL}p9|O@r9~MuX|eL%*&f=vI?E*G26Z6OT(-0lPTds?*l$+$KXe#4 zL~+Fe_RpyUkiiSo|G5S1H>icLQBXc%t&Vz9%Prtx2hR4)+m*dTO?XwHFBE?| zbLX*RFXM!=@8*hBrbCpz^V(&%57Nd2^o&}EXdT;ui^ng|t3|-(tKV}qGC&?jrn7!a zYyP`V-f6)(nRHIi`y6|w4o`UhQjOP?&%LT~x0uv|c1WgmtTw!luxIMnDe?ZG8uygX zp{nskf}iKr_+r7&>1upQ`T1LoFBSY;t;Uy?-!oR@^@5*+)%bG3&$nv40q@I#c1Wgm zywTz3kv&t#(~_Sv)p#SG8~t`jrgfaM@^itSsf$&3FF2q6XUgwWs`W1|pD$M9O@i0m zYWy<6>uEJkZ=dFpF4UlRWa;I%sMQ&|{1sn~k)(^y&IKjDb^+YG0Dk2hoaRrBc&Ge+ zg%xPIoDZjYIv-9aM)Tn`$LGVt3*fZ>)5J2tziS~%n!tU&a*hLc%`<*}A@RB6$J*b_ z9X}_bPxa>9L8L157bIPx((e>6qQBuHJg1(oypFvKoXUC4QO-jC(~?B~A9Re{WfET@ z!k!>Xtk4>X&-MRW;8bt7W8N(k{~geuFP`}Y@S{|(Hg~=}09s!6VEB5>z zy9M|PQCatR|4qMddCyN)+mz`o4tz@CUj^PUPkX;5%U4QZJg)91Tx$~jYP_+=PbJ&QH z8I;IF3fJ&FUx{Dr{5w&>Lc|7AE%M-~M-*_-&1t_sP&iUZBy)uTK8-N&sYEh87?5xG zar~!F>4?!u5RN`C;_z+mxpO?0PTM{kpcBu6SsWZhd4|!^yZ?X@jr8>5YXZaQtde$j z*s>B?V+h@}mA&}77lqXLIWxpdM@Cj494TH6F=7^%c4NgIWAR+T7@j2z*5y7qO- zYIYt7?d>vHqG~u@sYRY@$yz>kqv_~0k;?aGd(3<)Geqs&72V$+iW>WO?(FI6HF`ts z(JpE)g%)RD`PdO7nMqUwvKNHW`K5iKy^#(S&LPT*+YkSBCyxa!*sWA|a> zKyoNmz_DRRI#wv)I8Et0KfDMA`O6FX-okNGI?p#875$Cn&p9fXEW@z*E8nlo$uDG$ u;aDb-PNF@s-?FmaTsK0>KR<)*ydq7UA^HJv z!FxG}LL;Wa4#`@DNs`Wi&`EK-1ngcTBEzvpN~ln^kV2}j*Lh{s2)A5nBvmMchXE=_ zZEctN?U$A^uEHv65ZuwpMySeB^Qhb-vfLxGoC@1z!&IpHM|~qdR`zeK-HQ~Zy%dNU zeC`cd7QhPs7AohmeuKd2_i{vqQ)PWBROK#3Icn#(b*i0NRh7%9PtB?-�=bZfMMC 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 es!4EmHL(i*NUEVV#>Ze2v;QBibFnl4 diff --git a/wmake/rules/linux64Gcc42/dirToString b/wmake/rules/linux64Gcc42/dirToString deleted file mode 100755 index 0560cadf77f4b2a75f422fe207df6bbbb4c814d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9657 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 NQi}3#KzQr2{{l~V2qORh diff --git a/wmake/rules/linux64Gcc42/wmkdep b/wmake/rules/linux64Gcc42/wmkdep deleted file mode 100755 index f37b2ea3d3deed1553f447a50fdcf557d383401f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31867 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 diff --git a/wmake/rules/linuxGcc/dirToString b/wmake/rules/linuxGcc/dirToString deleted file mode 100755 index f2244e3dca29490f592a9d1a9e8c9f96972426dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7218 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 VGhy3_=TmoEV+Vx%D1D}tCUH?D|(C3B0~%p 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 m|Gi)*;lFCIxyJji7hAJ%;@&5p;hMG43 From 0b9e5ea11a474c1d805ae1190ccb224685b40a8a Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 26 Mar 2010 11:48:23 +0100 Subject: [PATCH 02/11] ENH: link to general mplib* rules where possible. ENH: generalize rule for X11 ENH: Avoid move in flex/flex++ rule. --- wmake/rules/General/X | 5 +++ wmake/rules/General/flex | 2 +- wmake/rules/General/flex++ | 2 +- wmake/rules/General/flex++.test | 6 ---- wmake/rules/{linux64Gcc42 => General}/mplib | 0 .../{linux64Gcc42 => General}/mplibGAMMA | 0 wmake/rules/General/mplibMPICH | 2 +- .../{linux64Gcc42 => General}/mplibMPICH-GM | 0 .../mplibOPENMPI => General/mplibQSMPI} | 3 +- wmake/rules/SiCortex64Gcc/flex++ | 2 +- wmake/rules/SiCortex64Gcc/mplib | 4 +-- wmake/rules/SunOS64Gcc/mplib | 4 +-- wmake/rules/SunOS64Gcc/mplibOPENMPI | 4 +-- wmake/rules/linux64Gcc/X | 4 +-- wmake/rules/linux64Gcc/mplib | 4 +-- wmake/rules/linux64Gcc/mplibGAMMA | 4 +-- wmake/rules/linux64Gcc/mplibMPICH | 4 +-- wmake/rules/linux64Gcc/mplibMPICH-GM | 4 +-- wmake/rules/linux64Gcc/mplibOPENMPI | 4 +-- wmake/rules/linux64Gcc/mplibQSMPI | 5 +-- wmake/rules/linux64Gcc42/X | 3 -- wmake/rules/linux64Gcc42/c | 16 --------- wmake/rules/linux64Gcc42/c++ | 21 ------------ wmake/rules/linux64Gcc42/c++Debug | 2 -- wmake/rules/linux64Gcc42/c++Opt | 4 --- wmake/rules/linux64Gcc42/c++Prof | 2 -- wmake/rules/linux64Gcc42/cDebug | 2 -- wmake/rules/linux64Gcc42/cOpt | 2 -- wmake/rules/linux64Gcc42/cProf | 2 -- wmake/rules/linux64Gcc42/general | 10 ------ wmake/rules/linux64Gcc42/mplibHPMPI | 3 -- wmake/rules/linux64Gcc42/mplibMPICH | 3 -- wmake/rules/linux64Gcc42/mplibOPENMPI | 3 -- wmake/rules/linux64Gcc42/mplibSYSTEMOPENMPI | 1 - wmake/rules/linux64Gcc43/X | 4 +-- wmake/rules/linux64Gcc43/mplib | 4 +-- wmake/rules/linux64Gcc43/mplibGAMMA | 4 +-- wmake/rules/linux64Gcc43/mplibMPICH | 4 +-- wmake/rules/linux64Gcc43/mplibMPICH-GM | 4 +-- wmake/rules/linux64Gcc43/mplibOPENMPI | 4 +-- wmake/rules/linux64Gcc43/mplibQSMPI | 5 +-- wmake/rules/linux64Gcc44/X | 4 +-- wmake/rules/linux64Gcc44/mplib | 4 +-- wmake/rules/linux64Gcc44/mplibGAMMA | 4 +-- wmake/rules/linux64Gcc44/mplibMPICH | 4 +-- wmake/rules/linux64Gcc44/mplibMPICH-GM | 4 +-- wmake/rules/linux64Gcc44/mplibOPENMPI | 4 +-- wmake/rules/linux64Gcc44/mplibQSMPI | 5 +-- wmake/rules/linux64Icc/X | 4 +-- wmake/rules/linux64Icc/mplib | 4 +-- wmake/rules/linux64Icc/mplibMPICH | 4 +-- wmake/rules/linux64Icc/mplibOPENMPI | 4 +-- wmake/rules/linuxGcc/X | 4 +-- wmake/rules/linuxGcc/mplib | 4 +-- wmake/rules/linuxGcc/mplibGAMMA | 4 +-- wmake/rules/linuxGcc/mplibMPICH | 4 +-- wmake/rules/linuxGcc/mplibMPICH-GM | 4 +-- wmake/rules/linuxGcc/mplibOPENMPI | 4 +-- wmake/rules/linuxGcc42/X | 3 -- wmake/rules/linuxGcc42/c | 16 --------- wmake/rules/linuxGcc42/c++ | 21 ------------ wmake/rules/linuxGcc42/c++Debug | 2 -- wmake/rules/linuxGcc42/c++Opt | 2 -- wmake/rules/linuxGcc42/c++Prof | 2 -- wmake/rules/linuxGcc42/cDebug | 2 -- wmake/rules/linuxGcc42/cOpt | 2 -- wmake/rules/linuxGcc42/cProf | 2 -- wmake/rules/linuxGcc42/general | 10 ------ wmake/rules/linuxGcc42/mplib | 3 -- wmake/rules/linuxGcc42/mplibGAMMA | 3 -- wmake/rules/linuxGcc42/mplibHPMPI | 3 -- wmake/rules/linuxGcc42/mplibMPICH | 3 -- wmake/rules/linuxGcc42/mplibMPICH-GM | 3 -- wmake/rules/linuxGcc42/mplibSYSTEMOPENMPI | 1 - wmake/rules/linuxGcc43/X | 4 +-- wmake/rules/linuxGcc43/mplib | 4 +-- wmake/rules/linuxGcc43/mplibGAMMA | 4 +-- wmake/rules/linuxGcc43/mplibMPICH | 4 +-- wmake/rules/linuxGcc43/mplibMPICH-GM | 4 +-- wmake/rules/linuxGcc43/mplibOPENMPI | 4 +-- wmake/rules/linuxGcc44/X | 4 +-- wmake/rules/linuxGcc44/mplib | 4 +-- wmake/rules/linuxGcc44/mplibGAMMA | 4 +-- wmake/rules/linuxGcc44/mplibMPICH | 4 +-- wmake/rules/linuxGcc44/mplibMPICH-GM | 4 +-- wmake/rules/linuxGcc44/mplibOPENMPI | 4 +-- wmake/rules/linuxIA64Gcc/mplib | 4 +-- wmake/rules/linuxIA64Gcc/mplibMPICH | 4 +-- wmake/rules/linuxIA64Gcc/mplibOPENMPI | 4 +-- wmake/rules/linuxIA64Icc/mplib | 4 +-- wmake/rules/linuxIA64Icc/mplibMPICH | 4 +-- wmake/rules/linuxIA64Icc/mplibOPENMPI | 4 +-- wmake/rules/linuxIcc/X | 4 +-- wmake/rules/linuxIcc/mplib | 4 +-- wmake/rules/linuxIcc/mplibMPICH | 4 +-- wmake/rules/linuxIcc/mplibOPENMPI | 4 +-- wmake/rules/linuxPPC64Gcc/mplib | 4 +-- wmake/rules/linuxPPC64Gcc/mplibGAMMA | 4 +-- wmake/rules/linuxPPC64Gcc/mplibMPICH | 4 +-- wmake/rules/linuxPPC64Gcc/mplibMPICH-GM | 4 +-- wmake/rules/linuxPPC64Gcc/mplibOPENMPI | 4 +-- wmake/rules/linuxPPC64Gcc/mplibQSMPI | 5 +-- wmake/rules/linuxmingw32/general | 11 ++----- wmake/rules/linuxmingw32/mplib | 4 +-- wmake/rules/linuxmingw32/mplibGAMMA | 4 +-- wmake/rules/linuxmingw32/mplibMPICH | 4 +-- wmake/rules/linuxmingw32/mplibMPICH-GM | 4 +-- wmake/rules/linuxmingw32/mplibOPENMPI | 4 +-- wmake/rules/solarisGcc/mplib | 4 +-- wmake/rules/solarisGcc/mplibMPICH | 2 +- wmake/rules/solarisGcc/mplibOPENMPI | 4 +-- wmake/scripts/makeDerivedFiles | 2 +- wmake/scripts/makeFiles | 33 +++++++++---------- wmake/scripts/makeOptions | 6 ++-- 114 files changed, 102 insertions(+), 406 deletions(-) create mode 100644 wmake/rules/General/X delete mode 100644 wmake/rules/General/flex++.test rename wmake/rules/{linux64Gcc42 => General}/mplib (100%) rename wmake/rules/{linux64Gcc42 => General}/mplibGAMMA (100%) rename wmake/rules/{linux64Gcc42 => General}/mplibMPICH-GM (100%) rename wmake/rules/{linuxGcc42/mplibOPENMPI => General/mplibQSMPI} (71%) mode change 100644 => 120000 wmake/rules/SiCortex64Gcc/mplib mode change 100644 => 120000 wmake/rules/SunOS64Gcc/mplib mode change 100644 => 120000 wmake/rules/SunOS64Gcc/mplibOPENMPI mode change 100644 => 120000 wmake/rules/linux64Gcc/X mode change 100644 => 120000 wmake/rules/linux64Gcc/mplib mode change 100644 => 120000 wmake/rules/linux64Gcc/mplibGAMMA mode change 100644 => 120000 wmake/rules/linux64Gcc/mplibMPICH mode change 100644 => 120000 wmake/rules/linux64Gcc/mplibMPICH-GM mode change 100644 => 120000 wmake/rules/linux64Gcc/mplibOPENMPI mode change 100644 => 120000 wmake/rules/linux64Gcc/mplibQSMPI delete mode 100644 wmake/rules/linux64Gcc42/X delete mode 100644 wmake/rules/linux64Gcc42/c delete mode 100644 wmake/rules/linux64Gcc42/c++ delete mode 100644 wmake/rules/linux64Gcc42/c++Debug delete mode 100644 wmake/rules/linux64Gcc42/c++Opt delete mode 100644 wmake/rules/linux64Gcc42/c++Prof delete mode 100644 wmake/rules/linux64Gcc42/cDebug delete mode 100644 wmake/rules/linux64Gcc42/cOpt delete mode 100644 wmake/rules/linux64Gcc42/cProf delete mode 100644 wmake/rules/linux64Gcc42/general delete mode 100644 wmake/rules/linux64Gcc42/mplibHPMPI delete mode 100644 wmake/rules/linux64Gcc42/mplibMPICH delete mode 100644 wmake/rules/linux64Gcc42/mplibOPENMPI delete mode 120000 wmake/rules/linux64Gcc42/mplibSYSTEMOPENMPI mode change 100644 => 120000 wmake/rules/linux64Gcc43/X mode change 100644 => 120000 wmake/rules/linux64Gcc43/mplib mode change 100644 => 120000 wmake/rules/linux64Gcc43/mplibGAMMA mode change 100644 => 120000 wmake/rules/linux64Gcc43/mplibMPICH mode change 100644 => 120000 wmake/rules/linux64Gcc43/mplibMPICH-GM mode change 100644 => 120000 wmake/rules/linux64Gcc43/mplibOPENMPI mode change 100644 => 120000 wmake/rules/linux64Gcc43/mplibQSMPI mode change 100644 => 120000 wmake/rules/linux64Gcc44/X mode change 100644 => 120000 wmake/rules/linux64Gcc44/mplib mode change 100644 => 120000 wmake/rules/linux64Gcc44/mplibGAMMA mode change 100644 => 120000 wmake/rules/linux64Gcc44/mplibMPICH mode change 100644 => 120000 wmake/rules/linux64Gcc44/mplibMPICH-GM mode change 100644 => 120000 wmake/rules/linux64Gcc44/mplibOPENMPI mode change 100644 => 120000 wmake/rules/linux64Gcc44/mplibQSMPI mode change 100644 => 120000 wmake/rules/linux64Icc/X mode change 100644 => 120000 wmake/rules/linux64Icc/mplib mode change 100644 => 120000 wmake/rules/linux64Icc/mplibMPICH mode change 100644 => 120000 wmake/rules/linux64Icc/mplibOPENMPI mode change 100644 => 120000 wmake/rules/linuxGcc/X mode change 100644 => 120000 wmake/rules/linuxGcc/mplib mode change 100644 => 120000 wmake/rules/linuxGcc/mplibGAMMA mode change 100644 => 120000 wmake/rules/linuxGcc/mplibMPICH mode change 100644 => 120000 wmake/rules/linuxGcc/mplibMPICH-GM mode change 100644 => 120000 wmake/rules/linuxGcc/mplibOPENMPI delete mode 100644 wmake/rules/linuxGcc42/X delete mode 100644 wmake/rules/linuxGcc42/c delete mode 100644 wmake/rules/linuxGcc42/c++ delete mode 100644 wmake/rules/linuxGcc42/c++Debug delete mode 100644 wmake/rules/linuxGcc42/c++Opt delete mode 100644 wmake/rules/linuxGcc42/c++Prof delete mode 100644 wmake/rules/linuxGcc42/cDebug delete mode 100644 wmake/rules/linuxGcc42/cOpt delete mode 100644 wmake/rules/linuxGcc42/cProf delete mode 100644 wmake/rules/linuxGcc42/general delete mode 100644 wmake/rules/linuxGcc42/mplib delete mode 100644 wmake/rules/linuxGcc42/mplibGAMMA delete mode 100644 wmake/rules/linuxGcc42/mplibHPMPI delete mode 100644 wmake/rules/linuxGcc42/mplibMPICH delete mode 100644 wmake/rules/linuxGcc42/mplibMPICH-GM delete mode 120000 wmake/rules/linuxGcc42/mplibSYSTEMOPENMPI mode change 100644 => 120000 wmake/rules/linuxGcc43/X mode change 100644 => 120000 wmake/rules/linuxGcc43/mplib mode change 100644 => 120000 wmake/rules/linuxGcc43/mplibGAMMA mode change 100644 => 120000 wmake/rules/linuxGcc43/mplibMPICH mode change 100644 => 120000 wmake/rules/linuxGcc43/mplibMPICH-GM mode change 100644 => 120000 wmake/rules/linuxGcc43/mplibOPENMPI mode change 100644 => 120000 wmake/rules/linuxGcc44/X mode change 100644 => 120000 wmake/rules/linuxGcc44/mplib mode change 100644 => 120000 wmake/rules/linuxGcc44/mplibGAMMA mode change 100644 => 120000 wmake/rules/linuxGcc44/mplibMPICH mode change 100644 => 120000 wmake/rules/linuxGcc44/mplibMPICH-GM mode change 100644 => 120000 wmake/rules/linuxGcc44/mplibOPENMPI mode change 100644 => 120000 wmake/rules/linuxIA64Gcc/mplib mode change 100644 => 120000 wmake/rules/linuxIA64Gcc/mplibMPICH mode change 100644 => 120000 wmake/rules/linuxIA64Gcc/mplibOPENMPI mode change 100644 => 120000 wmake/rules/linuxIA64Icc/mplib mode change 100644 => 120000 wmake/rules/linuxIA64Icc/mplibMPICH mode change 100644 => 120000 wmake/rules/linuxIA64Icc/mplibOPENMPI mode change 100644 => 120000 wmake/rules/linuxIcc/X mode change 100644 => 120000 wmake/rules/linuxIcc/mplib mode change 100644 => 120000 wmake/rules/linuxIcc/mplibMPICH mode change 100644 => 120000 wmake/rules/linuxIcc/mplibOPENMPI mode change 100644 => 120000 wmake/rules/linuxPPC64Gcc/mplib mode change 100644 => 120000 wmake/rules/linuxPPC64Gcc/mplibGAMMA mode change 100644 => 120000 wmake/rules/linuxPPC64Gcc/mplibMPICH mode change 100644 => 120000 wmake/rules/linuxPPC64Gcc/mplibMPICH-GM mode change 100644 => 120000 wmake/rules/linuxPPC64Gcc/mplibOPENMPI mode change 100644 => 120000 wmake/rules/linuxPPC64Gcc/mplibQSMPI mode change 100644 => 120000 wmake/rules/linuxmingw32/mplib mode change 100644 => 120000 wmake/rules/linuxmingw32/mplibGAMMA mode change 100644 => 120000 wmake/rules/linuxmingw32/mplibMPICH mode change 100644 => 120000 wmake/rules/linuxmingw32/mplibMPICH-GM mode change 100644 => 120000 wmake/rules/linuxmingw32/mplibOPENMPI mode change 100644 => 120000 wmake/rules/solarisGcc/mplib mode change 100644 => 120000 wmake/rules/solarisGcc/mplibOPENMPI diff --git a/wmake/rules/General/X b/wmake/rules/General/X new file mode 100644 index 0000000000..f55fa8b32c --- /dev/null +++ b/wmake/rules/General/X @@ -0,0 +1,5 @@ +# X11 includes and libraries in the standard location +# +XFLAGS = +XINC = $(XFLAGS) -I/usr/include/X11 +XLIBS = -lXext -lX11 diff --git a/wmake/rules/General/flex b/wmake/rules/General/flex index 06defbb03d..7f726b34c4 100644 --- a/wmake/rules/General/flex +++ b/wmake/rules/General/flex @@ -1,6 +1,6 @@ .SUFFIXES: .l -ltoo = flex $$SOURCE ; mv lex.yy.c $*.c ; $(cc) $(cFLAGS) -c $*.c -o $@ +ltoo = flex -o $*.c $$SOURCE ; $(cc) $(cFLAGS) -c $*.c -o $@ .l.dep: $(MAKE_DEP) diff --git a/wmake/rules/General/flex++ b/wmake/rules/General/flex++ index 304b131c6d..7e7142aa53 100644 --- a/wmake/rules/General/flex++ +++ b/wmake/rules/General/flex++ @@ -1,6 +1,6 @@ .SUFFIXES: .L -Ltoo = flex -+ -f $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@ +Ltoo = flex -+ -o $*.C -f $$SOURCE ; $(CC) $(c++FLAGS) -c $*.C -o $@ .L.dep: $(MAKE_DEP) diff --git a/wmake/rules/General/flex++.test b/wmake/rules/General/flex++.test deleted file mode 100644 index 8503e57905..0000000000 --- a/wmake/rules/General/flex++.test +++ /dev/null @@ -1,6 +0,0 @@ -.SUFFIXES: .L - -Ltoo = flex++ $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@ - -.L.dep: - $(MAKE_DEP) diff --git a/wmake/rules/linux64Gcc42/mplib b/wmake/rules/General/mplib similarity index 100% rename from wmake/rules/linux64Gcc42/mplib rename to wmake/rules/General/mplib diff --git a/wmake/rules/linux64Gcc42/mplibGAMMA b/wmake/rules/General/mplibGAMMA similarity index 100% rename from wmake/rules/linux64Gcc42/mplibGAMMA rename to wmake/rules/General/mplibGAMMA diff --git a/wmake/rules/General/mplibMPICH b/wmake/rules/General/mplibMPICH index ac17f7c1d2..e5a38a8e38 100644 --- a/wmake/rules/General/mplibMPICH +++ b/wmake/rules/General/mplibMPICH @@ -1,3 +1,3 @@ -PFLAGS = +PFLAGS = -DMPICH_SKIP_MPICXX PINC = -I$(MPI_ARCH_PATH)/include PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt diff --git a/wmake/rules/linux64Gcc42/mplibMPICH-GM b/wmake/rules/General/mplibMPICH-GM similarity index 100% rename from wmake/rules/linux64Gcc42/mplibMPICH-GM rename to wmake/rules/General/mplibMPICH-GM diff --git a/wmake/rules/linuxGcc42/mplibOPENMPI b/wmake/rules/General/mplibQSMPI similarity index 71% rename from wmake/rules/linuxGcc42/mplibOPENMPI rename to wmake/rules/General/mplibQSMPI index 834d2d3e22..95ea327379 100644 --- a/wmake/rules/linuxGcc42/mplibOPENMPI +++ b/wmake/rules/General/mplibQSMPI @@ -1,3 +1,4 @@ -PFLAGS = -DOMPI_SKIP_MPICXX +PFLAGS = PINC = -I$(MPI_ARCH_PATH)/include PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi + diff --git a/wmake/rules/SiCortex64Gcc/flex++ b/wmake/rules/SiCortex64Gcc/flex++ index d745628aab..69d6f37319 100644 --- a/wmake/rules/SiCortex64Gcc/flex++ +++ b/wmake/rules/SiCortex64Gcc/flex++ @@ -1,6 +1,6 @@ .SUFFIXES: .L -Ltoo = flex --c++ -f $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@ +Ltoo = flex --c++ -o $*.C -f $$SOURCE ; $(CC) $(c++FLAGS) -c $*.C -o $@ .L.dep: $(MAKE_DEP) diff --git a/wmake/rules/SiCortex64Gcc/mplib b/wmake/rules/SiCortex64Gcc/mplib deleted file mode 100644 index 294bd86150..0000000000 --- a/wmake/rules/SiCortex64Gcc/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/SiCortex64Gcc/mplib b/wmake/rules/SiCortex64Gcc/mplib new file mode 120000 index 0000000000..1fa0d64ec8 --- /dev/null +++ b/wmake/rules/SiCortex64Gcc/mplib @@ -0,0 +1 @@ +../General/mplib \ No newline at end of file diff --git a/wmake/rules/SunOS64Gcc/mplib b/wmake/rules/SunOS64Gcc/mplib deleted file mode 100644 index 8a84b40146..0000000000 --- a/wmake/rules/SunOS64Gcc/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/SunOS64Gcc/mplib b/wmake/rules/SunOS64Gcc/mplib new file mode 120000 index 0000000000..1fa0d64ec8 --- /dev/null +++ b/wmake/rules/SunOS64Gcc/mplib @@ -0,0 +1 @@ +../General/mplib \ No newline at end of file diff --git a/wmake/rules/SunOS64Gcc/mplibOPENMPI b/wmake/rules/SunOS64Gcc/mplibOPENMPI deleted file mode 100644 index 834d2d3e22..0000000000 --- a/wmake/rules/SunOS64Gcc/mplibOPENMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi diff --git a/wmake/rules/SunOS64Gcc/mplibOPENMPI b/wmake/rules/SunOS64Gcc/mplibOPENMPI new file mode 120000 index 0000000000..2d938a16a6 --- /dev/null +++ b/wmake/rules/SunOS64Gcc/mplibOPENMPI @@ -0,0 +1 @@ +../General/mplibOPENMPI \ No newline at end of file diff --git a/wmake/rules/linux64Gcc/X b/wmake/rules/linux64Gcc/X deleted file mode 100644 index 47480abd22..0000000000 --- a/wmake/rules/linux64Gcc/X +++ /dev/null @@ -1,3 +0,0 @@ -XFLAGS = -XINC = $(XFLAGS) -I/usr/include/X11 -XLIBS = -L/usr/lib64 -lXext -lX11 diff --git a/wmake/rules/linux64Gcc/X b/wmake/rules/linux64Gcc/X new file mode 120000 index 0000000000..73572d6c04 --- /dev/null +++ b/wmake/rules/linux64Gcc/X @@ -0,0 +1 @@ +../General/X \ No newline at end of file diff --git a/wmake/rules/linux64Gcc/mplib b/wmake/rules/linux64Gcc/mplib deleted file mode 100644 index 294bd86150..0000000000 --- a/wmake/rules/linux64Gcc/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/linux64Gcc/mplib b/wmake/rules/linux64Gcc/mplib new file mode 120000 index 0000000000..1fa0d64ec8 --- /dev/null +++ b/wmake/rules/linux64Gcc/mplib @@ -0,0 +1 @@ +../General/mplib \ No newline at end of file diff --git a/wmake/rules/linux64Gcc/mplibGAMMA b/wmake/rules/linux64Gcc/mplibGAMMA deleted file mode 100644 index 11606f2984..0000000000 --- a/wmake/rules/linux64Gcc/mplibGAMMA +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lgamma diff --git a/wmake/rules/linux64Gcc/mplibGAMMA b/wmake/rules/linux64Gcc/mplibGAMMA new file mode 120000 index 0000000000..4b41692bf6 --- /dev/null +++ b/wmake/rules/linux64Gcc/mplibGAMMA @@ -0,0 +1 @@ +../General/mplibGAMMA \ No newline at end of file diff --git a/wmake/rules/linux64Gcc/mplibMPICH b/wmake/rules/linux64Gcc/mplibMPICH deleted file mode 100644 index e5a38a8e38..0000000000 --- a/wmake/rules/linux64Gcc/mplibMPICH +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DMPICH_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt diff --git a/wmake/rules/linux64Gcc/mplibMPICH b/wmake/rules/linux64Gcc/mplibMPICH new file mode 120000 index 0000000000..c83eb564e1 --- /dev/null +++ b/wmake/rules/linux64Gcc/mplibMPICH @@ -0,0 +1 @@ +../General/mplibMPICH \ No newline at end of file diff --git a/wmake/rules/linux64Gcc/mplibMPICH-GM b/wmake/rules/linux64Gcc/mplibMPICH-GM deleted file mode 100644 index 88493ebc70..0000000000 --- a/wmake/rules/linux64Gcc/mplibMPICH-GM +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm diff --git a/wmake/rules/linux64Gcc/mplibMPICH-GM b/wmake/rules/linux64Gcc/mplibMPICH-GM new file mode 120000 index 0000000000..621d0857d3 --- /dev/null +++ b/wmake/rules/linux64Gcc/mplibMPICH-GM @@ -0,0 +1 @@ +../General/mplibMPICH-GM \ No newline at end of file diff --git a/wmake/rules/linux64Gcc/mplibOPENMPI b/wmake/rules/linux64Gcc/mplibOPENMPI deleted file mode 100644 index 834d2d3e22..0000000000 --- a/wmake/rules/linux64Gcc/mplibOPENMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi diff --git a/wmake/rules/linux64Gcc/mplibOPENMPI b/wmake/rules/linux64Gcc/mplibOPENMPI new file mode 120000 index 0000000000..2d938a16a6 --- /dev/null +++ b/wmake/rules/linux64Gcc/mplibOPENMPI @@ -0,0 +1 @@ +../General/mplibOPENMPI \ No newline at end of file diff --git a/wmake/rules/linux64Gcc/mplibQSMPI b/wmake/rules/linux64Gcc/mplibQSMPI deleted file mode 100644 index 95ea327379..0000000000 --- a/wmake/rules/linux64Gcc/mplibQSMPI +++ /dev/null @@ -1,4 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi - diff --git a/wmake/rules/linux64Gcc/mplibQSMPI b/wmake/rules/linux64Gcc/mplibQSMPI new file mode 120000 index 0000000000..d3446c68f1 --- /dev/null +++ b/wmake/rules/linux64Gcc/mplibQSMPI @@ -0,0 +1 @@ +../General/mplibQSMPI \ No newline at end of file diff --git a/wmake/rules/linux64Gcc42/X b/wmake/rules/linux64Gcc42/X deleted file mode 100644 index 5d1f9c5cc5..0000000000 --- a/wmake/rules/linux64Gcc42/X +++ /dev/null @@ -1,3 +0,0 @@ -XFLAGS = -XINC = $(XFLAGS) -I/usr/X11R6/include -XLIBS = -L/usr/X11R6/lib64 -lXext -lX11 diff --git a/wmake/rules/linux64Gcc42/c b/wmake/rules/linux64Gcc42/c deleted file mode 100644 index 80bb80f32f..0000000000 --- a/wmake/rules/linux64Gcc42/c +++ /dev/null @@ -1,16 +0,0 @@ -.SUFFIXES: .c .h - -cWARN = -Wall - -cc = gcc -m64 - -include $(RULES)/c$(WM_COMPILE_OPTION) - -cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC - -ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@ - -LINK_LIBS = $(cDBUG) - -LINKLIBSO = $(cc) -shared -LINKEXE = $(cc) -Xlinker -z -Xlinker nodefs diff --git a/wmake/rules/linux64Gcc42/c++ b/wmake/rules/linux64Gcc42/c++ deleted file mode 100644 index 677b1e5bb4..0000000000 --- a/wmake/rules/linux64Gcc42/c++ +++ /dev/null @@ -1,21 +0,0 @@ -.SUFFIXES: .C .cxx .cc .cpp - -c++WARN = -Wall -Wno-strict-aliasing -Wextra -Wno-unused-parameter -Wold-style-cast - -CC = g++ -m64 - -include $(RULES)/c++$(WM_COMPILE_OPTION) - -ptFLAGS = -DNoRepository -ftemplate-depth-60 - -c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC - -Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@ -cxxtoo = $(Ctoo) -cctoo = $(Ctoo) -cpptoo = $(Ctoo) - -LINK_LIBS = $(c++DBUG) - -LINKLIBSO = $(CC) $(c++FLAGS) -shared -LINKEXE = $(CC) $(c++FLAGS) diff --git a/wmake/rules/linux64Gcc42/c++Debug b/wmake/rules/linux64Gcc42/c++Debug deleted file mode 100644 index 19bdb9c334..0000000000 --- a/wmake/rules/linux64Gcc42/c++Debug +++ /dev/null @@ -1,2 +0,0 @@ -c++DBUG = -ggdb3 -DFULLDEBUG -c++OPT = -O0 -fdefault-inline diff --git a/wmake/rules/linux64Gcc42/c++Opt b/wmake/rules/linux64Gcc42/c++Opt deleted file mode 100644 index 3446f7f58c..0000000000 --- a/wmake/rules/linux64Gcc42/c++Opt +++ /dev/null @@ -1,4 +0,0 @@ -c++DBUG = -c++OPT = -O3 -#c++OPT = -march=nocona -O3 -# -ftree-vectorize -ftree-vectorizer-verbose=3 diff --git a/wmake/rules/linux64Gcc42/c++Prof b/wmake/rules/linux64Gcc42/c++Prof deleted file mode 100644 index 3bda4dad55..0000000000 --- a/wmake/rules/linux64Gcc42/c++Prof +++ /dev/null @@ -1,2 +0,0 @@ -c++DBUG = -pg -c++OPT = -O2 diff --git a/wmake/rules/linux64Gcc42/cDebug b/wmake/rules/linux64Gcc42/cDebug deleted file mode 100644 index 72b638f458..0000000000 --- a/wmake/rules/linux64Gcc42/cDebug +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -ggdb -DFULLDEBUG -cOPT = -O1 -fdefault-inline -finline-functions diff --git a/wmake/rules/linux64Gcc42/cOpt b/wmake/rules/linux64Gcc42/cOpt deleted file mode 100644 index 17318709f1..0000000000 --- a/wmake/rules/linux64Gcc42/cOpt +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -cOPT = -O3 diff --git a/wmake/rules/linux64Gcc42/cProf b/wmake/rules/linux64Gcc42/cProf deleted file mode 100644 index ca3ac9bf5f..0000000000 --- a/wmake/rules/linux64Gcc42/cProf +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -pg -cOPT = -O2 diff --git a/wmake/rules/linux64Gcc42/general b/wmake/rules/linux64Gcc42/general deleted file mode 100644 index d70a77cdb0..0000000000 --- a/wmake/rules/linux64Gcc42/general +++ /dev/null @@ -1,10 +0,0 @@ -CPP = /lib/cpp $(GFLAGS) -LD = ld -A64 - -PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl - -include $(GENERAL_RULES)/standard - -include $(RULES)/X -include $(RULES)/c -include $(RULES)/c++ diff --git a/wmake/rules/linux64Gcc42/mplibHPMPI b/wmake/rules/linux64Gcc42/mplibHPMPI deleted file mode 100644 index 574492a236..0000000000 --- a/wmake/rules/linux64Gcc42/mplibHPMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -D_MPICC_H -PLIBS = -L$(MPI_ARCH_PATH)/lib/linux_amd64 -lmpi diff --git a/wmake/rules/linux64Gcc42/mplibMPICH b/wmake/rules/linux64Gcc42/mplibMPICH deleted file mode 100644 index e5a38a8e38..0000000000 --- a/wmake/rules/linux64Gcc42/mplibMPICH +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DMPICH_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt diff --git a/wmake/rules/linux64Gcc42/mplibOPENMPI b/wmake/rules/linux64Gcc42/mplibOPENMPI deleted file mode 100644 index 834d2d3e22..0000000000 --- a/wmake/rules/linux64Gcc42/mplibOPENMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi diff --git a/wmake/rules/linux64Gcc42/mplibSYSTEMOPENMPI b/wmake/rules/linux64Gcc42/mplibSYSTEMOPENMPI deleted file mode 120000 index cc63a574c3..0000000000 --- a/wmake/rules/linux64Gcc42/mplibSYSTEMOPENMPI +++ /dev/null @@ -1 +0,0 @@ -../General/mplibSYSTEMOPENMPI \ No newline at end of file diff --git a/wmake/rules/linux64Gcc43/X b/wmake/rules/linux64Gcc43/X deleted file mode 100644 index 5d1f9c5cc5..0000000000 --- a/wmake/rules/linux64Gcc43/X +++ /dev/null @@ -1,3 +0,0 @@ -XFLAGS = -XINC = $(XFLAGS) -I/usr/X11R6/include -XLIBS = -L/usr/X11R6/lib64 -lXext -lX11 diff --git a/wmake/rules/linux64Gcc43/X b/wmake/rules/linux64Gcc43/X new file mode 120000 index 0000000000..73572d6c04 --- /dev/null +++ b/wmake/rules/linux64Gcc43/X @@ -0,0 +1 @@ +../General/X \ No newline at end of file diff --git a/wmake/rules/linux64Gcc43/mplib b/wmake/rules/linux64Gcc43/mplib deleted file mode 100644 index 294bd86150..0000000000 --- a/wmake/rules/linux64Gcc43/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/linux64Gcc43/mplib b/wmake/rules/linux64Gcc43/mplib new file mode 120000 index 0000000000..1fa0d64ec8 --- /dev/null +++ b/wmake/rules/linux64Gcc43/mplib @@ -0,0 +1 @@ +../General/mplib \ No newline at end of file diff --git a/wmake/rules/linux64Gcc43/mplibGAMMA b/wmake/rules/linux64Gcc43/mplibGAMMA deleted file mode 100644 index 11606f2984..0000000000 --- a/wmake/rules/linux64Gcc43/mplibGAMMA +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lgamma diff --git a/wmake/rules/linux64Gcc43/mplibGAMMA b/wmake/rules/linux64Gcc43/mplibGAMMA new file mode 120000 index 0000000000..4b41692bf6 --- /dev/null +++ b/wmake/rules/linux64Gcc43/mplibGAMMA @@ -0,0 +1 @@ +../General/mplibGAMMA \ No newline at end of file diff --git a/wmake/rules/linux64Gcc43/mplibMPICH b/wmake/rules/linux64Gcc43/mplibMPICH deleted file mode 100644 index e5a38a8e38..0000000000 --- a/wmake/rules/linux64Gcc43/mplibMPICH +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DMPICH_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt diff --git a/wmake/rules/linux64Gcc43/mplibMPICH b/wmake/rules/linux64Gcc43/mplibMPICH new file mode 120000 index 0000000000..c83eb564e1 --- /dev/null +++ b/wmake/rules/linux64Gcc43/mplibMPICH @@ -0,0 +1 @@ +../General/mplibMPICH \ No newline at end of file diff --git a/wmake/rules/linux64Gcc43/mplibMPICH-GM b/wmake/rules/linux64Gcc43/mplibMPICH-GM deleted file mode 100644 index 88493ebc70..0000000000 --- a/wmake/rules/linux64Gcc43/mplibMPICH-GM +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm diff --git a/wmake/rules/linux64Gcc43/mplibMPICH-GM b/wmake/rules/linux64Gcc43/mplibMPICH-GM new file mode 120000 index 0000000000..621d0857d3 --- /dev/null +++ b/wmake/rules/linux64Gcc43/mplibMPICH-GM @@ -0,0 +1 @@ +../General/mplibMPICH-GM \ No newline at end of file diff --git a/wmake/rules/linux64Gcc43/mplibOPENMPI b/wmake/rules/linux64Gcc43/mplibOPENMPI deleted file mode 100644 index 834d2d3e22..0000000000 --- a/wmake/rules/linux64Gcc43/mplibOPENMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi diff --git a/wmake/rules/linux64Gcc43/mplibOPENMPI b/wmake/rules/linux64Gcc43/mplibOPENMPI new file mode 120000 index 0000000000..2d938a16a6 --- /dev/null +++ b/wmake/rules/linux64Gcc43/mplibOPENMPI @@ -0,0 +1 @@ +../General/mplibOPENMPI \ No newline at end of file diff --git a/wmake/rules/linux64Gcc43/mplibQSMPI b/wmake/rules/linux64Gcc43/mplibQSMPI deleted file mode 100644 index 95ea327379..0000000000 --- a/wmake/rules/linux64Gcc43/mplibQSMPI +++ /dev/null @@ -1,4 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi - diff --git a/wmake/rules/linux64Gcc43/mplibQSMPI b/wmake/rules/linux64Gcc43/mplibQSMPI new file mode 120000 index 0000000000..d3446c68f1 --- /dev/null +++ b/wmake/rules/linux64Gcc43/mplibQSMPI @@ -0,0 +1 @@ +../General/mplibQSMPI \ No newline at end of file diff --git a/wmake/rules/linux64Gcc44/X b/wmake/rules/linux64Gcc44/X deleted file mode 100644 index 5d1f9c5cc5..0000000000 --- a/wmake/rules/linux64Gcc44/X +++ /dev/null @@ -1,3 +0,0 @@ -XFLAGS = -XINC = $(XFLAGS) -I/usr/X11R6/include -XLIBS = -L/usr/X11R6/lib64 -lXext -lX11 diff --git a/wmake/rules/linux64Gcc44/X b/wmake/rules/linux64Gcc44/X new file mode 120000 index 0000000000..73572d6c04 --- /dev/null +++ b/wmake/rules/linux64Gcc44/X @@ -0,0 +1 @@ +../General/X \ No newline at end of file diff --git a/wmake/rules/linux64Gcc44/mplib b/wmake/rules/linux64Gcc44/mplib deleted file mode 100644 index 294bd86150..0000000000 --- a/wmake/rules/linux64Gcc44/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/linux64Gcc44/mplib b/wmake/rules/linux64Gcc44/mplib new file mode 120000 index 0000000000..1fa0d64ec8 --- /dev/null +++ b/wmake/rules/linux64Gcc44/mplib @@ -0,0 +1 @@ +../General/mplib \ No newline at end of file diff --git a/wmake/rules/linux64Gcc44/mplibGAMMA b/wmake/rules/linux64Gcc44/mplibGAMMA deleted file mode 100644 index 11606f2984..0000000000 --- a/wmake/rules/linux64Gcc44/mplibGAMMA +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lgamma diff --git a/wmake/rules/linux64Gcc44/mplibGAMMA b/wmake/rules/linux64Gcc44/mplibGAMMA new file mode 120000 index 0000000000..4b41692bf6 --- /dev/null +++ b/wmake/rules/linux64Gcc44/mplibGAMMA @@ -0,0 +1 @@ +../General/mplibGAMMA \ No newline at end of file diff --git a/wmake/rules/linux64Gcc44/mplibMPICH b/wmake/rules/linux64Gcc44/mplibMPICH deleted file mode 100644 index e5a38a8e38..0000000000 --- a/wmake/rules/linux64Gcc44/mplibMPICH +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DMPICH_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt diff --git a/wmake/rules/linux64Gcc44/mplibMPICH b/wmake/rules/linux64Gcc44/mplibMPICH new file mode 120000 index 0000000000..c83eb564e1 --- /dev/null +++ b/wmake/rules/linux64Gcc44/mplibMPICH @@ -0,0 +1 @@ +../General/mplibMPICH \ No newline at end of file diff --git a/wmake/rules/linux64Gcc44/mplibMPICH-GM b/wmake/rules/linux64Gcc44/mplibMPICH-GM deleted file mode 100644 index 88493ebc70..0000000000 --- a/wmake/rules/linux64Gcc44/mplibMPICH-GM +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm diff --git a/wmake/rules/linux64Gcc44/mplibMPICH-GM b/wmake/rules/linux64Gcc44/mplibMPICH-GM new file mode 120000 index 0000000000..621d0857d3 --- /dev/null +++ b/wmake/rules/linux64Gcc44/mplibMPICH-GM @@ -0,0 +1 @@ +../General/mplibMPICH-GM \ No newline at end of file diff --git a/wmake/rules/linux64Gcc44/mplibOPENMPI b/wmake/rules/linux64Gcc44/mplibOPENMPI deleted file mode 100644 index 834d2d3e22..0000000000 --- a/wmake/rules/linux64Gcc44/mplibOPENMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi diff --git a/wmake/rules/linux64Gcc44/mplibOPENMPI b/wmake/rules/linux64Gcc44/mplibOPENMPI new file mode 120000 index 0000000000..2d938a16a6 --- /dev/null +++ b/wmake/rules/linux64Gcc44/mplibOPENMPI @@ -0,0 +1 @@ +../General/mplibOPENMPI \ No newline at end of file diff --git a/wmake/rules/linux64Gcc44/mplibQSMPI b/wmake/rules/linux64Gcc44/mplibQSMPI deleted file mode 100644 index 95ea327379..0000000000 --- a/wmake/rules/linux64Gcc44/mplibQSMPI +++ /dev/null @@ -1,4 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi - diff --git a/wmake/rules/linux64Gcc44/mplibQSMPI b/wmake/rules/linux64Gcc44/mplibQSMPI new file mode 120000 index 0000000000..d3446c68f1 --- /dev/null +++ b/wmake/rules/linux64Gcc44/mplibQSMPI @@ -0,0 +1 @@ +../General/mplibQSMPI \ No newline at end of file diff --git a/wmake/rules/linux64Icc/X b/wmake/rules/linux64Icc/X deleted file mode 100644 index 5d1f9c5cc5..0000000000 --- a/wmake/rules/linux64Icc/X +++ /dev/null @@ -1,3 +0,0 @@ -XFLAGS = -XINC = $(XFLAGS) -I/usr/X11R6/include -XLIBS = -L/usr/X11R6/lib64 -lXext -lX11 diff --git a/wmake/rules/linux64Icc/X b/wmake/rules/linux64Icc/X new file mode 120000 index 0000000000..73572d6c04 --- /dev/null +++ b/wmake/rules/linux64Icc/X @@ -0,0 +1 @@ +../General/X \ No newline at end of file diff --git a/wmake/rules/linux64Icc/mplib b/wmake/rules/linux64Icc/mplib deleted file mode 100644 index 8a84b40146..0000000000 --- a/wmake/rules/linux64Icc/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/linux64Icc/mplib b/wmake/rules/linux64Icc/mplib new file mode 120000 index 0000000000..1fa0d64ec8 --- /dev/null +++ b/wmake/rules/linux64Icc/mplib @@ -0,0 +1 @@ +../General/mplib \ No newline at end of file diff --git a/wmake/rules/linux64Icc/mplibMPICH b/wmake/rules/linux64Icc/mplibMPICH deleted file mode 100644 index e5a38a8e38..0000000000 --- a/wmake/rules/linux64Icc/mplibMPICH +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DMPICH_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt diff --git a/wmake/rules/linux64Icc/mplibMPICH b/wmake/rules/linux64Icc/mplibMPICH new file mode 120000 index 0000000000..c83eb564e1 --- /dev/null +++ b/wmake/rules/linux64Icc/mplibMPICH @@ -0,0 +1 @@ +../General/mplibMPICH \ No newline at end of file diff --git a/wmake/rules/linux64Icc/mplibOPENMPI b/wmake/rules/linux64Icc/mplibOPENMPI deleted file mode 100644 index 834d2d3e22..0000000000 --- a/wmake/rules/linux64Icc/mplibOPENMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi diff --git a/wmake/rules/linux64Icc/mplibOPENMPI b/wmake/rules/linux64Icc/mplibOPENMPI new file mode 120000 index 0000000000..2d938a16a6 --- /dev/null +++ b/wmake/rules/linux64Icc/mplibOPENMPI @@ -0,0 +1 @@ +../General/mplibOPENMPI \ No newline at end of file diff --git a/wmake/rules/linuxGcc/X b/wmake/rules/linuxGcc/X deleted file mode 100644 index bed8bfeddf..0000000000 --- a/wmake/rules/linuxGcc/X +++ /dev/null @@ -1,3 +0,0 @@ -XFLAGS = -XINC = $(XFLAGS) -I/usr/X11R6/include -XLIBS = -L/usr/X11R6/lib -lXext -lX11 diff --git a/wmake/rules/linuxGcc/X b/wmake/rules/linuxGcc/X new file mode 120000 index 0000000000..73572d6c04 --- /dev/null +++ b/wmake/rules/linuxGcc/X @@ -0,0 +1 @@ +../General/X \ No newline at end of file diff --git a/wmake/rules/linuxGcc/mplib b/wmake/rules/linuxGcc/mplib deleted file mode 100644 index 294bd86150..0000000000 --- a/wmake/rules/linuxGcc/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/linuxGcc/mplib b/wmake/rules/linuxGcc/mplib new file mode 120000 index 0000000000..1fa0d64ec8 --- /dev/null +++ b/wmake/rules/linuxGcc/mplib @@ -0,0 +1 @@ +../General/mplib \ No newline at end of file diff --git a/wmake/rules/linuxGcc/mplibGAMMA b/wmake/rules/linuxGcc/mplibGAMMA deleted file mode 100644 index 11606f2984..0000000000 --- a/wmake/rules/linuxGcc/mplibGAMMA +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lgamma diff --git a/wmake/rules/linuxGcc/mplibGAMMA b/wmake/rules/linuxGcc/mplibGAMMA new file mode 120000 index 0000000000..4b41692bf6 --- /dev/null +++ b/wmake/rules/linuxGcc/mplibGAMMA @@ -0,0 +1 @@ +../General/mplibGAMMA \ No newline at end of file diff --git a/wmake/rules/linuxGcc/mplibMPICH b/wmake/rules/linuxGcc/mplibMPICH deleted file mode 100644 index e5a38a8e38..0000000000 --- a/wmake/rules/linuxGcc/mplibMPICH +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DMPICH_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt diff --git a/wmake/rules/linuxGcc/mplibMPICH b/wmake/rules/linuxGcc/mplibMPICH new file mode 120000 index 0000000000..c83eb564e1 --- /dev/null +++ b/wmake/rules/linuxGcc/mplibMPICH @@ -0,0 +1 @@ +../General/mplibMPICH \ No newline at end of file diff --git a/wmake/rules/linuxGcc/mplibMPICH-GM b/wmake/rules/linuxGcc/mplibMPICH-GM deleted file mode 100644 index 88493ebc70..0000000000 --- a/wmake/rules/linuxGcc/mplibMPICH-GM +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm diff --git a/wmake/rules/linuxGcc/mplibMPICH-GM b/wmake/rules/linuxGcc/mplibMPICH-GM new file mode 120000 index 0000000000..621d0857d3 --- /dev/null +++ b/wmake/rules/linuxGcc/mplibMPICH-GM @@ -0,0 +1 @@ +../General/mplibMPICH-GM \ No newline at end of file diff --git a/wmake/rules/linuxGcc/mplibOPENMPI b/wmake/rules/linuxGcc/mplibOPENMPI deleted file mode 100644 index 834d2d3e22..0000000000 --- a/wmake/rules/linuxGcc/mplibOPENMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi diff --git a/wmake/rules/linuxGcc/mplibOPENMPI b/wmake/rules/linuxGcc/mplibOPENMPI new file mode 120000 index 0000000000..2d938a16a6 --- /dev/null +++ b/wmake/rules/linuxGcc/mplibOPENMPI @@ -0,0 +1 @@ +../General/mplibOPENMPI \ No newline at end of file diff --git a/wmake/rules/linuxGcc42/X b/wmake/rules/linuxGcc42/X deleted file mode 100644 index bed8bfeddf..0000000000 --- a/wmake/rules/linuxGcc42/X +++ /dev/null @@ -1,3 +0,0 @@ -XFLAGS = -XINC = $(XFLAGS) -I/usr/X11R6/include -XLIBS = -L/usr/X11R6/lib -lXext -lX11 diff --git a/wmake/rules/linuxGcc42/c b/wmake/rules/linuxGcc42/c deleted file mode 100644 index 8db5da1047..0000000000 --- a/wmake/rules/linuxGcc42/c +++ /dev/null @@ -1,16 +0,0 @@ -.SUFFIXES: .c .h - -cWARN = -Wall - -cc = gcc -m32 - -include $(RULES)/c$(WM_COMPILE_OPTION) - -cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC - -ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@ - -LINK_LIBS = $(cDBUG) - -LINKLIBSO = $(cc) -shared -LINKEXE = $(cc) -Xlinker -z -Xlinker nodefs diff --git a/wmake/rules/linuxGcc42/c++ b/wmake/rules/linuxGcc42/c++ deleted file mode 100644 index 32d12ad9de..0000000000 --- a/wmake/rules/linuxGcc42/c++ +++ /dev/null @@ -1,21 +0,0 @@ -.SUFFIXES: .C .cxx .cc .cpp - -c++WARN = -Wall -Wno-strict-aliasing -Wextra -Wno-unused-parameter -Wold-style-cast - -CC = g++ -m32 - -include $(RULES)/c++$(WM_COMPILE_OPTION) - -ptFLAGS = -DNoRepository -ftemplate-depth-60 - -c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC -pthread - -Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@ -cxxtoo = $(Ctoo) -cctoo = $(Ctoo) -cpptoo = $(Ctoo) - -LINK_LIBS = $(c++DBUG) - -LINKLIBSO = $(CC) $(c++FLAGS) -shared -LINKEXE = $(CC) $(c++FLAGS) diff --git a/wmake/rules/linuxGcc42/c++Debug b/wmake/rules/linuxGcc42/c++Debug deleted file mode 100644 index 19bdb9c334..0000000000 --- a/wmake/rules/linuxGcc42/c++Debug +++ /dev/null @@ -1,2 +0,0 @@ -c++DBUG = -ggdb3 -DFULLDEBUG -c++OPT = -O0 -fdefault-inline diff --git a/wmake/rules/linuxGcc42/c++Opt b/wmake/rules/linuxGcc42/c++Opt deleted file mode 100644 index 2aedabd628..0000000000 --- a/wmake/rules/linuxGcc42/c++Opt +++ /dev/null @@ -1,2 +0,0 @@ -c++DBUG = -c++OPT = -O3 diff --git a/wmake/rules/linuxGcc42/c++Prof b/wmake/rules/linuxGcc42/c++Prof deleted file mode 100644 index 3bda4dad55..0000000000 --- a/wmake/rules/linuxGcc42/c++Prof +++ /dev/null @@ -1,2 +0,0 @@ -c++DBUG = -pg -c++OPT = -O2 diff --git a/wmake/rules/linuxGcc42/cDebug b/wmake/rules/linuxGcc42/cDebug deleted file mode 100644 index 6c71ed93e8..0000000000 --- a/wmake/rules/linuxGcc42/cDebug +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -ggdb -DFULLDEBUG -cOPT = -O1 -finline-functions diff --git a/wmake/rules/linuxGcc42/cOpt b/wmake/rules/linuxGcc42/cOpt deleted file mode 100644 index 17318709f1..0000000000 --- a/wmake/rules/linuxGcc42/cOpt +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -cOPT = -O3 diff --git a/wmake/rules/linuxGcc42/cProf b/wmake/rules/linuxGcc42/cProf deleted file mode 100644 index ca3ac9bf5f..0000000000 --- a/wmake/rules/linuxGcc42/cProf +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -pg -cOPT = -O2 diff --git a/wmake/rules/linuxGcc42/general b/wmake/rules/linuxGcc42/general deleted file mode 100644 index c300368ee6..0000000000 --- a/wmake/rules/linuxGcc42/general +++ /dev/null @@ -1,10 +0,0 @@ -CPP = /lib/cpp $(GFLAGS) -LD = ld -melf_i386 - -PROJECT_LIBS = -l$(WM_PROJECT) -ldl - -include $(GENERAL_RULES)/standard - -include $(RULES)/X -include $(RULES)/c -include $(RULES)/c++ diff --git a/wmake/rules/linuxGcc42/mplib b/wmake/rules/linuxGcc42/mplib deleted file mode 100644 index 294bd86150..0000000000 --- a/wmake/rules/linuxGcc42/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/linuxGcc42/mplibGAMMA b/wmake/rules/linuxGcc42/mplibGAMMA deleted file mode 100644 index 11606f2984..0000000000 --- a/wmake/rules/linuxGcc42/mplibGAMMA +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lgamma diff --git a/wmake/rules/linuxGcc42/mplibHPMPI b/wmake/rules/linuxGcc42/mplibHPMPI deleted file mode 100644 index 8aff40632b..0000000000 --- a/wmake/rules/linuxGcc42/mplibHPMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -D_MPICC_H -PLIBS = -L$(MPI_ARCH_PATH)/lib/linux_ia32 -lmpi diff --git a/wmake/rules/linuxGcc42/mplibMPICH b/wmake/rules/linuxGcc42/mplibMPICH deleted file mode 100644 index e5a38a8e38..0000000000 --- a/wmake/rules/linuxGcc42/mplibMPICH +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DMPICH_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt diff --git a/wmake/rules/linuxGcc42/mplibMPICH-GM b/wmake/rules/linuxGcc42/mplibMPICH-GM deleted file mode 100644 index 88493ebc70..0000000000 --- a/wmake/rules/linuxGcc42/mplibMPICH-GM +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm diff --git a/wmake/rules/linuxGcc42/mplibSYSTEMOPENMPI b/wmake/rules/linuxGcc42/mplibSYSTEMOPENMPI deleted file mode 120000 index cc63a574c3..0000000000 --- a/wmake/rules/linuxGcc42/mplibSYSTEMOPENMPI +++ /dev/null @@ -1 +0,0 @@ -../General/mplibSYSTEMOPENMPI \ No newline at end of file diff --git a/wmake/rules/linuxGcc43/X b/wmake/rules/linuxGcc43/X deleted file mode 100644 index bed8bfeddf..0000000000 --- a/wmake/rules/linuxGcc43/X +++ /dev/null @@ -1,3 +0,0 @@ -XFLAGS = -XINC = $(XFLAGS) -I/usr/X11R6/include -XLIBS = -L/usr/X11R6/lib -lXext -lX11 diff --git a/wmake/rules/linuxGcc43/X b/wmake/rules/linuxGcc43/X new file mode 120000 index 0000000000..73572d6c04 --- /dev/null +++ b/wmake/rules/linuxGcc43/X @@ -0,0 +1 @@ +../General/X \ No newline at end of file diff --git a/wmake/rules/linuxGcc43/mplib b/wmake/rules/linuxGcc43/mplib deleted file mode 100644 index 294bd86150..0000000000 --- a/wmake/rules/linuxGcc43/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/linuxGcc43/mplib b/wmake/rules/linuxGcc43/mplib new file mode 120000 index 0000000000..1fa0d64ec8 --- /dev/null +++ b/wmake/rules/linuxGcc43/mplib @@ -0,0 +1 @@ +../General/mplib \ No newline at end of file diff --git a/wmake/rules/linuxGcc43/mplibGAMMA b/wmake/rules/linuxGcc43/mplibGAMMA deleted file mode 100644 index 11606f2984..0000000000 --- a/wmake/rules/linuxGcc43/mplibGAMMA +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lgamma diff --git a/wmake/rules/linuxGcc43/mplibGAMMA b/wmake/rules/linuxGcc43/mplibGAMMA new file mode 120000 index 0000000000..4b41692bf6 --- /dev/null +++ b/wmake/rules/linuxGcc43/mplibGAMMA @@ -0,0 +1 @@ +../General/mplibGAMMA \ No newline at end of file diff --git a/wmake/rules/linuxGcc43/mplibMPICH b/wmake/rules/linuxGcc43/mplibMPICH deleted file mode 100644 index e5a38a8e38..0000000000 --- a/wmake/rules/linuxGcc43/mplibMPICH +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DMPICH_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt diff --git a/wmake/rules/linuxGcc43/mplibMPICH b/wmake/rules/linuxGcc43/mplibMPICH new file mode 120000 index 0000000000..c83eb564e1 --- /dev/null +++ b/wmake/rules/linuxGcc43/mplibMPICH @@ -0,0 +1 @@ +../General/mplibMPICH \ No newline at end of file diff --git a/wmake/rules/linuxGcc43/mplibMPICH-GM b/wmake/rules/linuxGcc43/mplibMPICH-GM deleted file mode 100644 index 88493ebc70..0000000000 --- a/wmake/rules/linuxGcc43/mplibMPICH-GM +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm diff --git a/wmake/rules/linuxGcc43/mplibMPICH-GM b/wmake/rules/linuxGcc43/mplibMPICH-GM new file mode 120000 index 0000000000..621d0857d3 --- /dev/null +++ b/wmake/rules/linuxGcc43/mplibMPICH-GM @@ -0,0 +1 @@ +../General/mplibMPICH-GM \ No newline at end of file diff --git a/wmake/rules/linuxGcc43/mplibOPENMPI b/wmake/rules/linuxGcc43/mplibOPENMPI deleted file mode 100644 index 834d2d3e22..0000000000 --- a/wmake/rules/linuxGcc43/mplibOPENMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi diff --git a/wmake/rules/linuxGcc43/mplibOPENMPI b/wmake/rules/linuxGcc43/mplibOPENMPI new file mode 120000 index 0000000000..2d938a16a6 --- /dev/null +++ b/wmake/rules/linuxGcc43/mplibOPENMPI @@ -0,0 +1 @@ +../General/mplibOPENMPI \ No newline at end of file diff --git a/wmake/rules/linuxGcc44/X b/wmake/rules/linuxGcc44/X deleted file mode 100644 index bed8bfeddf..0000000000 --- a/wmake/rules/linuxGcc44/X +++ /dev/null @@ -1,3 +0,0 @@ -XFLAGS = -XINC = $(XFLAGS) -I/usr/X11R6/include -XLIBS = -L/usr/X11R6/lib -lXext -lX11 diff --git a/wmake/rules/linuxGcc44/X b/wmake/rules/linuxGcc44/X new file mode 120000 index 0000000000..73572d6c04 --- /dev/null +++ b/wmake/rules/linuxGcc44/X @@ -0,0 +1 @@ +../General/X \ No newline at end of file diff --git a/wmake/rules/linuxGcc44/mplib b/wmake/rules/linuxGcc44/mplib deleted file mode 100644 index 294bd86150..0000000000 --- a/wmake/rules/linuxGcc44/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/linuxGcc44/mplib b/wmake/rules/linuxGcc44/mplib new file mode 120000 index 0000000000..1fa0d64ec8 --- /dev/null +++ b/wmake/rules/linuxGcc44/mplib @@ -0,0 +1 @@ +../General/mplib \ No newline at end of file diff --git a/wmake/rules/linuxGcc44/mplibGAMMA b/wmake/rules/linuxGcc44/mplibGAMMA deleted file mode 100644 index 11606f2984..0000000000 --- a/wmake/rules/linuxGcc44/mplibGAMMA +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lgamma diff --git a/wmake/rules/linuxGcc44/mplibGAMMA b/wmake/rules/linuxGcc44/mplibGAMMA new file mode 120000 index 0000000000..4b41692bf6 --- /dev/null +++ b/wmake/rules/linuxGcc44/mplibGAMMA @@ -0,0 +1 @@ +../General/mplibGAMMA \ No newline at end of file diff --git a/wmake/rules/linuxGcc44/mplibMPICH b/wmake/rules/linuxGcc44/mplibMPICH deleted file mode 100644 index e5a38a8e38..0000000000 --- a/wmake/rules/linuxGcc44/mplibMPICH +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DMPICH_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt diff --git a/wmake/rules/linuxGcc44/mplibMPICH b/wmake/rules/linuxGcc44/mplibMPICH new file mode 120000 index 0000000000..c83eb564e1 --- /dev/null +++ b/wmake/rules/linuxGcc44/mplibMPICH @@ -0,0 +1 @@ +../General/mplibMPICH \ No newline at end of file diff --git a/wmake/rules/linuxGcc44/mplibMPICH-GM b/wmake/rules/linuxGcc44/mplibMPICH-GM deleted file mode 100644 index 88493ebc70..0000000000 --- a/wmake/rules/linuxGcc44/mplibMPICH-GM +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm diff --git a/wmake/rules/linuxGcc44/mplibMPICH-GM b/wmake/rules/linuxGcc44/mplibMPICH-GM new file mode 120000 index 0000000000..621d0857d3 --- /dev/null +++ b/wmake/rules/linuxGcc44/mplibMPICH-GM @@ -0,0 +1 @@ +../General/mplibMPICH-GM \ No newline at end of file diff --git a/wmake/rules/linuxGcc44/mplibOPENMPI b/wmake/rules/linuxGcc44/mplibOPENMPI deleted file mode 100644 index 834d2d3e22..0000000000 --- a/wmake/rules/linuxGcc44/mplibOPENMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi diff --git a/wmake/rules/linuxGcc44/mplibOPENMPI b/wmake/rules/linuxGcc44/mplibOPENMPI new file mode 120000 index 0000000000..2d938a16a6 --- /dev/null +++ b/wmake/rules/linuxGcc44/mplibOPENMPI @@ -0,0 +1 @@ +../General/mplibOPENMPI \ No newline at end of file diff --git a/wmake/rules/linuxIA64Gcc/mplib b/wmake/rules/linuxIA64Gcc/mplib deleted file mode 100644 index 8a84b40146..0000000000 --- a/wmake/rules/linuxIA64Gcc/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/linuxIA64Gcc/mplib b/wmake/rules/linuxIA64Gcc/mplib new file mode 120000 index 0000000000..1fa0d64ec8 --- /dev/null +++ b/wmake/rules/linuxIA64Gcc/mplib @@ -0,0 +1 @@ +../General/mplib \ No newline at end of file diff --git a/wmake/rules/linuxIA64Gcc/mplibMPICH b/wmake/rules/linuxIA64Gcc/mplibMPICH deleted file mode 100644 index e5a38a8e38..0000000000 --- a/wmake/rules/linuxIA64Gcc/mplibMPICH +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DMPICH_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt diff --git a/wmake/rules/linuxIA64Gcc/mplibMPICH b/wmake/rules/linuxIA64Gcc/mplibMPICH new file mode 120000 index 0000000000..c83eb564e1 --- /dev/null +++ b/wmake/rules/linuxIA64Gcc/mplibMPICH @@ -0,0 +1 @@ +../General/mplibMPICH \ No newline at end of file diff --git a/wmake/rules/linuxIA64Gcc/mplibOPENMPI b/wmake/rules/linuxIA64Gcc/mplibOPENMPI deleted file mode 100644 index 834d2d3e22..0000000000 --- a/wmake/rules/linuxIA64Gcc/mplibOPENMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi diff --git a/wmake/rules/linuxIA64Gcc/mplibOPENMPI b/wmake/rules/linuxIA64Gcc/mplibOPENMPI new file mode 120000 index 0000000000..2d938a16a6 --- /dev/null +++ b/wmake/rules/linuxIA64Gcc/mplibOPENMPI @@ -0,0 +1 @@ +../General/mplibOPENMPI \ No newline at end of file diff --git a/wmake/rules/linuxIA64Icc/mplib b/wmake/rules/linuxIA64Icc/mplib deleted file mode 100644 index 8a84b40146..0000000000 --- a/wmake/rules/linuxIA64Icc/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/linuxIA64Icc/mplib b/wmake/rules/linuxIA64Icc/mplib new file mode 120000 index 0000000000..1fa0d64ec8 --- /dev/null +++ b/wmake/rules/linuxIA64Icc/mplib @@ -0,0 +1 @@ +../General/mplib \ No newline at end of file diff --git a/wmake/rules/linuxIA64Icc/mplibMPICH b/wmake/rules/linuxIA64Icc/mplibMPICH deleted file mode 100644 index e5a38a8e38..0000000000 --- a/wmake/rules/linuxIA64Icc/mplibMPICH +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DMPICH_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt diff --git a/wmake/rules/linuxIA64Icc/mplibMPICH b/wmake/rules/linuxIA64Icc/mplibMPICH new file mode 120000 index 0000000000..c83eb564e1 --- /dev/null +++ b/wmake/rules/linuxIA64Icc/mplibMPICH @@ -0,0 +1 @@ +../General/mplibMPICH \ No newline at end of file diff --git a/wmake/rules/linuxIA64Icc/mplibOPENMPI b/wmake/rules/linuxIA64Icc/mplibOPENMPI deleted file mode 100644 index 834d2d3e22..0000000000 --- a/wmake/rules/linuxIA64Icc/mplibOPENMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi diff --git a/wmake/rules/linuxIA64Icc/mplibOPENMPI b/wmake/rules/linuxIA64Icc/mplibOPENMPI new file mode 120000 index 0000000000..2d938a16a6 --- /dev/null +++ b/wmake/rules/linuxIA64Icc/mplibOPENMPI @@ -0,0 +1 @@ +../General/mplibOPENMPI \ No newline at end of file diff --git a/wmake/rules/linuxIcc/X b/wmake/rules/linuxIcc/X deleted file mode 100644 index bed8bfeddf..0000000000 --- a/wmake/rules/linuxIcc/X +++ /dev/null @@ -1,3 +0,0 @@ -XFLAGS = -XINC = $(XFLAGS) -I/usr/X11R6/include -XLIBS = -L/usr/X11R6/lib -lXext -lX11 diff --git a/wmake/rules/linuxIcc/X b/wmake/rules/linuxIcc/X new file mode 120000 index 0000000000..73572d6c04 --- /dev/null +++ b/wmake/rules/linuxIcc/X @@ -0,0 +1 @@ +../General/X \ No newline at end of file diff --git a/wmake/rules/linuxIcc/mplib b/wmake/rules/linuxIcc/mplib deleted file mode 100644 index 8a84b40146..0000000000 --- a/wmake/rules/linuxIcc/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/linuxIcc/mplib b/wmake/rules/linuxIcc/mplib new file mode 120000 index 0000000000..1fa0d64ec8 --- /dev/null +++ b/wmake/rules/linuxIcc/mplib @@ -0,0 +1 @@ +../General/mplib \ No newline at end of file diff --git a/wmake/rules/linuxIcc/mplibMPICH b/wmake/rules/linuxIcc/mplibMPICH deleted file mode 100644 index e5a38a8e38..0000000000 --- a/wmake/rules/linuxIcc/mplibMPICH +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DMPICH_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt diff --git a/wmake/rules/linuxIcc/mplibMPICH b/wmake/rules/linuxIcc/mplibMPICH new file mode 120000 index 0000000000..c83eb564e1 --- /dev/null +++ b/wmake/rules/linuxIcc/mplibMPICH @@ -0,0 +1 @@ +../General/mplibMPICH \ No newline at end of file diff --git a/wmake/rules/linuxIcc/mplibOPENMPI b/wmake/rules/linuxIcc/mplibOPENMPI deleted file mode 100644 index 834d2d3e22..0000000000 --- a/wmake/rules/linuxIcc/mplibOPENMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi diff --git a/wmake/rules/linuxIcc/mplibOPENMPI b/wmake/rules/linuxIcc/mplibOPENMPI new file mode 120000 index 0000000000..2d938a16a6 --- /dev/null +++ b/wmake/rules/linuxIcc/mplibOPENMPI @@ -0,0 +1 @@ +../General/mplibOPENMPI \ No newline at end of file diff --git a/wmake/rules/linuxPPC64Gcc/mplib b/wmake/rules/linuxPPC64Gcc/mplib deleted file mode 100644 index 8a84b40146..0000000000 --- a/wmake/rules/linuxPPC64Gcc/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/linuxPPC64Gcc/mplib b/wmake/rules/linuxPPC64Gcc/mplib new file mode 120000 index 0000000000..1fa0d64ec8 --- /dev/null +++ b/wmake/rules/linuxPPC64Gcc/mplib @@ -0,0 +1 @@ +../General/mplib \ No newline at end of file diff --git a/wmake/rules/linuxPPC64Gcc/mplibGAMMA b/wmake/rules/linuxPPC64Gcc/mplibGAMMA deleted file mode 100644 index d62c6250ff..0000000000 --- a/wmake/rules/linuxPPC64Gcc/mplibGAMMA +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lgamma diff --git a/wmake/rules/linuxPPC64Gcc/mplibGAMMA b/wmake/rules/linuxPPC64Gcc/mplibGAMMA new file mode 120000 index 0000000000..4b41692bf6 --- /dev/null +++ b/wmake/rules/linuxPPC64Gcc/mplibGAMMA @@ -0,0 +1 @@ +../General/mplibGAMMA \ No newline at end of file diff --git a/wmake/rules/linuxPPC64Gcc/mplibMPICH b/wmake/rules/linuxPPC64Gcc/mplibMPICH deleted file mode 100644 index ac17f7c1d2..0000000000 --- a/wmake/rules/linuxPPC64Gcc/mplibMPICH +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt diff --git a/wmake/rules/linuxPPC64Gcc/mplibMPICH b/wmake/rules/linuxPPC64Gcc/mplibMPICH new file mode 120000 index 0000000000..c83eb564e1 --- /dev/null +++ b/wmake/rules/linuxPPC64Gcc/mplibMPICH @@ -0,0 +1 @@ +../General/mplibMPICH \ No newline at end of file diff --git a/wmake/rules/linuxPPC64Gcc/mplibMPICH-GM b/wmake/rules/linuxPPC64Gcc/mplibMPICH-GM deleted file mode 100644 index 88493ebc70..0000000000 --- a/wmake/rules/linuxPPC64Gcc/mplibMPICH-GM +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm diff --git a/wmake/rules/linuxPPC64Gcc/mplibMPICH-GM b/wmake/rules/linuxPPC64Gcc/mplibMPICH-GM new file mode 120000 index 0000000000..621d0857d3 --- /dev/null +++ b/wmake/rules/linuxPPC64Gcc/mplibMPICH-GM @@ -0,0 +1 @@ +../General/mplibMPICH-GM \ No newline at end of file diff --git a/wmake/rules/linuxPPC64Gcc/mplibOPENMPI b/wmake/rules/linuxPPC64Gcc/mplibOPENMPI deleted file mode 100644 index 834d2d3e22..0000000000 --- a/wmake/rules/linuxPPC64Gcc/mplibOPENMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi diff --git a/wmake/rules/linuxPPC64Gcc/mplibOPENMPI b/wmake/rules/linuxPPC64Gcc/mplibOPENMPI new file mode 120000 index 0000000000..2d938a16a6 --- /dev/null +++ b/wmake/rules/linuxPPC64Gcc/mplibOPENMPI @@ -0,0 +1 @@ +../General/mplibOPENMPI \ No newline at end of file diff --git a/wmake/rules/linuxPPC64Gcc/mplibQSMPI b/wmake/rules/linuxPPC64Gcc/mplibQSMPI deleted file mode 100644 index 95ea327379..0000000000 --- a/wmake/rules/linuxPPC64Gcc/mplibQSMPI +++ /dev/null @@ -1,4 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi - diff --git a/wmake/rules/linuxPPC64Gcc/mplibQSMPI b/wmake/rules/linuxPPC64Gcc/mplibQSMPI new file mode 120000 index 0000000000..d3446c68f1 --- /dev/null +++ b/wmake/rules/linuxPPC64Gcc/mplibQSMPI @@ -0,0 +1 @@ +../General/mplibQSMPI \ No newline at end of file diff --git a/wmake/rules/linuxmingw32/general b/wmake/rules/linuxmingw32/general index 6a37beabd4..bd79de9270 100644 --- a/wmake/rules/linuxmingw32/general +++ b/wmake/rules/linuxmingw32/general @@ -3,16 +3,9 @@ LD = mingw32-ld PROJECT_LIBS = -l$(WM_PROJECT) +include $(GENERAL_RULES)/standard + include $(RULES)/X - -include $(GENERAL_RULES)/sourceToDep - -include $(GENERAL_RULES)/flex -include $(GENERAL_RULES)/flex++ -include $(GENERAL_RULES)/byacc -include $(GENERAL_RULES)/btyacc++ -include $(GENERAL_RULES)/moc - include $(RULES)/c include $(RULES)/c++ diff --git a/wmake/rules/linuxmingw32/mplib b/wmake/rules/linuxmingw32/mplib deleted file mode 100644 index 8a84b40146..0000000000 --- a/wmake/rules/linuxmingw32/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/linuxmingw32/mplib b/wmake/rules/linuxmingw32/mplib new file mode 120000 index 0000000000..1fa0d64ec8 --- /dev/null +++ b/wmake/rules/linuxmingw32/mplib @@ -0,0 +1 @@ +../General/mplib \ No newline at end of file diff --git a/wmake/rules/linuxmingw32/mplibGAMMA b/wmake/rules/linuxmingw32/mplibGAMMA deleted file mode 100644 index d62c6250ff..0000000000 --- a/wmake/rules/linuxmingw32/mplibGAMMA +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lgamma diff --git a/wmake/rules/linuxmingw32/mplibGAMMA b/wmake/rules/linuxmingw32/mplibGAMMA new file mode 120000 index 0000000000..4b41692bf6 --- /dev/null +++ b/wmake/rules/linuxmingw32/mplibGAMMA @@ -0,0 +1 @@ +../General/mplibGAMMA \ No newline at end of file diff --git a/wmake/rules/linuxmingw32/mplibMPICH b/wmake/rules/linuxmingw32/mplibMPICH deleted file mode 100644 index ac17f7c1d2..0000000000 --- a/wmake/rules/linuxmingw32/mplibMPICH +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt diff --git a/wmake/rules/linuxmingw32/mplibMPICH b/wmake/rules/linuxmingw32/mplibMPICH new file mode 120000 index 0000000000..c83eb564e1 --- /dev/null +++ b/wmake/rules/linuxmingw32/mplibMPICH @@ -0,0 +1 @@ +../General/mplibMPICH \ No newline at end of file diff --git a/wmake/rules/linuxmingw32/mplibMPICH-GM b/wmake/rules/linuxmingw32/mplibMPICH-GM deleted file mode 100644 index 88493ebc70..0000000000 --- a/wmake/rules/linuxmingw32/mplibMPICH-GM +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm diff --git a/wmake/rules/linuxmingw32/mplibMPICH-GM b/wmake/rules/linuxmingw32/mplibMPICH-GM new file mode 120000 index 0000000000..621d0857d3 --- /dev/null +++ b/wmake/rules/linuxmingw32/mplibMPICH-GM @@ -0,0 +1 @@ +../General/mplibMPICH-GM \ No newline at end of file diff --git a/wmake/rules/linuxmingw32/mplibOPENMPI b/wmake/rules/linuxmingw32/mplibOPENMPI deleted file mode 100644 index 834d2d3e22..0000000000 --- a/wmake/rules/linuxmingw32/mplibOPENMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi diff --git a/wmake/rules/linuxmingw32/mplibOPENMPI b/wmake/rules/linuxmingw32/mplibOPENMPI new file mode 120000 index 0000000000..2d938a16a6 --- /dev/null +++ b/wmake/rules/linuxmingw32/mplibOPENMPI @@ -0,0 +1 @@ +../General/mplibOPENMPI \ No newline at end of file diff --git a/wmake/rules/solarisGcc/mplib b/wmake/rules/solarisGcc/mplib deleted file mode 100644 index 8a84b40146..0000000000 --- a/wmake/rules/solarisGcc/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/solarisGcc/mplib b/wmake/rules/solarisGcc/mplib new file mode 120000 index 0000000000..1fa0d64ec8 --- /dev/null +++ b/wmake/rules/solarisGcc/mplib @@ -0,0 +1 @@ +../General/mplib \ No newline at end of file diff --git a/wmake/rules/solarisGcc/mplibMPICH b/wmake/rules/solarisGcc/mplibMPICH index cd9ff0e478..c4ef548d9a 100644 --- a/wmake/rules/solarisGcc/mplibMPICH +++ b/wmake/rules/solarisGcc/mplibMPICH @@ -1,3 +1,3 @@ -PFLAGS = +PFLAGS = -DMPICH_SKIP_MPICXX PINC = -I$(MPI_ARCH_PATH)/include PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt -laio diff --git a/wmake/rules/solarisGcc/mplibOPENMPI b/wmake/rules/solarisGcc/mplibOPENMPI deleted file mode 100644 index 834d2d3e22..0000000000 --- a/wmake/rules/solarisGcc/mplibOPENMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi diff --git a/wmake/rules/solarisGcc/mplibOPENMPI b/wmake/rules/solarisGcc/mplibOPENMPI new file mode 120000 index 0000000000..2d938a16a6 --- /dev/null +++ b/wmake/rules/solarisGcc/mplibOPENMPI @@ -0,0 +1 @@ +../General/mplibOPENMPI \ No newline at end of file diff --git a/wmake/scripts/makeDerivedFiles b/wmake/scripts/makeDerivedFiles index 96377d6832..9d574fe0f9 100755 --- a/wmake/scripts/makeDerivedFiles +++ b/wmake/scripts/makeDerivedFiles @@ -28,7 +28,7 @@ # # Description # Constructs all the file list for make given the source file list, -# written was by hand or using makeFilesAndOptions. +# written by hand or using makeFilesAndOptions. # #------------------------------------------------------------------------------ diff --git a/wmake/scripts/makeFiles b/wmake/scripts/makeFiles index 8416970039..14c0921515 100755 --- a/wmake/scripts/makeFiles +++ b/wmake/scripts/makeFiles @@ -35,41 +35,38 @@ if [ -r Make/files ] then - echo "makeFiles: Make/files already exists, exiting" + echo "Error: Make/files already exists - exiting" exit 1 fi -bin=$WM_DIR/bin/$WM_ARCH$WM_COMPILER +dirToString=$WM_DIR/bin/$WM_ARCH$WM_COMPILER/dirToString [ -d Make ] || mkdir Make rm -f Make/files -dirs=`find . -name "*" -type d -print` - -for dir in $dirs +for dir in `find . -type d -print` do - if [ $dir != . ] - then + case "$dir" in + . | ./Make | ./lnInclude ) + # skip special directories + ;; + *) baseDir=`echo $dir | sed 's%^\./%%'` - baseDirName=`echo $baseDir | $bin/dirToString` + baseDirName=`echo $baseDir | $dirToString` - if [ $baseDirName != Make ] - then - echo $baseDirName " = " $baseDir >> Make/files - fi - fi + echo $baseDirName " = " $baseDir >> Make/files + ;; + esac done echo >> Make/files -files=`find . -name "*.[cCylfF]" -type f -print` - -for file in $files +for file in `find . -name "*.[cCylLfF]" -type f -print` do - pathName=`echo ${file%/*} | sed 's%^\.%%' | sed 's%^/%%' | $bin/dirToString` fileName=`echo ${file##*/}` + pathName=`echo ${file%/*} | sed 's%^\.%%' | sed 's%^/%%' | $dirToString` - if [ "$pathName" != "" ] + if [ -n "$pathName" ] then echo '$('$pathName')/'$fileName >> Make/files else diff --git a/wmake/scripts/makeOptions b/wmake/scripts/makeOptions index 609a447ba0..4d813840e0 100755 --- a/wmake/scripts/makeOptions +++ b/wmake/scripts/makeOptions @@ -27,7 +27,7 @@ # makeOptions # # Description -# Scan the current directory for options and construct Make/options +# Construct Make/options # # Usage : makeOptions # @@ -35,8 +35,8 @@ if [ -r Make/options ] then - echo "makeOptions: Make/options already exists, exiting" - exit 1 + echo "Error: Make/options already exists - exiting" + exit 1 fi [ -d Make ] || mkdir Make From 772e1d1b4fb28a3d786c83303fbafebfabf3e2e9 Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 26 Mar 2010 16:26:53 +0000 Subject: [PATCH 03/11] BUG: enthalpy source term for dieselFoam solver corrected --- applications/solvers/combustion/dieselFoam/dieselFoam.C | 2 ++ 1 file changed, 2 insertions(+) diff --git a/applications/solvers/combustion/dieselFoam/dieselFoam.C b/applications/solvers/combustion/dieselFoam/dieselFoam.C index 1e6ddfe0c1..6cd29ccca8 100644 --- a/applications/solvers/combustion/dieselFoam/dieselFoam.C +++ b/applications/solvers/combustion/dieselFoam/dieselFoam.C @@ -94,6 +94,8 @@ int main(int argc, char *argv[]) kappa = (runTime.deltaT() + tc)/(runTime.deltaT()+tc+tk); } + chemistrySh = kappa*chemistry.Sh()(); + #include "rhoEqn.H" #include "UEqn.H" From fa47947f0b4b8e516f7827f2e5e5701dfc4f89b8 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 29 Mar 2010 09:43:01 +0200 Subject: [PATCH 04/11] ENH: return the bounded volScalarField from Foam::bound() - this allows the bounded field to be used immediately in another operation (eg, within a constructor). ENH: use bounded epsilon_ instead of (epsilon_ + epsilonMin_) in calculations. --- src/finiteVolume/cfdTools/general/bound/bound.C | 5 ++++- src/finiteVolume/cfdTools/general/bound/bound.H | 3 ++- .../RAS/LamBremhorstKE/LamBremhorstKE.C | 4 ++-- .../incompressible/RAS/LienCubicKE/LienCubicKE.C | 6 +++--- .../RAS/LienCubicKELowRe/LienCubicKELowRe.C | 12 ++++++------ .../RAS/NonlinearKEShih/NonlinearKEShih.C | 10 +++++----- .../incompressible/RAS/qZeta/qZeta.C | 4 ++-- 7 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/finiteVolume/cfdTools/general/bound/bound.C b/src/finiteVolume/cfdTools/general/bound/bound.C index 7054434c0f..93dac0faf9 100644 --- a/src/finiteVolume/cfdTools/general/bound/bound.C +++ b/src/finiteVolume/cfdTools/general/bound/bound.C @@ -30,7 +30,8 @@ License // * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * // -void Foam::bound(volScalarField& vsf, const dimensionedScalar& lowerBound) +Foam::volScalarField& +Foam::bound(volScalarField& vsf, const dimensionedScalar& lowerBound) { const scalar minVsf = min(vsf).value(); @@ -55,6 +56,8 @@ void Foam::bound(volScalarField& vsf, const dimensionedScalar& lowerBound) vsf.boundaryField() = max(vsf.boundaryField(), lowerBound.value()); } + + return vsf; } diff --git a/src/finiteVolume/cfdTools/general/bound/bound.H b/src/finiteVolume/cfdTools/general/bound/bound.H index f301c5a217..1f6418ce5c 100644 --- a/src/finiteVolume/cfdTools/general/bound/bound.H +++ b/src/finiteVolume/cfdTools/general/bound/bound.H @@ -50,8 +50,9 @@ namespace Foam // * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * // //- Bound the given scalar field if it has gone unbounded. +// Return the bounded field. // Used extensively in RAS and LES turbulence models. -void bound(volScalarField&, const dimensionedScalar& lowerBound); +volScalarField& bound(volScalarField&, const dimensionedScalar& lowerBound); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C index 5f036cff10..5212e7bbad 100644 --- a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C +++ b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C @@ -119,7 +119,7 @@ LamBremhorstKE::LamBremhorstKE y_(mesh_), - Rt_(sqr(k_)/(nu()*epsilon_)), + Rt_(sqr(k_)/(nu()*bound(epsilon_, epsilonMin_))), fMu_ ( @@ -141,7 +141,7 @@ LamBremhorstKE::LamBremhorstKE ) { bound(k_, kMin_); - bound(epsilon_, epsilonMin_); + // already bounded: bound(epsilon_, epsilonMin_); nut_ = Cmu_*fMu_*sqr(k_)/epsilon_; nut_.correctBoundaryConditions(); diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C index d91f974fbe..c5c783f125 100644 --- a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C +++ b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C @@ -173,12 +173,12 @@ LienCubicKE::LienCubicKE gradU_(fvc::grad(U)), eta_ ( - k_/(epsilon_ + epsilonMin_) + k_/bound(epsilon_, epsilonMin_) *sqrt(2.0*magSqr(0.5*(gradU_ + gradU_.T()))) ), ksi_ ( - k_/(epsilon_ + epsilonMin_) + k_/epsilon_ *sqrt(2.0*magSqr(0.5*(gradU_ - gradU_.T()))) ), Cmu_(2.0/(3.0*(A1_ + eta_ + alphaKsi_*ksi_))), @@ -235,7 +235,7 @@ LienCubicKE::LienCubicKE ) { bound(k_, kMin_); - bound(epsilon_, epsilonMin_); + // already bounded: bound(epsilon_, epsilonMin_); nut_ = Cmu_*sqr(k_)/epsilon_ + C5viscosity_; nut_.correctBoundaryConditions(); diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C index 046f5a6fa1..afd85ff475 100644 --- a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C +++ b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C @@ -222,12 +222,12 @@ LienCubicKELowRe::LienCubicKELowRe gradU_(fvc::grad(U)), eta_ ( - k_/(epsilon_ + epsilonMin_) + k_/bound(epsilon_, epsilonMin_) *sqrt(2.0*magSqr(0.5*(gradU_ + gradU_.T()))) ), ksi_ ( - k_/(epsilon_ + epsilonMin_) + k_/epsilon_ *sqrt(2.0*magSqr(0.5*(gradU_ - gradU_.T()))) ), Cmu_(2.0/(3.0*(A1_ + eta_ + alphaKsi_*ksi_))), @@ -235,7 +235,7 @@ LienCubicKELowRe::LienCubicKELowRe C5viscosity_ ( - -2.0*pow3(Cmu_)*pow4(k_)/pow3(epsilon_ + epsilonMin_) + -2.0*pow3(Cmu_)*pow4(k_)/pow3(epsilon_) *(magSqr(gradU_ + gradU_.T()) - magSqr(gradU_ - gradU_.T())) ), @@ -260,7 +260,7 @@ LienCubicKELowRe::LienCubicKELowRe symm ( // quadratic terms - pow3(k_)/sqr(epsilon_ + epsilonMin_) + pow3(k_)/sqr(epsilon_) *( Ctau1_/fEta_ *( @@ -271,7 +271,7 @@ LienCubicKELowRe::LienCubicKELowRe + Ctau3_/fEta_*(gradU_.T() & gradU_) ) // cubic term C4 - - 20.0*pow4(k_)/pow3(epsilon_ + epsilonMin_) + - 20.0*pow4(k_)/pow3(epsilon_) *pow3(Cmu_) *( ((gradU_ & gradU_) & gradU_.T()) @@ -289,7 +289,7 @@ LienCubicKELowRe::LienCubicKELowRe ) { bound(k_, kMin_); - bound(epsilon_, epsilonMin_); + // already bounded: bound(epsilon_, epsilonMin_); nut_ = Cmu_ * (scalar(1) - exp(-Am_*yStar_)) diff --git a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C index c885d87f16..fdcae3d187 100644 --- a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C +++ b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C @@ -192,25 +192,25 @@ NonlinearKEShih::NonlinearKEShih gradU_(fvc::grad(U)), eta_ ( - k_/(epsilon_ + epsilonMin_) + k_/bound(epsilon_, epsilonMin_) *sqrt(2.0*magSqr(0.5*(gradU_ + gradU_.T()))) ), ksi_ ( - k_/(epsilon_+ epsilonMin_) + k_/epsilon_ *sqrt(2.0*magSqr(0.5*(gradU_ - gradU_.T()))) ), Cmu_(2.0/(3.0*(A1_ + eta_ + alphaKsi_*ksi_))), fEta_(A2_ + pow(eta_, 3.0)), - nut_("nut", Cmu_*sqr(k_)/(epsilon_ + epsilonMin_)), + nut_("nut", Cmu_*sqr(k_)/epsilon_), nonlinearStress_ ( "nonlinearStress", symm ( - pow3(k_)/sqr(epsilon_ + epsilonMin_) + pow3(k_)/sqr(epsilon_) *( Ctau1_/fEta_ *( @@ -224,7 +224,7 @@ NonlinearKEShih::NonlinearKEShih ) { bound(k_, kMin_); - bound(epsilon_, epsilonMin_); + // already bounded: bound(epsilon_, epsilonMin_); #include "wallNonlinearViscosityI.H" diff --git a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C index 422f8b1463..41b1114429 100644 --- a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C +++ b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C @@ -179,7 +179,7 @@ qZeta::qZeta IOobject::NO_READ, IOobject::AUTO_WRITE ), - epsilon_/(2.0*q_), + epsilon_/(2.0*bound(q_, qMin_)), epsilon_.boundaryField().types() ), @@ -198,7 +198,7 @@ qZeta::qZeta { bound(k_, kMin_); bound(epsilon_, epsilonMin_); - bound(q_, qMin_); + // already bounded: bound(q_, qMin_); bound(zeta_, zetaMin_); nut_ = Cmu_*fMu()*sqr(k_)/epsilon_; From 09970cc01a296c3de308f01ad15a7c5db620ecb1 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 29 Mar 2010 10:20:58 +0200 Subject: [PATCH 05/11] ENH: read dictionary values for kMin, epsilonMin, omegaMin on construct. --- src/turbulenceModels/compressible/LES/LESModel/LESModel.C | 2 +- src/turbulenceModels/compressible/RAS/RASModel/RASModel.C | 4 ++++ src/turbulenceModels/incompressible/LES/LESModel/LESModel.C | 2 +- .../incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C | 4 ++++ src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C | 4 ++++ 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C index 556ee0ca51..284d28a973 100644 --- a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C +++ b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C @@ -83,7 +83,7 @@ LESModel::LESModel delta_(LESdelta::New("delta", U.mesh(), *this)) { - readIfPresent("kMin", kMin_); + kMin_.readIfPresent(*this); // Force the construction of the mesh deltaCoeffs which may be needed // for the construction of the derived models and BCs diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C index 2c35c3cec0..f802f29a22 100644 --- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C +++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C @@ -87,6 +87,10 @@ RASModel::RASModel y_(mesh_) { + kMin_.readIfPresent(*this); + epsilonMin_.readIfPresent(*this); + omegaMin_.readIfPresent(*this); + // Force the construction of the mesh deltaCoeffs which may be needed // for the construction of the derived models and BCs mesh_.deltaCoeffs(); diff --git a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C index 34966eb22c..5173c899c8 100644 --- a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C +++ b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C @@ -81,7 +81,7 @@ LESModel::LESModel kMin_("kMin", sqr(dimVelocity), SMALL), delta_(LESdelta::New("delta", U.mesh(), *this)) { - readIfPresent("kMin", kMin_); + kMin_.readIfPresent(*this); // Force the construction of the mesh deltaCoeffs which may be needed // for the construction of the derived models and BCs diff --git a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C index 708c090351..fe3a1b8ed6 100644 --- a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C +++ b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C @@ -323,6 +323,8 @@ kOmegaSSTSAS::kOmegaSSTSAS mesh_ ) { + omegaMin_.readIfPresent(*this); + bound(k_, kMin_); bound(omega_, omegaMin_); @@ -458,6 +460,8 @@ bool kOmegaSSTSAS::read() zetaTilda2_.readIfPresent(coeffDict()); FSAS_.readIfPresent(coeffDict()); + omegaMin_.readIfPresent(*this); + return true; } else diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C index c7d97e08e9..8e1da1e5b5 100644 --- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C +++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C @@ -86,6 +86,10 @@ RASModel::RASModel y_(mesh_) { + kMin_.readIfPresent(*this); + epsilonMin_.readIfPresent(*this); + omegaMin_.readIfPresent(*this); + // Force the construction of the mesh deltaCoeffs which may be needed // for the construction of the derived models and BCs mesh_.deltaCoeffs(); From 0686bdf1e9e636eb97931be110d3bcf0e37ef508 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 29 Mar 2010 10:59:35 +0200 Subject: [PATCH 06/11] ENH: simplify cpp rules to avoid absolute paths and multiple GFLAGS. - otherwise /lib/cpp may need a different library binding than currently available and results in this type of error: /usr/lib64/gcc/x86_64-suse-linux/4.4/cc1: /data/app/OpenFOAM/ThirdParty-1.6.x/platforms/linux64/gcc-4.3.3/lib64/libstdc++.so.6: version `GLIBCXX_3.4.11' not found (required by /usr/lib64/libppl_c.so.2) ENH: remove unused flex++ rule for SiCortex that was identical to the general one anyhow. --- wmake/rules/General/general | 1 + wmake/rules/SiCortex64Gcc/flex++ | 6 ------ wmake/rules/SiCortex64Gcc/general | 1 - wmake/rules/SunOS64Gcc/general | 2 +- wmake/rules/linux64Gcc/general | 3 --- wmake/rules/linux64Gcc43/general | 3 --- wmake/rules/linux64Gcc44/general | 3 --- wmake/rules/linux64Icc/general | 3 --- wmake/rules/linuxGcc/general | 1 - wmake/rules/linuxGcc43/general | 1 - wmake/rules/linuxGcc44/general | 1 - wmake/rules/linuxIA64Gcc/general | 3 --- wmake/rules/linuxIA64Icc/general | 6 +----- wmake/rules/linuxIcc/general | 1 - wmake/rules/linuxPPC64Gcc/general | 1 - wmake/rules/linuxmingw32/general | 1 - wmake/rules/solarisGcc/general | 2 +- 17 files changed, 4 insertions(+), 35 deletions(-) delete mode 100644 wmake/rules/SiCortex64Gcc/flex++ diff --git a/wmake/rules/General/general b/wmake/rules/General/general index 419d9b1d38..d0253e80b3 100644 --- a/wmake/rules/General/general +++ b/wmake/rules/General/general @@ -1,6 +1,7 @@ AR = ar ARFLAGS = cr RANLIB = ranlib +CPP = cpp LD = ld GFLAGS = -D$(WM_ARCH) -DWM_$(WM_PRECISION_OPTION) diff --git a/wmake/rules/SiCortex64Gcc/flex++ b/wmake/rules/SiCortex64Gcc/flex++ deleted file mode 100644 index 69d6f37319..0000000000 --- a/wmake/rules/SiCortex64Gcc/flex++ +++ /dev/null @@ -1,6 +0,0 @@ -.SUFFIXES: .L - -Ltoo = flex --c++ -o $*.C -f $$SOURCE ; $(CC) $(c++FLAGS) -c $*.C -o $@ - -.L.dep: - $(MAKE_DEP) diff --git a/wmake/rules/SiCortex64Gcc/general b/wmake/rules/SiCortex64Gcc/general index d70a77cdb0..eb820ab36d 100644 --- a/wmake/rules/SiCortex64Gcc/general +++ b/wmake/rules/SiCortex64Gcc/general @@ -1,4 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) LD = ld -A64 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl diff --git a/wmake/rules/SunOS64Gcc/general b/wmake/rules/SunOS64Gcc/general index f9b5632198..d24e8f0056 100644 --- a/wmake/rules/SunOS64Gcc/general +++ b/wmake/rules/SunOS64Gcc/general @@ -1,4 +1,4 @@ -CPP = /lib/cpp $(GFLAGS) +CPP = /lib/cpp LD = ld -64 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream diff --git a/wmake/rules/linux64Gcc/general b/wmake/rules/linux64Gcc/general index 10237bd1b6..7285501d98 100644 --- a/wmake/rules/linux64Gcc/general +++ b/wmake/rules/linux64Gcc/general @@ -1,6 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) -LD = ld - PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linux64Gcc43/general b/wmake/rules/linux64Gcc43/general index 10237bd1b6..7285501d98 100644 --- a/wmake/rules/linux64Gcc43/general +++ b/wmake/rules/linux64Gcc43/general @@ -1,6 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) -LD = ld - PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linux64Gcc44/general b/wmake/rules/linux64Gcc44/general index 10237bd1b6..7285501d98 100644 --- a/wmake/rules/linux64Gcc44/general +++ b/wmake/rules/linux64Gcc44/general @@ -1,6 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) -LD = ld - PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linux64Icc/general b/wmake/rules/linux64Icc/general index 10237bd1b6..7285501d98 100644 --- a/wmake/rules/linux64Icc/general +++ b/wmake/rules/linux64Icc/general @@ -1,6 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) -LD = ld - PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linuxGcc/general b/wmake/rules/linuxGcc/general index 02ad6973ff..c19ca19394 100644 --- a/wmake/rules/linuxGcc/general +++ b/wmake/rules/linuxGcc/general @@ -1,4 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) LD = ld -melf_i386 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl diff --git a/wmake/rules/linuxGcc43/general b/wmake/rules/linuxGcc43/general index 02ad6973ff..c19ca19394 100644 --- a/wmake/rules/linuxGcc43/general +++ b/wmake/rules/linuxGcc43/general @@ -1,4 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) LD = ld -melf_i386 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl diff --git a/wmake/rules/linuxGcc44/general b/wmake/rules/linuxGcc44/general index 02ad6973ff..c19ca19394 100644 --- a/wmake/rules/linuxGcc44/general +++ b/wmake/rules/linuxGcc44/general @@ -1,4 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) LD = ld -melf_i386 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl diff --git a/wmake/rules/linuxIA64Gcc/general b/wmake/rules/linuxIA64Gcc/general index 10237bd1b6..7285501d98 100644 --- a/wmake/rules/linuxIA64Gcc/general +++ b/wmake/rules/linuxIA64Gcc/general @@ -1,6 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) -LD = ld - PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linuxIA64Icc/general b/wmake/rules/linuxIA64Icc/general index 8d72138115..66953a9652 100644 --- a/wmake/rules/linuxIA64Icc/general +++ b/wmake/rules/linuxIA64Icc/general @@ -1,8 +1,4 @@ -CPP = /lib/cpp $(GFLAGS) -DICC_IA64_PREFETCH -AR = ar -ARFLAGS = cr -RANLIB = ranlib -LD = ld +CPP = cpp -DICC_IA64_PREFETCH GLIBS = -liberty diff --git a/wmake/rules/linuxIcc/general b/wmake/rules/linuxIcc/general index 02ad6973ff..c19ca19394 100644 --- a/wmake/rules/linuxIcc/general +++ b/wmake/rules/linuxIcc/general @@ -1,4 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) LD = ld -melf_i386 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl diff --git a/wmake/rules/linuxPPC64Gcc/general b/wmake/rules/linuxPPC64Gcc/general index 76d507634a..81927e682b 100644 --- a/wmake/rules/linuxPPC64Gcc/general +++ b/wmake/rules/linuxPPC64Gcc/general @@ -1,4 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) LD = ld -m elf64ppc PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl diff --git a/wmake/rules/linuxmingw32/general b/wmake/rules/linuxmingw32/general index bd79de9270..26658e0c98 100644 --- a/wmake/rules/linuxmingw32/general +++ b/wmake/rules/linuxmingw32/general @@ -1,4 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) LD = mingw32-ld PROJECT_LIBS = -l$(WM_PROJECT) diff --git a/wmake/rules/solarisGcc/general b/wmake/rules/solarisGcc/general index 712af78559..c8641ef7e5 100644 --- a/wmake/rules/solarisGcc/general +++ b/wmake/rules/solarisGcc/general @@ -1,4 +1,4 @@ -CPP = /usr/lib/cpp -undef $(GFLAGS) +CPP = /usr/lib/cpp -undef PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream From b3bf8309490e3ec0d4ac7c2fe7a606ff7e4d4b78 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 29 Mar 2010 17:32:31 +0100 Subject: [PATCH 07/11] ENH: Updates to thermo/pdfs library - added Niklas' update to Rosin-Rammler - new fixedValue type - code clean-up --- src/thermophysicalModels/pdfs/Make/files | 23 ++- .../pdfs/RosinRammler/RosinRammler.C | 90 +++--------- .../pdfs/RosinRammler/RosinRammler.H | 24 ++-- .../pdfs/exponential/exponential.C | 78 +++------- .../pdfs/exponential/exponential.H | 24 ++-- .../pdfs/fixedValue/fixedValue.C | 76 ++++++++++ .../pdfs/fixedValue/fixedValue.H | 103 ++++++++++++++ .../pdfs/general/general.C | 97 ++++++++----- .../pdfs/general/general.H | 11 +- .../pdfs/multiNormal/multiNormal.C | 133 ++++++++++++++++++ .../pdfs/multiNormal/multiNormal.H | 122 ++++++++++++++++ src/thermophysicalModels/pdfs/normal/normal.C | 97 +++++++------ src/thermophysicalModels/pdfs/normal/normal.H | 24 ++-- src/thermophysicalModels/pdfs/pdf/newPdf.C | 6 +- src/thermophysicalModels/pdfs/pdf/pdf.C | 38 ++++- src/thermophysicalModels/pdfs/pdf/pdf.H | 45 +++--- .../pdfs/uniform/uniform.C | 26 ++-- .../pdfs/uniform/uniform.H | 15 +- 18 files changed, 711 insertions(+), 321 deletions(-) create mode 100644 src/thermophysicalModels/pdfs/fixedValue/fixedValue.C create mode 100644 src/thermophysicalModels/pdfs/fixedValue/fixedValue.H create mode 100644 src/thermophysicalModels/pdfs/multiNormal/multiNormal.C create mode 100644 src/thermophysicalModels/pdfs/multiNormal/multiNormal.H diff --git a/src/thermophysicalModels/pdfs/Make/files b/src/thermophysicalModels/pdfs/Make/files index e5d66e3aea..7b0c50a956 100644 --- a/src/thermophysicalModels/pdfs/Make/files +++ b/src/thermophysicalModels/pdfs/Make/files @@ -1,17 +1,12 @@ -pdf = pdf -uniform = uniform -normal = normal -general = general -exponential = exponential -RosinRammler = RosinRammler +pdf/pdf.C +pdf/newPdf.C -$(pdf)/pdf.C -$(pdf)/newPdf.C - -$(uniform)/uniform.C -$(normal)/normal.C -$(general)/general.C -$(exponential)/exponential.C -$(RosinRammler)/RosinRammler.C +exponential/exponential.C +fixedValue/fixedValue.C +general/general.C +multiNormal/multiNormal.C +normal/normal.C +RosinRammler/RosinRammler.C +uniform/uniform.C LIB = $(FOAM_LIBBIN)/libpdf diff --git a/src/thermophysicalModels/pdfs/RosinRammler/RosinRammler.C b/src/thermophysicalModels/pdfs/RosinRammler/RosinRammler.C index becfd94db2..efa7a21750 100644 --- a/src/thermophysicalModels/pdfs/RosinRammler/RosinRammler.C +++ b/src/thermophysicalModels/pdfs/RosinRammler/RosinRammler.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,106 +31,52 @@ License namespace Foam { - defineTypeNameAndDebug(RosinRammler, 0); - - addToRunTimeSelectionTable(pdf, RosinRammler, dictionary); + namespace pdfs + { + defineTypeNameAndDebug(RosinRammler, 0); + addToRunTimeSelectionTable(pdf, RosinRammler, dictionary); + } } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::RosinRammler::RosinRammler(const dictionary& dict, Random& rndGen) +Foam::pdfs::RosinRammler::RosinRammler(const dictionary& dict, Random& rndGen) : - pdf(dict, rndGen), - pdfDict_(dict.subDict(typeName + "PDF")), + pdf(typeName, dict, rndGen), minValue_(readScalar(pdfDict_.lookup("minValue"))), maxValue_(readScalar(pdfDict_.lookup("maxValue"))), - d_(pdfDict_.lookup("d")), - n_(pdfDict_.lookup("n")), - ls_(d_), - range_(maxValue_ - minValue_) + d_(readScalar(pdfDict_.lookup("d"))), + n_(readScalar(pdfDict_.lookup("n"))) { - if (minValue_<0) - { - FatalErrorIn - ( - "RosinRammler::RosinRammler(const dictionary& dict)" - ) << " minValue = " << minValue_ << ", it must be >0." << nl - << abort(FatalError); - } - - if (maxValue_p); + scalar K = 1.0 - exp(-pow((maxValue_ - minValue_)/d_, n_)); + scalar y = rndGen_.scalar01(); + scalar x = minValue_ + d_*::pow(-log(1.0 - y*K), 1.0/n_); return x; } -Foam::scalar Foam::RosinRammler::minValue() const +Foam::scalar Foam::pdfs::RosinRammler::minValue() const { return minValue_; } -Foam::scalar Foam::RosinRammler::maxValue() const +Foam::scalar Foam::pdfs::RosinRammler::maxValue() const { return maxValue_; } diff --git a/src/thermophysicalModels/pdfs/RosinRammler/RosinRammler.H b/src/thermophysicalModels/pdfs/RosinRammler/RosinRammler.H index 6b04f3dfbb..370f0d2ad2 100644 --- a/src/thermophysicalModels/pdfs/RosinRammler/RosinRammler.H +++ b/src/thermophysicalModels/pdfs/RosinRammler/RosinRammler.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,14 +29,12 @@ Description Rosin-Rammler pdf @f[ - pdf = ( x/d )^n \exp ( -( x/d )^n ) + cumulative pdf = (1.0 - exp( -((x - d0)/d)^n ) / (1.0 - exp( -((d1 - d0)/d)^n ) @f] SourceFiles - RosinRammlerI.H RosinRammler.C - RosinRammlerIO.C \*---------------------------------------------------------------------------*/ @@ -49,9 +47,11 @@ SourceFiles namespace Foam { +namespace pdfs +{ /*---------------------------------------------------------------------------*\ - Class RosinRammler Declaration + Class RosinRammler Declaration \*---------------------------------------------------------------------------*/ class RosinRammler @@ -60,17 +60,16 @@ class RosinRammler { // Private data - dictionary pdfDict_; - - //- min and max values of the distribution + //- Distribution minimum scalar minValue_; + + //- Distribution maximum scalar maxValue_; - List d_; - List n_; - List ls_; + // Model coefficients - scalar range_; + scalar d_; + scalar n_; public: @@ -108,6 +107,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +} // End namespace pdfs } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/pdfs/exponential/exponential.C b/src/thermophysicalModels/pdfs/exponential/exponential.C index 8498c2c9e2..7e97f4ae20 100644 --- a/src/thermophysicalModels/pdfs/exponential/exponential.C +++ b/src/thermophysicalModels/pdfs/exponential/exponential.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,7 +24,6 @@ License \*---------------------------------------------------------------------------*/ - #include "exponential.H" #include "addToRunTimeSelectionTable.H" @@ -32,92 +31,49 @@ License namespace Foam { - defineTypeNameAndDebug(exponential, 0); - addToRunTimeSelectionTable(pdf, exponential, dictionary); + namespace pdfs + { + defineTypeNameAndDebug(exponential, 0); + addToRunTimeSelectionTable(pdf, exponential, dictionary); + } } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::exponential::exponential(const dictionary& dict, Random& rndGen) +Foam::pdfs::exponential::exponential(const dictionary& dict, Random& rndGen) : - pdf(dict, rndGen), - pdfDict_(dict.subDict(typeName + "PDF")), + pdf(typeName, dict, rndGen), minValue_(readScalar(pdfDict_.lookup("minValue"))), maxValue_(readScalar(pdfDict_.lookup("maxValue"))), - lambda_(pdfDict_.lookup("lambda")), - ls_(lambda_), - range_(maxValue_ - minValue_) + lambda_(readScalar(pdfDict_.lookup("lambda"))) { - if (minValue_<0) - { - FatalErrorIn - ( - "exponential::exponential(const dictionary& dict)" - ) << " minValue = " << minValue_ << ", it must be >0." << nl - << abort(FatalError); - } - - scalar sMax = 0; - label n = lambda_.size(); - for (label i=0; iy); - - return x; + scalar y = rndGen_.scalar01(); + scalar K = exp(-lambda_*maxValue_) - exp(-lambda_*minValue_); + return -(1.0/lambda_)*log(exp(-lambda_*minValue_) + y*K); } -Foam::scalar Foam::exponential::minValue() const +Foam::scalar Foam::pdfs::exponential::minValue() const { return minValue_; } -Foam::scalar Foam::exponential::maxValue() const +Foam::scalar Foam::pdfs::exponential::maxValue() const { return maxValue_; } diff --git a/src/thermophysicalModels/pdfs/exponential/exponential.H b/src/thermophysicalModels/pdfs/exponential/exponential.H index 4ef19b75a3..eb452a6dd5 100644 --- a/src/thermophysicalModels/pdfs/exponential/exponential.H +++ b/src/thermophysicalModels/pdfs/exponential/exponential.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,9 +29,7 @@ Description exponential pdf SourceFiles - exponentialI.H exponential.C - exponentialIO.C \*---------------------------------------------------------------------------*/ @@ -44,6 +42,8 @@ SourceFiles namespace Foam { +namespace pdfs +{ /*---------------------------------------------------------------------------*\ Class exponential Declaration @@ -55,16 +55,17 @@ class exponential { // Private data - dictionary pdfDict_; - - //- min and max values of the distribution + //- Distribution minimum scalar minValue_; + + //- Distribution maximum scalar maxValue_; - List lambda_; - List ls_; - scalar range_; + // Model coefficients + + scalar lambda_; + public: @@ -101,14 +102,11 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +} // End namespace pdfs } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -//#include "exponentialI.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - #endif // ************************************************************************* // diff --git a/src/thermophysicalModels/pdfs/fixedValue/fixedValue.C b/src/thermophysicalModels/pdfs/fixedValue/fixedValue.C new file mode 100644 index 0000000000..a160803549 --- /dev/null +++ b/src/thermophysicalModels/pdfs/fixedValue/fixedValue.C @@ -0,0 +1,76 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +\*---------------------------------------------------------------------------*/ + +#include "fixedValue.H" +#include "addToRunTimeSelectionTable.H" + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +namespace Foam +{ + namespace pdfs + { + defineTypeNameAndDebug(fixedValue, 0); + addToRunTimeSelectionTable(pdf, fixedValue, dictionary); + } +} + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::pdfs::fixedValue::fixedValue(const dictionary& dict, Random& rndGen) +: + pdf(typeName, dict, rndGen), + value_(readScalar(pdfDict_.lookup("value"))) +{} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +Foam::pdfs::fixedValue::~fixedValue() +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +Foam::scalar Foam::pdfs::fixedValue::fixedValue::sample() const +{ + return value_; +} + + +Foam::scalar Foam::pdfs::fixedValue::fixedValue::minValue() const +{ + return -VGREAT; +} + + +Foam::scalar Foam::pdfs::fixedValue::fixedValue::maxValue() const +{ + return VGREAT; +} + + +// ************************************************************************* // diff --git a/src/thermophysicalModels/pdfs/fixedValue/fixedValue.H b/src/thermophysicalModels/pdfs/fixedValue/fixedValue.H new file mode 100644 index 0000000000..e64b1c2a13 --- /dev/null +++ b/src/thermophysicalModels/pdfs/fixedValue/fixedValue.H @@ -0,0 +1,103 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +Class + Foam::fixedValue + +Description + Returns a fixed value + +SourceFiles + fixedValue.C + +\*---------------------------------------------------------------------------*/ + +#ifndef pdfFixedValue_H +#define pdfFixedValue_H + +#include "pdf.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ +namespace pdfs +{ +/*---------------------------------------------------------------------------*\ + Class fixedValue Declaration +\*---------------------------------------------------------------------------*/ + +class fixedValue +: + public pdf +{ + // Private data + + //- Fixed value + scalar value_; + + +public: + + //- Runtime type information + TypeName("fixedValue"); + + + // Constructors + + //- Construct from components + fixedValue + ( + const dictionary& dict, + Random& rndGen + ); + + + //- Destructor + virtual ~fixedValue(); + + + // Member Functions + + //- Sample the pdf + virtual scalar sample() const; + + //- Return the minimum value + virtual scalar minValue() const; + + //- Return the maximum value + virtual scalar maxValue() const; +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace pdfs +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/thermophysicalModels/pdfs/general/general.C b/src/thermophysicalModels/pdfs/general/general.C index 33d3e3f57d..844e712683 100644 --- a/src/thermophysicalModels/pdfs/general/general.C +++ b/src/thermophysicalModels/pdfs/general/general.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,84 +31,109 @@ License namespace Foam { - defineTypeNameAndDebug(general, 0); - addToRunTimeSelectionTable(pdf, general, dictionary); + namespace pdfs + { + defineTypeNameAndDebug(general, 0); + addToRunTimeSelectionTable(pdf, general, dictionary); + } } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::general::general(const dictionary& dict, Random& rndGen) +Foam::pdfs::general::general(const dictionary& dict, Random& rndGen) : - pdf(dict, rndGen), - pdfDict_(dict.subDict(typeName + "PDF")), + pdf(typeName, dict, rndGen), xy_(pdfDict_.lookup("distribution")), nEntries_(xy_.size()), minValue_(xy_[0][0]), maxValue_(xy_[nEntries_-1][0]), - range_(maxValue_ - minValue_) + integral_(nEntries_) { - // normalize the pdf - scalar yMax = 0; + check(); - for (label i=0; i SMALL) + { + scalar p = 2.0*d/k; + scalar q = -2.0*alpha/k; + scalar sqrtEr = sqrt(0.25*p*p - q); + + scalar x1 = -0.5*p + sqrtEr; + scalar x2 = -0.5*p - sqrtEr; + if ((x1 >= xy_[n-1][0]) && (x1 <= xy_[n][0])) { - i++; - if ((x>xy_[i][0]) && (xy); + else + { + x = x2; + } + } + else + { + x = alpha/d; + } return x; } -Foam::scalar Foam::general::minValue() const +Foam::scalar Foam::pdfs::general::minValue() const { return minValue_; } -Foam::scalar Foam::general::maxValue() const +Foam::scalar Foam::pdfs::general::maxValue() const { return maxValue_; } diff --git a/src/thermophysicalModels/pdfs/general/general.H b/src/thermophysicalModels/pdfs/general/general.H index 06c48feb18..609c0e6c4b 100644 --- a/src/thermophysicalModels/pdfs/general/general.H +++ b/src/thermophysicalModels/pdfs/general/general.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,9 +29,7 @@ Description general pdf SourceFiles - generalI.H general.C - generalIO.C \*---------------------------------------------------------------------------*/ @@ -44,6 +42,8 @@ SourceFiles namespace Foam { +namespace pdfs +{ /*---------------------------------------------------------------------------*\ Class general Declaration @@ -55,8 +55,6 @@ class general { // Private data - dictionary pdfDict_; - typedef VectorSpace, scalar, 2> pair; List xy_; @@ -67,7 +65,7 @@ class general scalar minValue_; scalar maxValue_; - scalar range_; + List integral_; public: @@ -105,6 +103,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +} // End namespace pdfs } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/pdfs/multiNormal/multiNormal.C b/src/thermophysicalModels/pdfs/multiNormal/multiNormal.C new file mode 100644 index 0000000000..2ce3942b6c --- /dev/null +++ b/src/thermophysicalModels/pdfs/multiNormal/multiNormal.C @@ -0,0 +1,133 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +\*---------------------------------------------------------------------------*/ + +#include "multiNormal.H" +#include "addToRunTimeSelectionTable.H" + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +namespace Foam +{ + namespace pdfs + { + defineTypeNameAndDebug(multiNormal, 0); + addToRunTimeSelectionTable(pdf, multiNormal, dictionary); + } +} + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::pdfs::multiNormal::multiNormal(const dictionary& dict, Random& rndGen) +: + pdf(typeName, dict, rndGen), + minValue_(readScalar(pdfDict_.lookup("minValue"))), + maxValue_(readScalar(pdfDict_.lookup("maxValue"))), + range_(maxValue_ - minValue_), + expectation_(pdfDict_.lookup("expectation")), + variance_(pdfDict_.lookup("variance")), + strength_(pdfDict_.lookup("strength")) +{ + check(); + + scalar sMax = 0; + label n = strength_.size(); + for (label i=0; i expectation_; + List variance_; + List strength_; + + +public: + + //- Runtime type information + TypeName("multiNormal"); + + + // Constructors + + //- Construct from components + multiNormal + ( + const dictionary& dict, + Random& rndGen + ); + + + //- Destructor + virtual ~multiNormal(); + + + // Member Functions + + //- Sample the pdf + virtual scalar sample() const; + + //- Return the minimum value + virtual scalar minValue() const; + + //- Return the maximum value + virtual scalar maxValue() const; +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace pdfs +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/thermophysicalModels/pdfs/normal/normal.C b/src/thermophysicalModels/pdfs/normal/normal.C index 4a66fc9883..c105372cef 100644 --- a/src/thermophysicalModels/pdfs/normal/normal.C +++ b/src/thermophysicalModels/pdfs/normal/normal.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -26,98 +26,97 @@ License #include "normal.H" #include "addToRunTimeSelectionTable.H" +#include "mathematicalConstants.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam { - defineTypeNameAndDebug(normal, 0); - addToRunTimeSelectionTable(pdf, normal, dictionary); + namespace pdfs + { + defineTypeNameAndDebug(normal, 0); + addToRunTimeSelectionTable(pdf, normal, dictionary); + } } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::normal::normal(const dictionary& dict, Random& rndGen) +Foam::pdfs::normal::normal(const dictionary& dict, Random& rndGen) : - pdf(dict, rndGen), - pdfDict_(dict.subDict(typeName + "PDF")), + pdf(typeName, dict, rndGen), minValue_(readScalar(pdfDict_.lookup("minValue"))), maxValue_(readScalar(pdfDict_.lookup("maxValue"))), - expectation_(pdfDict_.lookup("expectation")), - variance_(pdfDict_.lookup("variance")), - strength_(pdfDict_.lookup("strength")), - range_(maxValue_ - minValue_) + expectation_(readScalar(pdfDict_.lookup("expectation"))), + variance_(readScalar(pdfDict_.lookup("variance"))), + a_(0.147) { - scalar sMax = 0; - label n = strength_.size(); - for (label i=0; isortedToc() diff --git a/src/thermophysicalModels/pdfs/pdf/pdf.C b/src/thermophysicalModels/pdfs/pdf/pdf.C index 21945ca786..0f323dd56e 100644 --- a/src/thermophysicalModels/pdfs/pdf/pdf.C +++ b/src/thermophysicalModels/pdfs/pdf/pdf.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,22 +30,48 @@ License namespace Foam { - defineTypeNameAndDebug(pdf, 0); - defineRunTimeSelectionTable(pdf, dictionary); + namespace pdfs + { + defineTypeNameAndDebug(pdf, 0); + defineRunTimeSelectionTable(pdf, dictionary); + } } +// * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * // + +void Foam::pdfs::pdf::check() const +{ + if (minValue() < 0) + { + FatalErrorIn("pdfs::pdf::check() const") + << type() << "PDF: Minimum value must be greater than zero." << nl + << "Supplied minValue = " << minValue() + << abort(FatalError); + } + + if (maxValue() < minValue()) + { + FatalErrorIn("pdfs::pdf::check() const") + << type() << "PDF: Maximum value is smaller than the minimum value:" + << nl << " maxValue = " << maxValue() + << ", minValue = " << minValue() + << abort(FatalError); + } +} + + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::pdf::pdf(const dictionary& dict, Random& rndGen) +Foam::pdfs::pdf::pdf(const word& name, const dictionary& dict, Random& rndGen) : - dict_(dict), + pdfDict_(dict.subDict(name + "PDF")), rndGen_(rndGen) {} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::pdf::~pdf() +Foam::pdfs::pdf::~pdf() {} diff --git a/src/thermophysicalModels/pdfs/pdf/pdf.H b/src/thermophysicalModels/pdfs/pdf/pdf.H index ef1fa11b92..a3077ce9eb 100644 --- a/src/thermophysicalModels/pdfs/pdf/pdf.H +++ b/src/thermophysicalModels/pdfs/pdf/pdf.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -26,37 +26,27 @@ Class Foam::pdf Description - A library of runtime-selectable pdf's. + A library of runtime-selectable PDF's. Returns a sampled value given the expectation (nu) and variance (sigma^2) - Sample of planned pdfs (beta p. 374-375): - - binomial - - geometric - - Poisson - - hypergeometric - - Pascal - - uniform + Current PDF's include: - exponential + - fixedValue + - general + - multi-normal - normal - - Gamma - - chi - - t? - - F? - - beta - - Weibull - - Rayleigh - - Cauchy? + - Rosin-Rammler + - uniform The pdf is tabulated in equidistant nPoints, in an interval. - These values are integrated to obtain the cumulated pdf, + These values are integrated to obtain the cumulated PDF, which is then used to change the distribution from unifrom to the actual pdf. SourceFiles - pdfI.H pdf.C - pdfIO.C + newPdf.C \*---------------------------------------------------------------------------*/ @@ -71,6 +61,8 @@ SourceFiles namespace Foam { +namespace pdfs +{ /*---------------------------------------------------------------------------*\ Class pdf Declaration @@ -83,11 +75,19 @@ protected: // Protected data - const dictionary& dict_; + //- Coefficients dictionary + const dictionary pdfDict_; + //- Reference to the randmo number generator Random& rndGen_; + // Protected member functions + + //- Check that the PDF is valid + virtual void check() const; + + public: //-Runtime type information @@ -111,7 +111,7 @@ public: // Constructors //- Construct from dictionary - pdf(const dictionary& dict, Random& rndGen); + pdf(const word& name, const dictionary& dict, Random& rndGen); //- Selector @@ -137,6 +137,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +} // End namespace pdfs } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/pdfs/uniform/uniform.C b/src/thermophysicalModels/pdfs/uniform/uniform.C index 09c2c4b05a..817558fa88 100644 --- a/src/thermophysicalModels/pdfs/uniform/uniform.C +++ b/src/thermophysicalModels/pdfs/uniform/uniform.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,43 +31,47 @@ License namespace Foam { - defineTypeNameAndDebug(uniform, 0); - addToRunTimeSelectionTable(pdf, uniform, dictionary); + namespace pdfs + { + defineTypeNameAndDebug(uniform, 0); + addToRunTimeSelectionTable(pdf, uniform, dictionary); + } } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::uniform::uniform(const dictionary& dict, Random& rndGen) +Foam::pdfs::uniform::uniform(const dictionary& dict, Random& rndGen) : - pdf(dict, rndGen), - pdfDict_(dict.subDict(typeName + "PDF")), + pdf(typeName, dict, rndGen), minValue_(readScalar(pdfDict_.lookup("minValue"))), maxValue_(readScalar(pdfDict_.lookup("maxValue"))), range_(maxValue_ - minValue_) -{} +{ + check(); +} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::uniform::~uniform() +Foam::pdfs::uniform::~uniform() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::scalar Foam::uniform::sample() const +Foam::scalar Foam::pdfs::uniform::sample() const { return (minValue_ + rndGen_.scalar01()*range_); } -Foam::scalar Foam::uniform::minValue() const +Foam::scalar Foam::pdfs::uniform::minValue() const { return minValue_; } -Foam::scalar Foam::uniform::maxValue() const +Foam::scalar Foam::pdfs::uniform::maxValue() const { return maxValue_; } diff --git a/src/thermophysicalModels/pdfs/uniform/uniform.H b/src/thermophysicalModels/pdfs/uniform/uniform.H index 86b7542f34..f1d0de3688 100644 --- a/src/thermophysicalModels/pdfs/uniform/uniform.H +++ b/src/thermophysicalModels/pdfs/uniform/uniform.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,9 +29,7 @@ Description uniform pdf SourceFiles - uniformI.H uniform.C - uniformIO.C \*---------------------------------------------------------------------------*/ @@ -44,6 +42,8 @@ SourceFiles namespace Foam { +namespace pdfs +{ /*---------------------------------------------------------------------------*\ Class uniform Declaration @@ -55,13 +55,13 @@ class uniform { // Private data - dictionary pdfDict_; - - //- min and max values of the distribution + //- Distribution minimum scalar minValue_; + + //- Distribution maximum scalar maxValue_; - // help-variable to avoid always having to calculate max-min + //- Distribution range scalar range_; @@ -100,6 +100,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +} // End namespace pdfs } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // From 6f78c8a949998005172569e823c146263296f8b6 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 29 Mar 2010 17:34:18 +0100 Subject: [PATCH 08/11] STYLE: Updated header comment/description --- .../interpolations/interpolationTable/interpolationTable.H | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H index 884c3cabd7..8f70d6989d 100644 --- a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H +++ b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H @@ -26,8 +26,8 @@ Class Foam::interpolationTable Description - A list of times and values. - The time values must be positive and monotonically increasing. + An interpolation/look-up table of scalar vs values. + The reference scalar values must be positive and monotonically increasing. The handling of out-of-bounds values depends on the current setting of @a outOfBounds. From 4ba2681dd63525c977f2a8aa6611b1fcf5f7ad0e Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 29 Mar 2010 17:34:50 +0100 Subject: [PATCH 09/11] ENH: Updated pdfPlot utility - pdf updated - needs to be inside pdfs namespace - added writeData option - write individual data/samples to file --- .../miscellaneous/pdfPlot/createFields.H | 27 +++++++++++++++++-- .../miscellaneous/pdfPlot/pdfDict | 4 +++ .../miscellaneous/pdfPlot/pdfPlot.C | 18 +++++-------- 3 files changed, 36 insertions(+), 13 deletions(-) diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H b/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H index 2dc6e7af70..ddb1f663ad 100644 --- a/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H +++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H @@ -10,9 +10,32 @@ ) ); - label nIntervals(readLabel(pdfDictionary.lookup("nIntervals"))); + const label nIntervals(readLabel(pdfDictionary.lookup("nIntervals"))); - label nSamples(readLabel(pdfDictionary.lookup("nSamples"))); + const label nSamples(readLabel(pdfDictionary.lookup("nSamples"))); + + const bool writeData(readBool(pdfDictionary.lookup("writeData"))); + + + const fileName pdfPath = runTime.path()/"pdf"; + mkDir(pdfPath); + + Random rndGen(label(0)); + + autoPtr p(pdfs::pdf::New(pdfDictionary, rndGen)); + + const scalar xMin = p->minValue(); + const scalar xMax = p->maxValue(); + + autoPtr filePtr(NULL); + if (writeData) + { + fileName fName = pdfPath/(p->type() + ".data"); + Info<< "Writing " << p->type() << " data samples to file:" << nl + << fName << nl << endl; + + filePtr.reset(new OFstream(fName)); + } scalarField samples(nIntervals, 0); diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfDict b/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfDict index 2a48115bea..d236d5ea8b 100644 --- a/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfDict +++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfDict @@ -23,6 +23,10 @@ nSamples 10000; // Type of pdf pdfType RosinRammler; +// Write data flag +writeData true; + +// PDF model coefficients RosinRammlerPDF { minValue 1e-06; diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C b/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C index 3347e4dcdb..b88f0ca1cf 100644 --- a/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C +++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,6 +30,7 @@ Description #include "fvCFD.H" #include "pdf.H" #include "makeGraph.H" +#include "OFstream.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // Main program: @@ -40,16 +41,6 @@ int main(int argc, char *argv[]) #include "createTime.H" #include "createFields.H" - fileName pdfPath = runTime.path()/"pdf"; - mkDir(pdfPath); - - Random rndGen(label(0)); - - autoPtr p(pdf::New(pdfDictionary, rndGen)); - - scalar xMin = p->minValue(); - scalar xMax = p->maxValue(); - label iCheck = 100; for (label i=1; i<=nSamples; i++) { @@ -57,6 +48,11 @@ int main(int argc, char *argv[]) label n = label((ps - xMin)*nIntervals/(xMax - xMin)); samples[n]++; + if (writeData) + { + filePtr() << ps << nl; + } + if (i % iCheck == 0) { Info<< " processed " << i << " samples" << endl; From 1ac64420550613e27d6c014ff40ac279bd6c8096 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 29 Mar 2010 17:36:47 +0100 Subject: [PATCH 10/11] ENH: Updated dieselSpray lib to use updated pdfs library --- .../dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C | 2 +- .../dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H | 2 +- .../injectorModel/definedHollowCone/definedHollowCone.C | 2 +- .../injectorModel/definedHollowCone/definedHollowCone.H | 2 +- .../spraySubModels/injectorModel/hollowCone/hollowCone.C | 2 +- .../spraySubModels/injectorModel/hollowCone/hollowCone.H | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C index 661a2ea7b2..bf1a792c6f 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C @@ -55,7 +55,7 @@ Foam::ChomiakInjector::ChomiakInjector ChomiakDict_(dict.subDict(typeName + "Coeffs")), dropletPDF_ ( - pdf::New + pdfs::pdf::New ( ChomiakDict_.subDict("dropletPDF"), sm.rndGen() diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H index 50de0a31dc..87c2d1d816 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H @@ -64,7 +64,7 @@ private: dictionary ChomiakDict_; - autoPtr dropletPDF_; + autoPtr dropletPDF_; scalarList maxSprayAngle_; diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C index 883dc9c431..e266181c9c 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C @@ -55,7 +55,7 @@ Foam::definedHollowConeInjector::definedHollowConeInjector definedHollowConeDict_(dict.subDict(typeName + "Coeffs")), dropletPDF_ ( - pdf::New + pdfs::pdf::New ( definedHollowConeDict_.subDict("dropletPDF"), sm.rndGen() diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.H b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.H index 56d6241892..d5318120ec 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.H +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.H @@ -61,7 +61,7 @@ private: typedef VectorSpace, scalar, 2> pair; dictionary definedHollowConeDict_; - autoPtr dropletPDF_; + autoPtr dropletPDF_; // inner and outer cone angle time histories // 2 column vectors = (time, coneAngle) diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C index 40508fda7e..28bed642e0 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C @@ -55,7 +55,7 @@ Foam::hollowConeInjector::hollowConeInjector hollowConeDict_(dict.subDict(typeName + "Coeffs")), dropletPDF_ ( - pdf::New + pdfs::pdf::New ( hollowConeDict_.subDict("dropletPDF"), sm.rndGen() diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.H b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.H index 985d7c6073..6df6552174 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.H +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.H @@ -59,7 +59,7 @@ private: dictionary hollowConeDict_; - autoPtr dropletPDF_; + autoPtr dropletPDF_; scalarList innerAngle_; scalarList outerAngle_; From e2f2bd1ff19108736c61e9f7152e18a7c2481c8e Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 29 Mar 2010 17:37:10 +0100 Subject: [PATCH 11/11] ENH: Updated lagrangian/intermediate lib to use updated pdfs library --- .../Kinematic/InjectionModel/ConeInjection/ConeInjection.C | 2 +- .../Kinematic/InjectionModel/ConeInjection/ConeInjection.H | 2 +- .../Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C | 2 +- .../Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H | 2 +- .../FieldActivatedInjection/FieldActivatedInjection.C | 2 +- .../FieldActivatedInjection/FieldActivatedInjection.H | 2 +- .../Kinematic/InjectionModel/ManualInjection/ManualInjection.C | 2 +- .../Kinematic/InjectionModel/ManualInjection/ManualInjection.H | 2 +- .../Kinematic/InjectionModel/PatchInjection/PatchInjection.C | 2 +- .../Kinematic/InjectionModel/PatchInjection/PatchInjection.H | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C index b9cbf0f921..6d38ad3ba8 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C @@ -120,7 +120,7 @@ Foam::ConeInjection::ConeInjection ), parcelPDF_ ( - pdf::New + pdfs::pdf::New ( this->coeffDict().subDict("parcelPDF"), owner.rndGen() diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H index 5e6498e3d4..41c299b027 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H @@ -97,7 +97,7 @@ class ConeInjection const autoPtr > thetaOuter_; //- Parcel size PDF model - const autoPtr parcelPDF_; + const autoPtr parcelPDF_; // Tangential vectors to the direction vector diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C index e59eba322e..8b02e7057a 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C @@ -151,7 +151,7 @@ Foam::ConeInjectionMP::ConeInjectionMP ), parcelPDF_ ( - pdf::New + pdfs::pdf::New ( this->coeffDict().subDict("parcelPDF"), owner.rndGen() diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H index 238d0463ef..a517866689 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H @@ -104,7 +104,7 @@ class ConeInjectionMP const autoPtr > thetaOuter_; //- Parcel size PDF model - const autoPtr parcelPDF_; + const autoPtr parcelPDF_; //- Number of parcels per injector already injected mutable label nInjected_; diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C index a1353be80c..f8599dcceb 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C @@ -115,7 +115,7 @@ Foam::FieldActivatedInjection::FieldActivatedInjection diameters_(positions_.size()), parcelPDF_ ( - pdf::New + pdfs::pdf::New ( this->coeffDict().subDict("parcelPDF"), owner.rndGen() diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H index c2f1e3cef4..e58df9c379 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H @@ -106,7 +106,7 @@ class FieldActivatedInjection scalarList diameters_; //- Parcel size PDF model - const autoPtr parcelPDF_; + const autoPtr parcelPDF_; protected: diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C index ad829f3978..0bf8e62e4d 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C @@ -94,7 +94,7 @@ Foam::ManualInjection::ManualInjection U0_(this->coeffDict().lookup("U0")), parcelPDF_ ( - pdf::New + pdfs::pdf::New ( this->coeffDict().subDict("parcelPDF"), owner.rndGen() diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H index b04fee48b5..e4642f6124 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H @@ -75,7 +75,7 @@ class ManualInjection const vector U0_; //- Parcel size PDF model - const autoPtr parcelPDF_; + const autoPtr parcelPDF_; //- Number of particles represented by each parcel scalar nParticlesPerParcel_; diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C index 4e88b90bfe..198ba8e13d 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C @@ -93,7 +93,7 @@ Foam::PatchInjection::PatchInjection ), parcelPDF_ ( - pdf::New + pdfs::pdf::New ( this->coeffDict().subDict("parcelPDF"), owner.rndGen() diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H index 05117ce3be..1338d5bbda 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H @@ -84,7 +84,7 @@ class PatchInjection const autoPtr > volumeFlowRate_; //- Parcel size PDF model - const autoPtr parcelPDF_; + const autoPtr parcelPDF_; //- Cell owners labelList cellOwners_;