Preparing files for release v1.4.0: Windows binaries and sample output

adda-team · Dec 15, 2020 · 30c5fcc · 30c5fcc
1 parent 70ade17
commit 30c5fcc
Show file tree

Hide file tree

Showing 27 changed files with 278 additions and 270 deletions.
diff --git a/sample/run000_sphere_g16_m1.5/CrossSec-Y b/sample/run000_sphere_g16_m1.5/CrossSec-Y
@@ -1,4 +1,4 @@
-Cext	= 135.0449047
-Qext	= 3.791149611
-Cabs	= -2.047466081e-016
-Qabs	= -5.747903082e-018
+Cext	= 135.0449041
+Qext	= 3.791149596
+Cabs	= -2.047466077e-16
+Qabs	= -5.747903071e-18
diff --git a/sample/run000_sphere_g16_m1.5/log b/sample/run000_sphere_g16_m1.5/log
@@ -1,13 +1,14 @@
-Generated by ADDA v.1.3b4
-The program was run on: YURKIN
+Generated by ADDA v.1.4.0
+The program was run on: YURKIN2
 command: 'd:\Maxim\Current\adda\win64\adda.exe '
 lambda: 6.283185307
-shape: sphere; diameter:6.734551818
+shape: sphere; diameter: 6.734551818
 box dimensions: 16x16x16
 refractive index: 1.5+0i
+Dipole size: 0.418879 (cubical)
 Dipoles/lambda: 15
 	(Volume correction used)
-Required relative residual norm: 1e-005
+Required relative residual norm: 1e-05
 Total number of occupied dipoles: 2176
 Volume-equivalent size parameter: 3.367275909
 
@@ -33,31 +34,31 @@ Total memory usage: 2.2 MB
 
 here we go, calc Y
 
-CoupleConstant:0.005259037197+1.843854148e-005i
+CoupleConstant: 0.005259037197+1.843854148e-05i
 x_0 = 0
-RE_000 = 1.0000000000E+000
-RE_001 = 8.4752662637E-001  +   progress = 0.152473
-RE_002 = 8.2113292044E-001  +   progress = 0.031142
-RE_003 = 4.2639057157E-001  +   progress = 0.480729
-RE_004 = 3.0639031825E-001  +   progress = 0.281433
-RE_005 = 2.2448283848E-001  +   progress = 0.267331
-RE_006 = 2.2740255145E-001  -   progress =-0.013006
-RE_007 = 1.5952149116E-001  +   progress = 0.298506
-RE_008 = 6.1602401378E-002  +   progress = 0.613830
-RE_009 = 3.5443250605E-002  +   progress = 0.424645
-RE_010 = 2.9898244023E-002  +   progress = 0.156447
-RE_011 = 2.4111231313E-002  +   progress = 0.193557
-RE_012 = 3.8307716441E-003  +   progress = 0.841121
-RE_013 = 3.0434605418E-003  +   progress = 0.205523
-RE_014 = 1.3101400536E-003  +   progress = 0.569523
-RE_015 = 8.2588869852E-004  +   progress = 0.369618
-RE_016 = 5.0452778847E-004  +   progress = 0.389109
-RE_017 = 1.1339759030E-004  +   progress = 0.775240
-RE_018 = 9.3640524898E-005  +   progress = 0.174228
-RE_019 = 6.8748464075E-005  +   progress = 0.265826
-RE_020 = 2.2386522007E-005  +   progress = 0.674371
-RE_021 = 1.5171073537E-005  +   progress = 0.322312
-RE_022 = 3.1710857180E-006  +   progress = 0.790978
+RE_000 = 1.0000000000E+00
+RE_001 = 8.4752662637E-01  +   progress = 0.152473
+RE_002 = 8.2113292044E-01  +   progress = 0.031142
+RE_003 = 4.2639057157E-01  +   progress = 0.480729
+RE_004 = 3.0639031825E-01  +   progress = 0.281433
+RE_005 = 2.2448283848E-01  +   progress = 0.267331
+RE_006 = 2.2740255145E-01  -   progress =-0.013006
+RE_007 = 1.5952149116E-01  +   progress = 0.298506
+RE_008 = 6.1602401377E-02  +   progress = 0.613830
+RE_009 = 3.5443250605E-02  +   progress = 0.424645
+RE_010 = 2.9898244023E-02  +   progress = 0.156447
+RE_011 = 2.4111231314E-02  +   progress = 0.193557
+RE_012 = 3.8307716442E-03  +   progress = 0.841121
+RE_013 = 3.0434605422E-03  +   progress = 0.205523
+RE_014 = 1.3101400527E-03  +   progress = 0.569523
+RE_015 = 8.2588869730E-04  +   progress = 0.369618
+RE_016 = 5.0452779332E-04  +   progress = 0.389109
+RE_017 = 1.1339755942E-04  +   progress = 0.775240
+RE_018 = 9.3640483943E-05  +   progress = 0.174228
+RE_019 = 6.8748624567E-05  +   progress = 0.265824
+RE_020 = 2.2386524812E-05  +   progress = 0.674371
+RE_021 = 1.5170388041E-05  +   progress = 0.322343
+RE_022 = 3.1680564851E-06  +   progress = 0.791168
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                 Timing Results             
@@ -66,21 +67,23 @@ Total number of iterations: 22
 Total number of matrix-vector products: 22
 Total planes of E field calculation (each 181 points): 2
 
