From a15d7b12cf9735ba01b5a287c07418f85abd544e Mon Sep 17 00:00:00 2001 From: yurkin Date: Fri, 10 Sep 2010 09:55:41 +0000 Subject: [PATCH] I forgot to update version number in const.h to 1.0 before previous commit. So now affected files need to be replaced. --- sample/run000_sphere_g16m1_5/log | 18 +++++++++--------- src/const.h | 2 +- win32/adda.exe | Bin 375065 -> 375065 bytes win32/adda_mpi.exe | Bin 391548 -> 391548 bytes 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sample/run000_sphere_g16m1_5/log b/sample/run000_sphere_g16m1_5/log index 1bc1c1cc..bdfaf4cb 100644 --- a/sample/run000_sphere_g16m1_5/log +++ b/sample/run000_sphere_g16m1_5/log @@ -1,4 +1,4 @@ -Generated by ADDA v.1.0b1 +Generated by ADDA v.1.0 The program was run on: YURKIN command: 'D:\Maxim\Current\adda\win32\adda.exe ' lambda: 6.283185307 @@ -64,19 +64,19 @@ RE_022 = 3.1681532518E-006 + progress = 0.791154 Total number of iterations: 22 Total planes of E field calculation (each 181 points): 2 -Total wall time: 1 +Total wall time: 0 --Everything below is processor times-- -Total time: 0.3230 - Initialization time: 0.1160 +Total time: 0.3220 + Initialization time: 0.1150 init Dmatrix 0.0090 - FFT setup: 0.1040 - make particle: 0.0000 + FFT setup: 0.1030 + make particle: 0.0010 Internal fields: 0.1710 one solution: 0.1710 init solver: 0.0080 - one iteration: 0.0080 + one iteration: 0.0070 Scattered fields: 0.0210 - one plane: 0.0110 + one plane: 0.0100 Other sc.quantities: 0.0000 - File I/O: 0.0150 + File I/O: 0.0140 Integration: 0.0000 diff --git a/src/const.h b/src/const.h index f2353c06..8918372a 100644 --- a/src/const.h +++ b/src/const.h @@ -23,7 +23,7 @@ #define __const_h // version number (string) -#define ADDA_VERSION "1.0b1" +#define ADDA_VERSION "1.0" /* ADDA uses certain C99 extensions, which are widely supported by GNU and Intel compilers. However, * they may be not completely supported by e.g. Microsoft Visual Studio compiler. Therefore, we diff --git a/win32/adda.exe b/win32/adda.exe index 302e46b94905d0ac8dac83c6a9be45b9433ab912..475af813b49d1193260881fe5d48e116f1846ecb 100644 GIT binary patch delta 4148 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 diff --git a/win32/adda_mpi.exe b/win32/adda_mpi.exe index 75b3ba189d2b5c9b1b18893c267fa94aba8bd353..9bfdf6343b116dcc7249dea919225be25c57cd59 100644 GIT binary patch delta 2621 zcmaJ@dr(y872mUa7gyK?+JI2yWx1#b2sT==RWZ8JMF?PHr94(a0TH?=BS%+Cpe zI&odjD?qmo_l~Nd4o~F8LI$?xrOeo#saLqvS-2>FF=SzS{#$SWyYr)-k?mzwPbA4z zC|@b&r~B8zVcfBQADHmg{y$Uv{(>lv_X)xIx$|b5?zmW8pi)6DTHpE&Ie&C;jW&av zy(MFkuXn8|AZu+@H&WY3I+LabJ21*DPob1vc!tRMNlb*7ylKY z1wVUd6NKPw<6ihkeAgHOa1!lDqKW0<5d);*vJx8=K3K9*300!r!~uvHe>51Z;*O() zX2*dO&2Sz+E8hq$qTk77YG}md4+6a!S>Z1?^`sh_rX^ha&0^tNY~wG=Rl)q zJR9W(JJEXn5WI#ft2aP49aG8jR4l9fR+27pd^W;`*@PN!Vdb*pEX0$AT)ieq_D^VO(Ww-Q;%r`9 ztmieoTN)(EF~Q7l&meO?uYGXO#-r&%IW&ne_9e8x;?|38O1iCTXlAz`Uoxvmw3KV_ zifLa|G5y$M`BnBPrd(U2oU&lpmuJ1=UL{~q5b!46+mVdjUzR?*g=`Mypd5VcvNMs_ z5Hsh)h1_?&wJMv;J@0U z;SU(-4Dge4B?QMzau>5)vw6;L!W8E$cNuUKud&2omNT9j%jVqU{hz86d2jp3Zj5VR z>M@PtZ5!W>zi;OQ-AHmD%I4u_F|k{|5}CTr+*X7iWX(hj5IpP`LA5obd0*&~^S0 zMp9=ejD8m*Bydde{|amBjF4I6=C)ma+Tj<`t1H5dm0)Ye)m^K+?l7ffH)-vN!;-ET zuTiquWgBTtwkur&;D+|E!yo`})AeWQelrXV7<04SYy0c8#pTMWEhfo3ZyMa?{mi#uk;_2>cdVcAa5kA7Zx7I)>hToom6mi}im74D-9AhCz6R~!b9$C{F zeGmLIN@>@=K}$Lt4o`gHzJU<+mM?Y)Rzy#b|gC;JchH zssD|-tWO9mo|cXT-1lH1yojeCY=czv=$jWTXG{mDHjVt2R8|hPRLP1QdX=l)f+>9= zMErW+JpXMBkEE(FQEt|kSY#rvwZ(}a_niXYo#ZVktDHXHj$`vy7wsDSlBo&NgXSc4_77~PL9$_R z2g!bZFl6D=gjs%+j<)AgA1EwY#3!G=sX0Mu65Zq=PgRCK&VvRlf4r9Jxb=7?^y1v1 zXy9<;&{7D-qM=Y&glC3wedX3*r3d4kVfjrM`{Hx zXL0utC|rdp^pdp~PYp*B!L{KicpIM#CkL_NC(lbZq8w~wlvFc(Hdm<2c8&xQNAbvf zXu@+Np)~cr8aX4MaVpYVp2M{TV(I7+0FxLn_BViPtowGDhI!5STEmh7QV^X0ZW=jUy8uEHML8Rw^M>KOExTne%H+~l*Q&7R3-y2eYpURmv#MR{15*Ua_ItYU- z!N^vT!WkXCXcDgIfQKq!fcb6Pp1|?uv;@u{ z%(;nNpB9sq-sX(WoGDr5u27gqE4kts^3$OzuJl*RN`Ik$jPo}~s?;F>O~MPDdK^sV Qc(uBWBsSl3Qy&}rH-j+zlmGw# delta 2636 zcmaJ@eNa@_72osrEv)P=kcJhi3u<|2R1loR5nHr=Y!sBR*xCt3GLkf=SV^-QMXYFz zkpZ%zm=p8bWDrP=n;waaUPDpo)?Dfq)?*ujf8+ns$=@vG3jU zaeu#a&OP_M9qNr9>W!`}d>=0nOJV^PKSJ)UEzY4q~40<95hPiN*=(C8T%%{XVThz zg!T`-d%y=xc%phav`Eo4vo!>1`5-pJ&k}#WxjQGFqXPJ)tsi`)CDZbwvGjcP=y>o; zwxdZQumPQ)ya9zcw|*%UV_ChInA02LK!?9;SOk%Hq+vQ3rArNF4os5CS-`4X?#kn0 za@Uzv-P>G<5)2boJab2)cjmOZCPbQshsRry9i zUv3t(H(qFxWv`YZb?gcyb+MqodEJ$QmB*{0T}tshr3S0C<}*J>uX#;A_WH?5yBfMM z`}|u{?iY11x~x9OmQwclh1`e+6TUneVR?msK}EnTgh=md?D%r;lj}+6Wd@2N%A*)F z1uZf2-ZG}m74+TFdXAa3F6QU-;X&Wesb+1yhY%$NFD@P>#fGm_s0*%todL&j=B1~m z`~F~7RaE6rOA%j;CyKyFmd3=n3F|}jmB_mky(4_)+0w4E(p@iyEqA3<4-Fxs~ z{$zLuV*{pWC00W4jv;e7i*=*GdulK{Fg8p9Tp?&37PJO3sIgpuO_Be}I#Y=Bgjn&H zmuKllQ6gPBEB@)SU{ZFPg%~B@A)fLjUL^p+@?MSu6SiLdY3gc<*i|_~Y;vU3C2>v# zDU*`0Sj{T;0ao2&A!;O1Dl-9U-9AjdvM3>k94KJEoEN(1bx>94cx|!G$C5b5hsZl<3kuRMcEvj7`sqC8aa!~sd%pt z^bVGtHwQ~w5{-<>Sv%STHlxCB!BZ{q(D^@Lm=qin^@BJ|gFl923&unLf8$L3VGKj- zk6~oB#&e-v&y6BsMw@C+jbYmqNhCp60wV(3o-0!0_0%I)#`{M@^x2pBWFxCZ@rox zrZhmYp!NDNr6ZQQIIH6~G&v4-)YJO8P8)oR*E$!%Eu7jl1bNcrf2uWtYJ*v2E8%G* zxXFPIOc6-y9NaUUcn10h_ z%wQs20Gq-3DS@pd(Yp$_+?)o##e+9rrtzuknLI&>m~M`{fb5POmJan)MOq0Q^@eBRJD~9oAWv5nJMU97U`p&_rdr_vQ|_b9=+h+MP#O$ynJisNKL5w z9X_nRwT32W=}86GAJlaq8siND9iYJTj3&B-&;g^bl#f_ zgE*-#8KQ7`-z-SR(!O|@he!H~j7n>;Ys~H?&8lHpc9dai{{--1PX8z|<>65x$ffEi zcPdR#qPTV&RKb#L+T_xlrx;Cz1)yp0e0Epcr6DFc(uC@-5C74;0C4HoLM-w(tQ zNBO`MXvbp%@ig|n8aSd{a!N8%8N}{A(%$>K0cs@E;9mhwVB>fFG|d|xOwy0pq?|KP z-3p`~Aawd8o2_qmJMEE6x!k-WlX$?1^g4 aM1Xej8D8@MYU~*rO%)Z~emz99zxUst00t`n