From 111d350a223ffd4edf2b9c00e9ac35e72d962090 Mon Sep 17 00:00:00 2001 From: Steve Plimpton Date: Tue, 28 Mar 2017 12:34:46 -0600 Subject: [PATCH] fix gcmc units change for chemical potential --- doc/src/Eqs/fix_gcmc1.jpg | Bin 0 -> 5617 bytes doc/src/Eqs/fix_gcmc1.tex | 9 ++ doc/src/Eqs/fix_gcmc2.jpg | Bin 0 -> 10626 bytes doc/src/Eqs/fix_gcmc2.tex | 10 ++ doc/src/Eqs/fix_gcmc3.jpg | Bin 0 -> 7437 bytes doc/src/Eqs/fix_gcmc3.tex | 9 ++ doc/src/dihedral_charmm.txt | 26 +++-- doc/src/fix_gcmc.txt | 55 +++++++++-- doc/src/pair_charmm.txt | 6 +- examples/gcmc/in.gcmc.lj | 41 +++++--- examples/gcmc/log.24Mar17.gcmc.lj.g++.1 | 120 +++++++++++++--------- examples/gcmc/log.24Mar17.gcmc.lj.g++.4 | 126 ++++++++++++++---------- src/MC/fix_gcmc.cpp | 16 ++- src/library.cpp | 2 +- src/update.cpp | 2 +- 15 files changed, 287 insertions(+), 135 deletions(-) create mode 100644 doc/src/Eqs/fix_gcmc1.jpg create mode 100644 doc/src/Eqs/fix_gcmc1.tex create mode 100644 doc/src/Eqs/fix_gcmc2.jpg create mode 100644 doc/src/Eqs/fix_gcmc2.tex create mode 100644 doc/src/Eqs/fix_gcmc3.jpg create mode 100644 doc/src/Eqs/fix_gcmc3.tex diff --git a/doc/src/Eqs/fix_gcmc1.jpg b/doc/src/Eqs/fix_gcmc1.jpg new file mode 100644 index 0000000000000000000000000000000000000000..158cf8b61f98390acfc353032e882e26fdbcf8a3 GIT binary patch literal 5617 zcmeHJc~leGo2?KqfFJ}>Sq+Au$dZJu5hO&2Y|;p#>;fWdfDj>IqC~=?$fgJ=ZnP+B zqiktqRUqsjZQF_b+83MAONrzH9*J)JZ&iW5CCv;0(1ZXkOag)3IJFXfkX|shzGsc z5Ka+-V*@lOgvcn8IRyjXC~hu_*B_(c8XHq$BQS7JCl?JIF(z2U1Zj*!!$sLKK_TX@ z2W|h(72RRre{YgZCL_s4NMcMV%D~Lb423pC85-(~X6Td7M8yVB^rJ|c|6bu>Fexww ze<~JFjM7-I7;usp7mI*I;JX6f75J{ecLlyH@c&PNf80)R zl*rf!icd%QW)`+h7l4C?6Y=o5??o5B5cH38=-ukde%@j@Kk&{QR>Dg zzIB4I8GuRx7=Qx?!2vNS2n+=Y+X0x!v`K(Au#qO}Kw@BViA@kmDe29k3Dxo-La7btvKAaRAcbZH&b2jDth182_ z=^43sSFhz?zj5d1;yd&i0mZ<-W*?-~%74Z@i7YB<&)_H-%$m_(R;u5`!nLnu@E=p0fcs^gLNe3$a&fP> z@o%?yTQ-hoZ!tY@^6`Cez7W7g3|4~!4E7kP-mvaMZrU;lrXL{rIgHV>SbKQ>v&ua1 zSi>#L+*{bB*z(<939h}a`JA~~mHy@Gn!1{J&)gm8Hofv1uLC%!jN>l{s8J~F|V~43)F@`=a;GVPqKIg?`8!3d{Bue6}S3~fe{4tMJ)|d z{8#p{{Zs$AW2H#M)R}r$7X+j&XgLnz63v(&l$A}s9z7tTcvLMh%c}<1;`1|vZg~~> zsyiP*#jT(SM}&ZE?Km!RlXF&8R)Gvj2q^TtF5kbVfEpsNWk+<<_+EIJp!}{}zqf9? z5D0xwhxiIis;)N|%G1}h@mTzGDUQCQOUlt_`OfI;>BTh}N-xg;R8kLeYesygN8T07 z(CxOw2y9`JYtobtoUpL-ER{DVvbIAZ`&}LDPLK#t>|#G54ddtnxfkXK=L&)JPlc}B z{^HP5Z@Xwr>9FUp9Z6x>`$dlvlrnVHK{4aS$AVI^2V#=+Oj=ZFCMJIAOkIEM=I%Hl zP<8wg3fE)Y&50+F+f}*=nm=A7l08o zg=!%nJ#4j~GS|WEY`U-iEI&{#W$}G&k8xbiDES&RUiBUxdO|$>qr&;L3oD`RuuTkk ze&wN_Sd=0k)^_&y+w2$p`YNwo-V%`Ii-SE!w&}z3ciV4sHFnXI7Av`&7#Pt8lWUL| z%WQOCX}P2N)>!qY(-W-lN_;-rtD6?%XmD%t-a#XW>w%3gfAB1r4+GQbYO8nGv}Ujn zOKE-^Cp9m0%e^z~Mnj(|LX>juUSCPj@#0sP<2^{@zPL^mkJO5}28p5}e#-HzjwOP* z5O5*ruui1Iq5Dt?RC)Ei&cuY2TYRF^YPU~a8;m;6vrDC-V|g53zb*&! z#zk|#!ljQlW*Gyt==$#Jl;46ELh~XbFB#6JB%X?}{^;6U7E)c?_&k~AGwsw^7W3lK zz*cd*OmwP7{drqLXq<5e0%_(QBNL_SRW#;7{Pc(YS8`MX z)jW0$Cq8m`p==ClJ03=ZGWH96_zN7lv}J};W(z~&-Sswelfq1TMMw69*~mzVSDjCp zPL=PO!_^#L1ebN(4`;DU4UtoHK`ncBa|IRIpCIGkHAYM))8sAT)6Y?DO;UWl8I=p~ zt}+uIa<*sq$c88z?TkBTJ^EW??o>zsQ8Ifux{5)Z*^{0iEl}eXrV|9A93db^i8#)a zxSM8GGUILYaAeVX)9Ch>=_k*4ybOGX9^E@}qPKc9SqMNHj+Bq`ueY-#xc%j&Gx>!l z7=5U!Ovl@$r9bL?+3JLFLgWzKRF$qZgVm&gdE(F0LlAET}{QmtXWGWS694b;1rL~I^vBI8>pS;-R$B#Xy zm;~07$G_F|pGG^7qKz*~si7Z}Ph*lFAyzylOh4`5jxL?&d9=xG6C`kp+x0bDp9n|; z)in7L`~XYooa@}78?2G$D7~mH_X*Hks|Ag^nmh6eMw7oFVV_GocB=GPgtC9~Z(;4O z+40=6K7jOd`1TH#fyu)Of=ticrE3G!C|kD_nF;wbB`g^(IhC=K?`+34O)2wmdb7A$ z+j!NoM|l`Wh)mM-oj0rek%#ixU{7!v&Sg-e>SNh4s zS4P)bzvMMUqYhWhU_MTnZ{&dIQEcbb1SB zQ5qe;GaFm54+`jQ>=%1MuB^i()(X6WhR$zvzfOG>sKZ~^9~{-fan3*Y{4ChUJQXxd=m(7yqg CKN|i3 literal 0 HcmV?d00001 diff --git a/doc/src/Eqs/fix_gcmc1.tex b/doc/src/Eqs/fix_gcmc1.tex new file mode 100644 index 0000000000..c4b0d62527 --- /dev/null +++ b/doc/src/Eqs/fix_gcmc1.tex @@ -0,0 +1,9 @@ +\documentclass[12pt]{article} + +\begin{document} + +\begin{eqnarray*} +\mu &=&\mu^{id} + \mu^{ex} +\end{eqnarray*} + +\end{document} \ No newline at end of file diff --git a/doc/src/Eqs/fix_gcmc2.jpg b/doc/src/Eqs/fix_gcmc2.jpg new file mode 100644 index 0000000000000000000000000000000000000000..d054f584305d763e5b7baa8881a1f1a0d96f0a62 GIT binary patch literal 10626 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 KQ~$&BP5&Rn=r-a2 literal 0 HcmV?d00001 diff --git a/doc/src/Eqs/fix_gcmc2.tex b/doc/src/Eqs/fix_gcmc2.tex new file mode 100644 index 0000000000..fc4d90355d --- /dev/null +++ b/doc/src/Eqs/fix_gcmc2.tex @@ -0,0 +1,10 @@ +\documentclass[12pt]{article} + +\begin{document} + +\begin{eqnarray*} +\mu^{id} &=& k T \ln{\rho \Lambda^3} \\ +&=& k T \ln{\frac{\phi P \Lambda^3}{k T}} +\end{eqnarray*} + +\end{document} \ No newline at end of file diff --git a/doc/src/Eqs/fix_gcmc3.jpg b/doc/src/Eqs/fix_gcmc3.jpg new file mode 100644 index 0000000000000000000000000000000000000000..e87764afd9181dd6c4707c0a33b0a80abd2170d0 GIT binary patch literal 7437 zcmeHLcT`i^x<4TxO+bnu9fQ(CFVd0`qzx)k1gROMgAh6aLJ?_#fQo>?PzFInL`0g@ zC{=VEq!@Zh00jg|lya1i+`!Cr)_d#SyY6~_y|tddlYR0fd+%?b-}ikv`vfYL1p{Qy#Y0LB9w0Ho;e001q8 z{M}p1@V$4j6#CtE*&j$Fupajg4Gq*$QVIxBbah8x_E2;~`zv8w1C>-1m6ZTJBqq?+ z&CerL;@Nw6N*=d|pJ{M@{;q7A@73^Uhb>7A;%Fj*P9fm|m=wWm) z{(=4;p{^1b|0@9@Iv9P}fpZBIiI$cTst#RxS;bg-9_ing}4lCr9jsw$j50v-|>5bBD72ZTue)595$ z5Vv5Tz)&A_fW*E>*URXzP<(%R@dH01@FN00BJd*uKO*oW0{{Oa z@VDCW2%t-x2)dR5XzReK3*P8Zbci=PP(n>n88~HNc8+mhaM5vKpFA*+jEdfv$O4`+ zuEew6T>}kbY0m*}7Qh8qghF5d12+W94Wab_;&jo*1UbOLH2Mj`0A*x4#LU9V#!es5 zc!aL*pil-zC==8EGLRU0KfuV%#B*Hb^dVkLS7ulcpX$|Hzp+Rf)V(-rHAFh0b~!kK zm5pEEn4r)}DQOv5Idu(9ty9`MhG&e7O-#*xwzj!wYj?@s!Oh*n)63h(HzYJHJOUFL zbuBR|IVJUa+U@K+Ik|av^9#!El~>%ad{Fi9X?;UuQ}eTy)~@cJ-oE~q1FwchM&IGb z#wR8T#D&GB_aBy5R>_~gY;JAufM37u^P)@6KWWj=e=_@TytwJS7#JC$jLiGIAPf=v z#JL%nj;kEvIc>@88pI1zy~@I8aO=0a7p#(MR-~hsgNNAoPpA`4lJ}_{F#FGlCH$|L zeJA!euPML~U^oDjfu1EOl%6R@I+&Q5_QA};d;pfez;*!keQkQg^pl4qTq6yTja*T<6%UcZ^ za17JkMHPI4tIre+aCJ7ZX%?vAu@D)`b=FsOgbOpVIf}UZ#dQ^uv-bFrVsUd~Vl-gs zBoN(ube;x~?o-@ofKgU|$xeR??yH#zMHY9A1`N58KkShS8&szV#A5k-qXRZMh5|X!H2Qu4WEe6QY|u zV6(_+`V!Ic6BD21PvW$<|2E#xrIK_S;7=A<=Orn<2s|y)6y-m5y&aAH6l@uqp|vXo z2#ikqJ(%DAJV@Bmz}_R|)RQgNix!H4PDWZ>)nhHiMA6fe8|3Uame-oGnmIMe?yP@T z%pgZ!xTN~QL6&RpApON}Ai1dkg$duOL^*{J^~>VaZ*P7AW(v3bR?MDnJ0ThGV9w4u z8F_EgxrsYRH>4xBw)Qm*0A+h-WyrW>>QU;OSx5r=95?nn`Pah==(7o3AI=T&t_z^9 zc*jLG4Vj&6e|nb&U?h#@a~a~11_(jlPKB{pVbIQryk60fa=lShz@iNghg&Wr%v~s+ z5qmF#H@VeiBCqx=(W#Z>l^mcLN04p#>b}b`lkZO{Qq;@RCrCL~K{6al4?ya+iG?scTzqip*3@S_9z7IkBVSkciiIEsKu3UjvW zeoYXpRj;-m>HZkt&za4bD#R{*HQ{b~Q)0Q5)H}A-=W_ADW&t2mmiE2ThW4w8G&gD9 zH@OiX%Z4emC#8Cl^*5E5V?}JHo_%axB(Jpke0}L$9TCEdh>~!djMw2xED`J!!v>Mo zchX{oR~dWmI`Pt-5;2lgbLJ~1fT+p1zT(TYC{xnZ~F4DeYR0ep6{M6@U< z{=#zt>qZonKdn_}ctt~ZT;caFc&At12Oac8M}*s{X|+*1B^tm!IA5~IC(a%>ze+E* ztP9LlLoSgOSZC0(*4OqMB4xpX%U5gXiq$NB z@oe(1+wIBGFN!(9jCoX2RQqrVH`bugI?J^AI#emI+`eOJ^l6<0OzvT6pMB97dxNf$ z9}#`Tr83FaaXoI? z(Xi>&h@=;bDlM%yZ;g{tW^W-zd>0@n=p3llTa2Iq3F$tuD(^O(&m)gOD0PFVM4ZPDtsR89L`PzZ+vnG_GU6r_D1}HQeAmPP+E{ zv-Z}Ovx^&bjGU^7>e?c8t_kG4Rx(1_85=#Mryqh|c)jxJv0`I5KFrL)v)$@;`AxI% z?REZ<#MJ&J+Xj}oJ+oYPDyQLGM{+?*Bg z%Fz?>y~V7@hmcNw&k-82^g>~b^Nv(-T;NX%As%aZ*IQHfZcE<$j4O^OreJvWn9v2$ z_?(*q4LLK-X`34W$kmNHOp$k+uVpa`J9Mj3{$zt)-cHn=x_dlRu|v`7U!Fb=OdCFu z#_)g*07NtPZ`oSdxVH^OzRpaI7FRD|y_Mnf8Sk@x%HEZZ%f5-5iqKq)sq`MqZri&s zmz9UqjqBnjSbS5dMpBqb;xs^^deb)z07D44M2fEKLXpt+$hL74Nr5!&p=Tl@#%VWV zW^ApjDe&1jlhu0hp5`%$x4mNprdME2 zm?*?r`AqWHcx(sxJ_~;8U$|?${OZ*Ssb!NL*x9}7yPnglIMN#zb<%d?b*YL4mPhTv z-cLo83W;q~F~?MBK%k32f7#gexEEG>`kK|dqL{oMhq!{)%4=Kt0zE>ZPiVlS1S0!# zsgKR}=lN$j_2Y-fV#s-@x1F+J`gY*k(2sey`+JMw&Ex_Fjuxqr1`gOqo22R5OZcyk zIHUOGbmM8K6YPlx1RQA|jKy*i&7LmrM}Ey&^5 z(1AAhiz-ciYkVYZBgC5zhSTwD{{Uzi>I#rc&i7Zev@6lZD;LrzOc)&sgz+ z7(!LMWki+3rS6#O)r|LVL>yv^(Z96RHFEc(HF|qSy46|}O>@rg0AlnCVTJ%xl};gD>3rypqmoDUMZ07%3vo9W>75VH~2B# z{SFa{YlYq4-t^`3PWe{u!J;4dzsko?_ln_P-Q6h;udj~1={z&BV#|v{{ob^l8`v;% zPL1G}c2ePwwHby7C$hInx%mDgN(G$)ATLoX6Cvg+-k{aHaRZ@AT2D#i`O=#!#Ge!5 z;pRrz;B=w^72{JsJN#jP;#tB=rQ)R=Lp3S9yBac++7-(KPVAnc4h~Tq!3uJAKi&=@ zF}lUF88#foek@m1=MRheLqUoqiYwF+zWMCWN7)mZwShfdl2=j~nr+g_(U+=#$6oqk zDk_c7voJdjxVgtoY}=YO6rbPn95l?7udmIIbMGf(OW0~nZcr>^7TDWR0+?p==64!O zO6ykk%aiZk=QH2EY-7+1*ZNgP@G|q!&36ZzR~&8RUurdIAI`hv&@|Q%WF`wg#|J%X zj@n2HOBXf@n?}6TD6fY8;=be|*DbObgepNkL1uhHsLo==-$^DYJ;ADiij!wEBX4PN zSlbCX9ClwvdXZi?SJ|id?)gdT*)2&^cyRL_SzXQo3!#CMU-2}6r_q9~d^p(iDQWD} zZ~ikhATmgK@Ub^^E1-S1w+^d9avz%$((~}Ux02_;nXRDZa3=6@-8SsZX3ni@(12ip%hIrs-M0Y7+6eY6Fu{S2s6?aBjN_2Td50F^qY^B z!ozPhs~nw9c|JkfY5a#TN-aLglokJjsu=rbgNPEtDi2ZBz(GemRhs_G$BsoMM%gw# zu=g%7N#67`+t_GWm%~HZYRbKH@p0Zcw(sp9BZlqWgLBr!4`ER#96@Z?Er#@X)v~lJ+#KSU|v08+CO$Yg6PTZL~CbZLE zd(1an72{_?D#9gUMJpTz)Nl7RTbo2w&CK+}6oQ=8$qJSYid1)D!}(G^$QQe{wp~ez z$Y@^;S#G7>BqFRFYeeQ*mPKCQvWL|-l0MbKbIOfX0(ws1%8M&kx5WeGl2jyX zyW_*yN#tP)ha1s+hPS`-1WFiFPh?Kj(+xY-CdS#`!rzL>7k$klDv>sc*FCjewpYAZ z_#oxivl%;cYZWAPKML9|N!(z@3|c-J^;e|$*ZLvE`~+?lz=f^z1CD1dn(>`h)Whc# zNghsr<~mhSF^{{7P#D4a;Zku8sPx*k#|?XS-IK^9%5gOML`H~Lr2+qfrFpscZ4FhF z#BErXlugrm2Mcq5u?(n9=+N3;BcWf2#}gL__?vTFid!YA!C?5(qsJO=B-iiH;sx(B zRrrmB^yIbW?z}3>4}c~~wt*gm5>}9x%BE6HL4fl2Co$-*R;{jRA3clvE8KS#Jn$Z) z*BtamEpswzI|pE`gAzUkQh{cS1>YnIUeB|5LDY63*h}8&-O-5|#!SN5&yuEXht1)= z$@%vkuRJruz8rGfJ+pe7??&sA7H_tTAz@>}nwXK&C!YH4kJ_pgEiqv*V)(t7gPyiFBQ7_^QlZr=fGdKg}{rK+jG1)jxfK$H8c0p0N!O>Q%QFafr}HD zI!2IA+_KN<#G%S@#L#M#Wa?Q(NTo9eX~n)*UHIOOX0-LSJ-_MYXC6Zfj+j~2lV(R5+XuQuaazkt2?5xM zh|+$o9)Dfa;jLPgp4@Lzzac6-C7BmJiiyL020bxL%JEzV-q4!9fBwCpjsDApair == NULL) || (force->pair->single_enable == 0) || (force->pair_match("hybrid",0)) || - (force->pair_match("eam",0)) + (force->pair_match("eam",0)) || + (force->pair->tail_flag) ) { full_flag = true; if (comm->me == 0) @@ -618,13 +619,18 @@ void FixGCMC::init() } // compute beta, lambda, sigma, and the zz factor - + // For LJ units, lambda=1 beta = 1.0/(force->boltz*reservoir_temperature); - double lambda = sqrt(force->hplanck*force->hplanck/ - (2.0*MY_PI*gas_mass*force->mvv2e* + if (strcmp(update->unit_style,"lj") == 0) + zz = exp(beta*chemical_potential); + else { + double lambda = sqrt(force->hplanck*force->hplanck/ + (2.0*MY_PI*gas_mass*force->mvv2e* force->boltz*reservoir_temperature)); + zz = exp(beta*chemical_potential)/(pow(lambda,3.0)); + } + sigma = sqrt(force->boltz*reservoir_temperature*tfac_insert/gas_mass/force->mvv2e); - zz = exp(beta*chemical_potential)/(pow(lambda,3.0)); if (pressure_flag) zz = pressure*fugacity_coeff*beta/force->nktv2p; imagezero = ((imageint) IMGMAX << IMG2BITS) | diff --git a/src/library.cpp b/src/library.cpp index ca3276ee8e..f9c5ad4892 100644 --- a/src/library.cpp +++ b/src/library.cpp @@ -790,7 +790,7 @@ void lammps_gather_atoms(void *ptr, char *name, for (i = 0; i < nlocal; i++) { offset = count*(tag[i]-1); for (j = 0; j < count; j++) - copy[offset++] = array[i][0]; + copy[offset++] = array[i][j]; } MPI_Allreduce(copy,data,count*natoms,MPI_INT,MPI_SUM,lmp->world); diff --git a/src/update.cpp b/src/update.cpp index 35492006cc..5599dc6c88 100644 --- a/src/update.cpp +++ b/src/update.cpp @@ -128,7 +128,7 @@ void Update::set_units(const char *style) if (strcmp(style,"lj") == 0) { force->boltz = 1.0; - force->hplanck = 0.18292026; // using LJ parameters for argon + force->hplanck = 1.0; force->mvv2e = 1.0; force->ftm2v = 1.0; force->mv2d = 1.0;