-Total wall time:     0
+Total wall time:     0.1469
 --Everything below is processor times--
-Total time:          0.1150
-  Initialization time: 0.0350
-    init interaction     0.0000
-    init Dmatrix         0.0070
-    FFT setup:           0.0270
+Total time:          0.1400
+  Initialization time: 0.0990
+    init interaction:    0.0000
+    init Dmatrix:        0.0000
+    FFT setup:           0.0990
     make particle:       0.0000
-  Internal fields:     0.0700
-    one solution:        0.0700
-      incident beam:       0.0100
+  Internal fields:     0.0300
+    one solution:        0.0300
+      matvec products:     0.0300
+      incident beam:       0.0000
       init solver:         0.0000
       one iteration:       0.0000
-  Scattered fields:    0.0100
-    one plane:           0.0100
+        matvec products:     0.0000
+  Scattered fields:    0.0110
+    one plane:           0.0000
   Other sc.quantities: 0.0000
 File I/O:            0.0000
 Integration:         0.0000
diff --git a/sample/run000_sphere_g16_m1.5/mueller b/sample/run000_sphere_g16_m1.5/mueller
diff --git a/sample/stdout b/sample/stdout
@@ -1,42 +1,42 @@
 all data is saved in 'run000_sphere_g16_m1.5'
 box dimensions: 16x16x16
 lambda: 6.283185307   Dipoles/lambda: 15
-Required relative residual norm: 1e-005
+Required relative residual norm: 1e-05
 Total number of occupied dipoles: 2176
 Memory usage for MatVec matrices: 1.3 MB
 Calculating Green's function (Dmatrix)
-Fourier transform of Dmatrix......
+Fourier transform of Dmatrix
 Initializing FFTW3
 Total memory usage: 2.2 MB
 
 here we go, calc Y
 
-CoupleConstant:0.005259037197+1.843854148e-005i
+CoupleConstant: 0.005259037197+1.843854148e-05i
 x_0 = 0
-RE_000 = 1.0000000000E+000
-RE_001 = 8.4752662637E-001  + 
-RE_002 = 8.2113292044E-001  + 
-RE_003 = 4.2639057157E-001  + 
-RE_004 = 3.0639031825E-001  + 
-RE_005 = 2.2448283848E-001  + 
-RE_006 = 2.2740255145E-001  - 
-RE_007 = 1.5952149116E-001  + 
-RE_008 = 6.1602401378E-002  + 
-RE_009 = 3.5443250605E-002  + 
-RE_010 = 2.9898244023E-002  + 
-RE_011 = 2.4111231313E-002  + 
-RE_012 = 3.8307716441E-003  + 
-RE_013 = 3.0434605418E-003  + 
-RE_014 = 1.3101400536E-003  + 
-RE_015 = 8.2588869852E-004  + 
-RE_016 = 5.0452778847E-004  + 
-RE_017 = 1.1339759030E-004  + 
-RE_018 = 9.3640524898E-005  + 
-RE_019 = 6.8748464075E-005  + 
-RE_020 = 2.2386522007E-005  + 
-RE_021 = 1.5171073537E-005  + 
-RE_022 = 3.1710857180E-006  + 
-Cext	= 135.0449047
-Qext	= 3.791149611
-Cabs	= -2.047466081e-016
-Qabs	= -5.747903082e-018
+RE_000 = 1.0000000000E+00
+RE_001 = 8.4752662637E-01  + 
+RE_002 = 8.2113292044E-01  + 
+RE_003 = 4.2639057157E-01  + 
+RE_004 = 3.0639031825E-01  + 
+RE_005 = 2.2448283848E-01  + 
+RE_006 = 2.2740255145E-01  - 
+RE_007 = 1.5952149116E-01  + 
+RE_008 = 6.1602401377E-02  + 
+RE_009 = 3.5443250605E-02  + 
+RE_010 = 2.9898244023E-02  + 
+RE_011 = 2.4111231314E-02  + 
+RE_012 = 3.8307716442E-03  + 
+RE_013 = 3.0434605422E-03  + 
+RE_014 = 1.3101400527E-03  + 
+RE_015 = 8.2588869730E-04  + 
+RE_016 = 5.0452779332E-04  + 
+RE_017 = 1.1339755942E-04  + 
+RE_018 = 9.3640483943E-05  + 
+RE_019 = 6.8748624567E-05  + 
+RE_020 = 2.2386524812E-05  + 
+RE_021 = 1.5170388041E-05  + 
+RE_022 = 3.1680564851E-06  + 
+Cext	= 135.0449041
+Qext	= 3.791149596
+Cabs	= -2.047466077e-16
+Qabs	= -5.747903071e-18
diff --git a/win64/README b/win64/README
diff --git a/win64/README.md b/win64/README.md
@@ -0,0 +1,21 @@
+This folder contains ADDA executables for 64-bit Windows and all required DLLs. Hence, these executables are ready to run, except for:
+* MPI executables (including `misc/neafield/nearfield.exe`) require Microsoft MPI [to be installed](https://github.com/adda-team/adda/wiki/InstallingMPI#windows
+* OpenCL executables require GPU with [OpenCL support](https://github.com/adda-team/adda/wiki/OpenCL#windows).
+* All auxilliary files, like the [manual](https://github.com/adda-team/adda/blob/master/doc/manual.pdf) or [sample input files](https://github.com/adda-team/adda/tree/master/input), are supplied with the main (source) ADDA package. It should be [obtained separately](https://github.com/adda-team/adda/releases). Note that those text files will most probably contain Unix-style line endings. This is OK for ADDA but may cause inconveniences if you try to edit them in Windows Notepad. Use [more universal editor](https://notepad-plus-plus.org/) instead.
+
+All executables are console applications, which should be run from a terminal (not by clicking the mouse). On Windows either use built-in `cmd.exe` or install one of Linux-type shells (like MSYS Bash or Git Bash) or FAR File Manager. You can also run ADDA through a system call from any programming/scripting language.
+
+We also provide executables for `misc/` packages. They are located in separate folders for convenience, but require DLLs inside `misc` folder. For instructions on using this executables see the corresponding `misc/...` folders in the main ADDA package. 
+
+In general, one either need to add path to required DLLs to the PATH environmental variable or to keep executables and DLLs in the same folder.
+
+### Directory structure
+
+* `misc/` - executables for miscellaneous packages and three DLLs (provided by gfortran 8.1 in a MinGW64 suite). 
+* `adda.exe` - executable of sequential version of ADDA
+* `adda_mpi.exe` - executable of MPI version of ADDA
+* `adda_ocl.exe` - executable of OpenCL version of ADDA
+* `adda_spa.exe` - executable of sequential sparse version of ADDA
+* `adda_spa_mpi.exe` - executable of MPI sparse version of ADDA
+* `clFFT.dll` - DLL for clFFT 2.12.2
+* `libfftw3-3.dll` - DLL for FFTW 3.3.5
diff --git a/win64/adda.exe b/win64/adda.exe
diff --git a/win64/adda_mpi.exe b/win64/adda_mpi.exe
diff --git a/win64/adda_ocl.exe b/win64/adda_ocl.exe
diff --git a/win64/adda_spa.exe b/win64/adda_spa.exe
diff --git a/win64/adda_spa_mpi.exe b/win64/adda_spa_mpi.exe
diff --git a/win64/clAmdFft.Runtime.dll b/win64/clAmdFft.Runtime.dll
diff --git a/win64/clFFT.dll b/win64/clFFT.dll
diff --git a/win64/libfftw3-3.dll b/win64/libfftw3-3.dll
diff --git a/win64/libgcc_s_sjlj_64-1.dll b/win64/libgcc_s_sjlj_64-1.dll
diff --git a/win64/libgfortran_64-3.dll b/win64/libgfortran_64-3.dll
diff --git a/win64/libquadmath_64-0.dll b/win64/libquadmath_64-0.dll
diff --git a/win64/misc/hyperfun/calc_pip_arg.exe b/win64/misc/hyperfun/calc_pip_arg.exe
diff --git a/win64/misc/libgcc_s_seh-1.dll b/win64/misc/libgcc_s_seh-1.dll
diff --git a/win64/misc/libquadmath-0.dll b/win64/misc/libquadmath-0.dll
diff --git a/win64/misc/libwinpthread-1.dll b/win64/misc/libwinpthread-1.dll
diff --git a/win64/misc/near_field/checknfsymm.exe b/win64/misc/near_field/checknfsymm.exe
diff --git a/win64/misc/near_field/gendip.exe b/win64/misc/near_field/gendip.exe
diff --git a/win64/misc/near_field/genline.exe b/win64/misc/near_field/genline.exe
diff --git a/win64/misc/near_field/genplane.exe b/win64/misc/near_field/genplane.exe
diff --git a/win64/misc/near_field/nearfield.exe b/win64/misc/near_field/nearfield.exe
diff --git a/win64/misc/pip/pip.exe b/win64/misc/pip/pip.exe