Merge lp:~garsua/siesta/trunk-elsi-dm into lp:siesta
- trunk-elsi-dm
- Merge into trunk
Status: | Superseded |
---|---|
Proposed branch: | lp:~garsua/siesta/trunk-elsi-dm |
Merge into: | lp:siesta |
Diff against target: |
4436 lines (+3744/-70) (has conflicts) 32 files modified
Docs/siesta.tex (+119/-2) Src/MPI/mpi_siesta.F90 (+18/-1) Src/Makefile (+26/-18) Src/compute_dm.F (+25/-1) Src/dhscf.F (+10/-0) Src/fold_auxcell.f90 (+85/-0) Src/fsiesta_mpi.F90 (+4/-0) Src/initparallel.F (+1/-1) Src/m_elsi_interface.F90 (+1601/-0) Src/m_ncdf_siesta.F90 (+3/-0) Src/m_pexsi_dos.F90 (+1/-1) Src/m_pexsi_driver.F90 (+1/-1) Src/m_pexsi_local_dos.F90 (+1/-1) Src/m_redist_spmatrix.F90 (+187/-21) Src/parallel.F (+1/-1) Src/post_scf_work.F (+33/-2) Src/read_options.F90 (+11/-0) Src/siesta.F (+9/-9) Src/siesta_forces.F90 (+30/-5) Src/siesta_init.F (+23/-5) Src/siesta_options.F90 (+1/-0) Src/siesta_tddft.F90 (+1/-1) Src/state_init.F (+4/-0) Src/write_subs.F (+1/-0) Tests/si-quantum-dot/coords.Si987H372.fdf (+1368/-0) Tests/si-quantum-dot/makefile (+7/-0) Tests/si-quantum-dot/si-quantum-dot.fdf (+39/-0) Tests/si-quantum-dot/si-quantum-dot.pseudos (+1/-0) Tests/sih-elsi/makefile (+6/-0) Tests/sih-elsi/sih-elsi.fdf (+121/-0) Tests/sih-elsi/sih-elsi.pseudos (+1/-0) version.info (+5/-0) Text conflict in Src/siesta_forces.F90 Text conflict in version.info |
To merge this branch: | bzr merge lp:~garsua/siesta/trunk-elsi-dm |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alberto Garcia | Needs Resubmitting | ||
Review via email: mp+361820@code.launchpad.net |
Commit message
Cosmetic changes on m_elsi_
- Removed "use fdf, only: fdf_get" from elsi_real_solver and elsi_complex_solver subroutines
- Unindented lines from 401 to 510 (in elsi_real_solver) and from 1351 to 1460 (in elsi_complex_
Description of the change
Victor GS (garsua) wrote : | # |
Gracias Alberto, se me pasó incluirlo. Vuelvo a hacer el merge request, a
ver si ahora sale bien.
On Wed, Jan 16, 2019 at 3:34 PM Alberto Garcia <email address hidden> wrote:
> Review: Resubmit
>
> Victor: As a test of the MR process it is fine, but you should specify the
> target branch as
> ~albertog/
>
> --
> https:/
> You are the owner of lp:~garsua/siesta/trunk-elsi-dm.
>
Unmerged revisions
- 696. By Victor GS
-
Cosmetic changes on m_elsi_
interface. F90
- Removed "use fdf, only: fdf_get" from elsi_real_solver and elsi_complex_solver subroutines
- Unindented lines from 401 to 510 (in elsi_real_solver) and from 1351 to 1460 (in elsi_complex_solver) - 695. By Alberto Garcia
-
Do not get the EDM during the SCF cycle + NTPoly support
* In compute_dm, the call to the ELSI ('get_dm') interface uses a
flag to disable the generation of the EDM matrix. In this case
only the DM is computed.After the scf loop, in 'post_scf_work', a further call to the ELSI
interface requests (only) the EDM.Note that this is achieved through a logical flag 'Get_EDM_Only',
which is not really appropriate. It would be better to have a
more explicit flag, such as:output_ mode="DM| EDM" The ELSI shutdown has been moved towards the end of 'siesta_forces',
and the 'Siesta_Worker' logic preserved in that routine (even though
it is not working elsewhere).* NTpoly support has been added to the interface
(Thanks to Victor M. Garcia-Suarez and Victor Yu)
- 694. By Alberto Garcia
-
Wrap MPI check on number of procs for ELSI solver
- 693. By Alberto Garcia
-
Add Si quantum dot test case for ELSI
- 692. By Alberto Garcia
-
Fix bug in computation of Delta-V for PEXSI mu bracketing
A new array is needed to properly update the value of the
change in potential.(+ added a declaration for 'date_stamp' in the auxiliary
code for version compatibility) - 691. By Alberto Garcia
-
Change the spin-reduction convention for entropy
For ELSI versions after 2018-08-17, there is no need to reduce over spins
when computing the entropy.To use older versions (such as the 2.0.2 release), use the preprocessor symbol
SIESTA_
_ELSI__ OLD_SPIN_ CONVENTION If the version is 'old', but the above symbol is not used, a compilation error will
be triggered. (This works by means of a call to 'elsi_get_datestamp' , which was added just
around the same time as the spin-reduction-convention change: Aug 17 vs Aug 21, 2018.
ELSI versions in between will not work without further intervention. - 690. By Alberto Garcia
-
Update documentation. Check that Nodes is a multiple of nk*nspin
- 689. By Alberto Garcia
-
Fix weight of DM and EDM. Working
- 688. By Alberto Garcia
-
Do not make shadow copies of elsi_global_comm
- 687. By Alberto Garcia
-
Change some ptrs to allocs. Fix communicators
Preview Diff
1 | === modified file 'Docs/siesta.tex' | |||
2 | --- Docs/siesta.tex 2019-01-04 07:01:47 +0000 | |||
3 | +++ Docs/siesta.tex 2019-01-16 11:00:58 +0000 | |||
4 | @@ -952,6 +952,33 @@ | |||
5 | 952 | LIBS += -Wl,--allow-multiple-definition -lpexsi_linux <> | 952 | LIBS += -Wl,--allow-multiple-definition -lpexsi_linux <> |
6 | 953 | \end{shellexample} | 953 | \end{shellexample} |
7 | 954 | 954 | ||
8 | 955 | \item[\href{http://elsi-interchange.org}{ELSI}]% | ||
9 | 956 | \index{ELSI}% | ||
10 | 957 | \index{External library!ELSI}% | ||
11 | 958 | The ELSI library may be used with \siesta\ for access to a range of | ||
12 | 959 | solvers, see Sec.~\ref{SolverELSI}. Currently the interface is | ||
13 | 960 | implemented (tested) as of ELSI version 2.0.2. If | ||
14 | 961 | newer versions retain the same interface they may also be used. | ||
15 | 962 | |||
16 | 963 | Add these flags to your \file{arch.make} file to enable ELSI | ||
17 | 964 | \begin{shellexample} | ||
18 | 965 | INCFLAGS += -I/opt/elsi/include | ||
19 | 966 | LIBS += -L/opt/elsi/lib <> | ||
20 | 967 | FPPFLAGS += -DSIESTA__ELSI | ||
21 | 968 | \end{shellexample} | ||
22 | 969 | \index{compile!pre-processor!-DSIESTA\_\_ELSI} | ||
23 | 970 | where \shell{<>} represents the appropriate ELSI libraries (see the | ||
24 | 971 | ELSI installation instructions). | ||
25 | 972 | % | ||
26 | 973 | If one experiences linker failures, one possible solution that may | ||
27 | 974 | help is | ||
28 | 975 | \begin{shellexample} | ||
29 | 976 | LIBS += -lmpi_cxx -lstdc++ | ||
30 | 977 | \end{shellexample} | ||
31 | 978 | which is due to ELSI containing some parts written in C++, while the | ||
32 | 979 | linking is done by the Fortran compiler. The exact library name for | ||
33 | 980 | your MPI vendor may vary. | ||
34 | 981 | |||
35 | 955 | 982 | ||
36 | 956 | \item[CheSS]% | 983 | \item[CheSS]% |
37 | 957 | \index{CheSS}% | 984 | \index{CheSS}% |
38 | @@ -6021,6 +6048,11 @@ | |||
39 | 6021 | of the density matrix via an efficient scheme of selected | 6048 | of the density matrix via an efficient scheme of selected |
40 | 6022 | inversion (see Sec~\ref{SolverPEXSI}). | 6049 | inversion (see Sec~\ref{SolverPEXSI}). |
41 | 6023 | 6050 | ||
42 | 6051 | Additionally, \siesta\ can use the ELSI library (see | ||
43 | 6052 | Sec.~\ref{SolverELSI}) of solvers (which provides versions of OMM | ||
44 | 6053 | and PEXSI, in addition to diagonalization), and the new linear-scaling | ||
45 | 6054 | CheSS library (see Sec.~\ref{SolverCheSS}) | ||
46 | 6055 | |||
47 | 6024 | The calculation of the H and S matrix elements is always done with an | 6056 | The calculation of the H and S matrix elements is always done with an |
48 | 6025 | O(N) method. The actual scaling is not linear for small systems, but | 6057 | O(N) method. The actual scaling is not linear for small systems, but |
49 | 6026 | it becomes O(N) when the system dimensions are larger than the scale | 6058 | it becomes O(N) when the system dimensions are larger than the scale |
50 | @@ -6044,8 +6076,8 @@ | |||
51 | 6044 | Character string to choose among diagonalization (\fdf*{diagon}), | 6076 | Character string to choose among diagonalization (\fdf*{diagon}), |
52 | 6045 | cubic-scaling minimization (\fdf*{OMM}), Order-N (\fdf*{OrderN}) | 6077 | cubic-scaling minimization (\fdf*{OMM}), Order-N (\fdf*{OrderN}) |
53 | 6046 | solution of the Kohn-Sham Hamiltonian, \fdf*{transiesta}, the | 6078 | solution of the Kohn-Sham Hamiltonian, \fdf*{transiesta}, the |
56 | 6047 | PEXSI method (\fdf*{PEXSI}) or the \fdf*{CheSS} solver. | 6079 | PEXSI method (\fdf*{PEXSI}), ELSI solver (\fdf*{ELSI}) or the \fdf*{CheSS} solver. |
57 | 6048 | 6080 | ||
58 | 6049 | \end{fdfentry} | 6081 | \end{fdfentry} |
59 | 6050 | 6082 | ||
60 | 6051 | 6083 | ||
61 | @@ -6867,6 +6899,91 @@ | |||
62 | 6867 | 6899 | ||
63 | 6868 | \end{fdflogicalF} | 6900 | \end{fdflogicalF} |
64 | 6869 | 6901 | ||
65 | 6902 | \subsection{The ELSI solver family} | ||
66 | 6903 | \label{SolverELSI} | ||
67 | 6904 | \index{ELSI solvers} | ||
68 | 6905 | |||
69 | 6906 | The ELSI library provides a unified interface to a range of solvers, | ||
70 | 6907 | including ELPA (diagonalization), PEXSI, OMM, and SIPS (based on spectrum | ||
71 | 6908 | slicing). It can be downloaded and installed freely from | ||
72 | 6909 | \url{http://elsi-interchange.org}. | ||
73 | 6910 | |||
74 | 6911 | The current interface in \siesta\ is based on the ``DM'' mode in ELSI: | ||
75 | 6912 | sparse H and S matrices are passed to the library, and sparse DM and | ||
76 | 6913 | EDM matrices are returned. Internally, the library performs any extra | ||
77 | 6914 | operations needed. K-points and/or spin-polarization (in collinear | ||
78 | 6915 | form) are also supported, in fully parallel mode. This means that | ||
79 | 6916 | k-points/spin-polarized calculations will be carried out splitting the | ||
80 | 6917 | communicator for orbital distribution into nk$\times$nspin copies, | ||
81 | 6918 | where nk is the number of k-points and nspin the number of spin | ||
82 | 6919 | components. The total number of MPI processors must be a multiple of | ||
83 | 6920 | nk$\times$nspin. | ||
84 | 6921 | |||
85 | 6922 | See Sec.~\ref{sec:libs} for details on installing \siesta\ with ELSI support. | ||
86 | 6923 | |||
87 | 6924 | \subsubsection{Input parameters} | ||
88 | 6925 | |||
89 | 6926 | The most important parameter is the solver to be used. Most other | ||
90 | 6927 | options are given default values by the program which are nearly | ||
91 | 6928 | always appropriate. | ||
92 | 6929 | |||
93 | 6930 | \begin{fdfentry}{ELSI!Solver}[string]<ELPA> | ||
94 | 6931 | A specification of the solver wanted. Possible values are | ||
95 | 6932 | \begin{itemize} | ||
96 | 6933 | \item ELPA | ||
97 | 6934 | \item OMM | ||
98 | 6935 | \item PEXSI | ||
99 | 6936 | \item SIPS | ||
100 | 6937 | \end{itemize} | ||
101 | 6938 | \end{fdfentry} | ||
102 | 6939 | |||
103 | 6940 | \begin{fdfentry}{ELSI!Broadening!Method}[string]<''fermi''> | ||
104 | 6941 | The scheme for level broadening. Valid options are ``fermi'', | ||
105 | 6942 | ``gauss'', ``mp'' (Methfessel-Paxton), ``cold'' | ||
106 | 6943 | (Marzari-Vanderbilt cold smearing). | ||
107 | 6944 | \end{fdfentry} | ||
108 | 6945 | |||
109 | 6946 | \begin{fdfentry}{ELSI!Output!Level}[integer]<0> | ||
110 | 6947 | The level of detail provided in the output. Possible values are 0, 1, | ||
111 | 6948 | 2, and 3. | ||
112 | 6949 | \end{fdfentry} | ||
113 | 6950 | |||
114 | 6951 | \begin{fdfentry}{ELSI!Output!Json}[integer]<1> | ||
115 | 6952 | If not 0, a separate log file in JSON format will be written out. | ||
116 | 6953 | \end{fdfentry} | ||
117 | 6954 | |||
118 | 6955 | Other fdf options are mapped in a direct way to the options described in the | ||
119 | 6956 | ELSI manual: | ||
120 | 6957 | |||
121 | 6958 | \begin{fdfentry}{ELSI!Broadening!MPOrder}[integer]<1> | ||
122 | 6959 | \end{fdfentry} | ||
123 | 6960 | |||
124 | 6961 | \begin{fdfentry}{ELSI!ELPA!Flavor}[integer]<2> | ||
125 | 6962 | \end{fdfentry} | ||
126 | 6963 | |||
127 | 6964 | \begin{fdfentry}{ELSI!OMM!Flavor}[integer]<0> | ||
128 | 6965 | \end{fdfentry} | ||
129 | 6966 | |||
130 | 6967 | \begin{fdfentry}{ELSI!OMM!ELPA!Steps}[integer]<3> | ||
131 | 6968 | \end{fdfentry} | ||
132 | 6969 | |||
133 | 6970 | \begin{fdfentry}{ELSI!OMM!Tolerance}[real]<10e-9> | ||
134 | 6971 | \end{fdfentry} | ||
135 | 6972 | |||
136 | 6973 | \begin{fdfentry}{ELSI!PEXSI!TasksPerPole}[integer]< {\bf no default}> | ||
137 | 6974 | See the discussion on the three-level PEXSI parallelism in the ELSI manual. | ||
138 | 6975 | \end{fdfentry} | ||
139 | 6976 | |||
140 | 6977 | \begin{fdfentry}{ELSI!PEXSI!TasksSymbolic}[integer]<1> | ||
141 | 6978 | \end{fdfentry} | ||
142 | 6979 | |||
143 | 6980 | \begin{fdfentry}{ELSI!SIPS!Slices}[integer]<{\bf no default}> | ||
144 | 6981 | See the discussion in the ELSI manual. | ||
145 | 6982 | \end{fdfentry} | ||
146 | 6983 | |||
147 | 6984 | \begin{fdfentry}{ELSI!SIPS!ELPA!Steps}[integer]<2> | ||
148 | 6985 | \end{fdfentry} | ||
149 | 6986 | |||
150 | 6870 | 6987 | ||
151 | 6871 | \subsection{The CheSS solver} | 6988 | \subsection{The CheSS solver} |
152 | 6872 | \label{SolverCheSS} | 6989 | \label{SolverCheSS} |
153 | 6873 | 6990 | ||
154 | === modified file 'Src/MPI/mpi_siesta.F90' | |||
155 | --- Src/MPI/mpi_siesta.F90 2016-09-16 12:25:04 +0000 | |||
156 | +++ Src/MPI/mpi_siesta.F90 2019-01-16 11:00:58 +0000 | |||
157 | @@ -37,12 +37,29 @@ | |||
158 | 37 | USE MPI__INCLUDE, true_MPI_Comm_World => MPI_Comm_World | 37 | USE MPI__INCLUDE, true_MPI_Comm_World => MPI_Comm_World |
159 | 38 | #endif /* NO_MPI_INTERFACES */ | 38 | #endif /* NO_MPI_INTERFACES */ |
160 | 39 | 39 | ||
161 | 40 | ! The reason to define true_MPI_Comm_World as a pointer to the | ||
162 | 41 | ! (inmutable) MPI_Comm_World parameter in the MPI module is to keep | ||
163 | 42 | ! it as reference. The MPI_Comm_World *variable* defined below can | ||
164 | 43 | ! be redefined at will. This practice is needed because most Siesta | ||
165 | 44 | ! routines have hard-wired references to MPI_Comm_World as their | ||
166 | 45 | ! communicator. Instead of generalizing the interfaces and pass the | ||
167 | 46 | ! communicator as an argument (work in progress), we use the kludge | ||
168 | 47 | ! of re-defining MPI_Comm_World. | ||
169 | 48 | |||
170 | 40 | ! The following construction allows to supplant MPI_Comm_World within SIESTA, | 49 | ! The following construction allows to supplant MPI_Comm_World within SIESTA, |
171 | 41 | ! and to use it as a subroutine with its own internal MPI communicator. | 50 | ! and to use it as a subroutine with its own internal MPI communicator. |
172 | 42 | 51 | ||
173 | 52 | ! Siesta-instances should refer to MPI_Comm_DFT | ||
174 | 53 | ! This is the case, for example, when a driver program splits the | ||
175 | 54 | ! global communicator to dispatch several simultaneous Siesta instances | ||
176 | 55 | ! Typically, comm_world = comm_dft, but not for calculations (PEXSI, ELSI) | ||
177 | 56 | ! for which only a subset of processors carry out the core Siesta operations | ||
178 | 57 | ! that have hard-wired references to mpi_comm_world | ||
179 | 58 | |||
180 | 43 | integer, public :: MPI_Comm_World = true_MPI_Comm_World | 59 | integer, public :: MPI_Comm_World = true_MPI_Comm_World |
181 | 60 | integer, public :: MPI_Comm_DFT = true_MPI_Comm_World | ||
182 | 44 | 61 | ||
184 | 45 | public :: true_MPI_Comm_World | 62 | public :: true_MPI_Comm_World |
185 | 46 | 63 | ||
186 | 47 | 64 | ||
187 | 48 | #ifdef GRID_SP | 65 | #ifdef GRID_SP |
188 | 49 | 66 | ||
189 | === modified file 'Src/Makefile' | |||
190 | --- Src/Makefile 2018-12-06 09:30:22 +0000 | |||
191 | +++ Src/Makefile 2019-01-16 11:00:58 +0000 | |||
192 | @@ -156,6 +156,8 @@ | |||
193 | 156 | write_orb_indx.o \ | 156 | write_orb_indx.o \ |
194 | 157 | die.o m_pexsi.o m_pexsi_driver.o m_pexsi_dos.o m_pexsi_local_dos.o\ | 157 | die.o m_pexsi.o m_pexsi_driver.o m_pexsi_dos.o m_pexsi_local_dos.o\ |
195 | 158 | m_chess.o \ | 158 | m_chess.o \ |
196 | 159 | m_elsi_interface.o \ | ||
197 | 160 | fold_auxcell.o \ | ||
198 | 159 | m_redist_spmatrix.o \ | 161 | m_redist_spmatrix.o \ |
199 | 160 | class_Distribution.o\ | 162 | class_Distribution.o\ |
200 | 161 | m_dminim.o m_zminim.o \ | 163 | m_dminim.o m_zminim.o \ |
201 | @@ -293,7 +295,7 @@ | |||
202 | 293 | "FFLAGS=$(FFLAGS:$(IPO_FLAG)=)" module ) | 295 | "FFLAGS=$(FFLAGS:$(IPO_FLAG)=)" module ) |
203 | 294 | 296 | ||
204 | 295 | #-------------------------------------------------------------- | 297 | #-------------------------------------------------------------- |
206 | 296 | MS=MatrixSwitch.a | 298 | MS?=MatrixSwitch.a |
207 | 297 | $(MS): $(MPI_INTERFACE) | 299 | $(MS): $(MPI_INTERFACE) |
208 | 298 | (cd MatrixSwitch/src ; \ | 300 | (cd MatrixSwitch/src ; \ |
209 | 299 | $(MAKE) -j 1 \ | 301 | $(MAKE) -j 1 \ |
210 | @@ -641,11 +643,11 @@ | |||
211 | 641 | class_TriMat.o: alloc.o intrinsic_missing.o | 643 | class_TriMat.o: alloc.o intrinsic_missing.o |
212 | 642 | coceri.o: files.o periodic_table.o precision.o units.o | 644 | coceri.o: files.o periodic_table.o precision.o units.o |
213 | 643 | compute_dm.o: atomlist.o class_SpData1D.o compute_ebs_shift.o diagon.o | 645 | compute_dm.o: atomlist.o class_SpData1D.o compute_ebs_shift.o diagon.o |
219 | 644 | compute_dm.o: iodmhs_netcdf.o kpoint_scf.o m_chess.o m_dminim.o m_energies.o | 646 | compute_dm.o: iodmhs_netcdf.o kpoint_scf.o m_chess.o m_dminim.o |
220 | 645 | compute_dm.o: m_eo.o m_hsx.o m_pexsi_driver.o m_rmaxh.o m_spin.o m_steps.o | 647 | compute_dm.o: m_elsi_interface.o m_energies.o m_eo.o m_hsx.o m_pexsi_driver.o |
221 | 646 | compute_dm.o: m_transiesta.o m_ts_global_vars.o m_zminim.o normalize_dm.o | 648 | compute_dm.o: m_rmaxh.o m_spin.o m_steps.o m_transiesta.o m_ts_global_vars.o |
222 | 647 | compute_dm.o: ordern.o parallel.o precision.o siesta_geom.o siesta_options.o | 649 | compute_dm.o: m_zminim.o normalize_dm.o ordern.o parallel.o precision.o |
223 | 648 | compute_dm.o: sparse_matrices.o sys.o units.o | 650 | compute_dm.o: siesta_geom.o siesta_options.o sparse_matrices.o sys.o units.o |
224 | 649 | compute_ebs_shift.o: m_mpi_utils.o parallel.o precision.o | 651 | compute_ebs_shift.o: m_mpi_utils.o parallel.o precision.o |
225 | 650 | compute_energies.o: atomlist.o class_SpData1D.o class_SpData2D.o | 652 | compute_energies.o: atomlist.o class_SpData1D.o class_SpData2D.o |
226 | 651 | compute_energies.o: class_SpData2D.o dhscf.o files.o m_dipol.o m_energies.o | 653 | compute_energies.o: class_SpData2D.o dhscf.o files.o m_dipol.o m_energies.o |
227 | @@ -683,11 +685,12 @@ | |||
228 | 683 | dfscf.o: meshphi.o parallel.o parallelsubs.o precision.o sys.o | 685 | dfscf.o: meshphi.o parallel.o parallelsubs.o precision.o sys.o |
229 | 684 | dhscf.o: alloc.o atmfuncs.o bsc_xcmod.o cellxc_mod.o delk.o dfscf.o | 686 | dhscf.o: alloc.o atmfuncs.o bsc_xcmod.o cellxc_mod.o delk.o dfscf.o |
230 | 685 | dhscf.o: doping_uniform.o files.o forhar.o iogrid_netcdf.o m_charge_add.o | 687 | dhscf.o: doping_uniform.o files.o forhar.o iogrid_netcdf.o m_charge_add.o |
236 | 686 | dhscf.o: m_efield.o m_hartree_add.o m_iorho.o m_iotddft.o m_mesh_node.o | 688 | dhscf.o: m_efield.o m_elsi_interface.o m_hartree_add.o m_iorho.o m_iotddft.o |
237 | 687 | dhscf.o: m_ncdf_io.o m_ncdf_siesta.o m_partial_charges.o m_rhog.o m_spin.o | 689 | dhscf.o: m_mesh_node.o m_ncdf_io.o m_ncdf_siesta.o m_partial_charges.o m_rhog.o |
238 | 688 | dhscf.o: m_ts_global_vars.o m_ts_hartree.o m_ts_options.o m_ts_voltage.o mesh.o | 690 | dhscf.o: m_spin.o m_ts_global_vars.o m_ts_hartree.o m_ts_options.o |
239 | 689 | dhscf.o: meshdscf.o meshsubs.o moremeshsubs.o parallel.o parsing.o precision.o | 691 | dhscf.o: m_ts_voltage.o mesh.o meshdscf.o meshsubs.o moremeshsubs.o parallel.o |
240 | 690 | dhscf.o: rhofft.o rhoofd.o siesta_options.o sys.o units.o vmat.o | 692 | dhscf.o: parsing.o precision.o rhofft.o rhoofd.o siesta_options.o sys.o units.o |
241 | 693 | dhscf.o: vmat.o | ||
242 | 691 | diag.o: alloc.o diag_option.o parallel.o precision.o sys.o | 694 | diag.o: alloc.o diag_option.o parallel.o precision.o sys.o |
243 | 692 | diag2g.o: fermid.o intrinsic_missing.o parallel.o parallelsubs.o precision.o | 695 | diag2g.o: fermid.o intrinsic_missing.o parallel.o parallelsubs.o precision.o |
244 | 693 | diag2g.o: sys.o | 696 | diag2g.o: sys.o |
245 | @@ -838,6 +841,8 @@ | |||
246 | 838 | m_dscfcomm.o: alloc.o parallel.o parallelsubs.o precision.o schecomm.o | 841 | m_dscfcomm.o: alloc.o parallel.o parallelsubs.o precision.o schecomm.o |
247 | 839 | m_efield.o: atmfuncs.o m_cite.o m_ts_global_vars.o mesh.o parallel.o | 842 | m_efield.o: atmfuncs.o m_cite.o m_ts_global_vars.o mesh.o parallel.o |
248 | 840 | m_efield.o: precision.o siesta_cml.o siesta_geom.o sys.o units.o | 843 | m_efield.o: precision.o siesta_cml.o siesta_geom.o sys.o units.o |
249 | 844 | m_elsi_interface.o: alloc.o class_Distribution.o fold_auxcell.o m_mpi_utils.o | ||
250 | 845 | m_elsi_interface.o: m_redist_spmatrix.o parallel.o precision.o units.o | ||
251 | 841 | m_energies.o: precision.o | 846 | m_energies.o: precision.o |
252 | 842 | m_eo.o: precision.o | 847 | m_eo.o: precision.o |
253 | 843 | m_evolve.o: atomlist.o cranknic_evolg.o cranknic_evolk.o m_spin.o precision.o | 848 | m_evolve.o: atomlist.o cranknic_evolg.o cranknic_evolk.o m_spin.o precision.o |
254 | @@ -1194,8 +1199,9 @@ | |||
255 | 1194 | post_scf_work.o: atomlist.o class_Fstack_Pair_Geometry_SpData2D.o | 1199 | post_scf_work.o: atomlist.o class_Fstack_Pair_Geometry_SpData2D.o |
256 | 1195 | post_scf_work.o: class_Geometry.o class_Pair_Geometry_SpData2D.o compute_dm.o | 1200 | post_scf_work.o: class_Geometry.o class_Pair_Geometry_SpData2D.o compute_dm.o |
257 | 1196 | post_scf_work.o: diagon.o final_H_f_stress.o kpoint_scf.o m_dminim.o | 1201 | post_scf_work.o: diagon.o final_H_f_stress.o kpoint_scf.o m_dminim.o |
260 | 1197 | post_scf_work.o: m_energies.o m_eo.o m_spin.o m_steps.o m_zminim.o mneighb.o | 1202 | post_scf_work.o: m_elsi_interface.o m_energies.o m_eo.o m_spin.o m_steps.o |
261 | 1198 | post_scf_work.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o | 1203 | post_scf_work.o: m_zminim.o mneighb.o parallel.o siesta_geom.o siesta_options.o |
262 | 1204 | post_scf_work.o: sparse_matrices.o | ||
263 | 1199 | print_spin.o: atomlist.o m_mpi_utils.o m_spin.o parallel.o precision.o | 1205 | print_spin.o: atomlist.o m_mpi_utils.o m_spin.o parallel.o precision.o |
264 | 1200 | print_spin.o: siesta_cml.o sparse_matrices.o | 1206 | print_spin.o: siesta_cml.o sparse_matrices.o |
265 | 1201 | printmatrix.o: alloc.o | 1207 | printmatrix.o: alloc.o |
266 | @@ -1288,11 +1294,12 @@ | |||
267 | 1288 | siesta_forces.o: atomlist.o class_Fstack_Data1D.o class_SpData2D.o compute_dm.o | 1294 | siesta_forces.o: atomlist.o class_Fstack_Data1D.o class_SpData2D.o compute_dm.o |
268 | 1289 | siesta_forces.o: compute_energies.o compute_max_diff.o densematrix.o | 1295 | siesta_forces.o: compute_energies.o compute_max_diff.o densematrix.o |
269 | 1290 | siesta_forces.o: dm_charge.o files.o final_H_f_stress.o flook_siesta.o | 1296 | siesta_forces.o: dm_charge.o files.o final_H_f_stress.o flook_siesta.o |
275 | 1291 | siesta_forces.o: kpoint_scf.o m_check_walltime.o m_convergence.o m_energies.o | 1297 | siesta_forces.o: kpoint_scf.o m_check_walltime.o m_convergence.o |
276 | 1292 | siesta_forces.o: m_forces.o m_initwf.o m_iodm_old.o m_mixing.o m_mixing_scf.o | 1298 | siesta_forces.o: m_elsi_interface.o m_energies.o m_forces.o m_initwf.o |
277 | 1293 | siesta_forces.o: m_mpi_utils.o m_ncdf_siesta.o m_pexsi.o m_pexsi_driver.o | 1299 | siesta_forces.o: m_iodm_old.o m_mixing.o m_mixing_scf.o m_mpi_utils.o |
278 | 1294 | siesta_forces.o: m_rhog.o m_spin.o m_steps.o m_stress.o m_transiesta.o | 1300 | siesta_forces.o: m_ncdf_siesta.o m_pexsi.o m_pexsi_driver.o m_rhog.o m_spin.o |
279 | 1295 | siesta_forces.o: m_ts_charge.o m_ts_electype.o m_ts_global_vars.o m_ts_method.o | 1301 | siesta_forces.o: m_steps.o m_stress.o m_transiesta.o m_ts_charge.o |
280 | 1302 | siesta_forces.o: m_ts_electype.o m_ts_global_vars.o m_ts_method.o | ||
281 | 1296 | siesta_forces.o: m_ts_options.o mixer.o parallel.o post_scf_work.o precision.o | 1303 | siesta_forces.o: m_ts_options.o mixer.o parallel.o post_scf_work.o precision.o |
282 | 1297 | siesta_forces.o: save_density_matrix.o scfconvergence_test.o setup_H0.o | 1304 | siesta_forces.o: save_density_matrix.o scfconvergence_test.o setup_H0.o |
283 | 1298 | siesta_forces.o: setup_hamiltonian.o siesta_cml.o siesta_dicts.o siesta_geom.o | 1305 | siesta_forces.o: setup_hamiltonian.o siesta_cml.o siesta_dicts.o siesta_geom.o |
284 | @@ -1493,6 +1500,7 @@ | |||
285 | 1493 | m_final_h_f_stress.o: final_H_f_stress.o | 1500 | m_final_h_f_stress.o: final_H_f_stress.o |
286 | 1494 | m_find_kgrid.o: find_kgrid.o | 1501 | m_find_kgrid.o: find_kgrid.o |
287 | 1495 | m_fire_optim.o: fire_optim.o | 1502 | m_fire_optim.o: fire_optim.o |
288 | 1503 | m_fold_auxcell.o: fold_auxcell.o | ||
289 | 1496 | m_forhar.o: forhar.o | 1504 | m_forhar.o: forhar.o |
290 | 1497 | m_get_kpoints_scale.o: get_kpoints_scale.o | 1505 | m_get_kpoints_scale.o: get_kpoints_scale.o |
291 | 1498 | m_gradient.o: gradient.o | 1506 | m_gradient.o: gradient.o |
292 | 1499 | 1507 | ||
293 | === modified file 'Src/compute_dm.F' | |||
294 | --- Src/compute_dm.F 2018-11-09 09:36:46 +0000 | |||
295 | +++ Src/compute_dm.F 2019-01-16 11:00:58 +0000 | |||
296 | @@ -36,6 +36,9 @@ | |||
297 | 36 | #ifdef SIESTA__PEXSI | 36 | #ifdef SIESTA__PEXSI |
298 | 37 | use m_pexsi_solver, only: pexsi_solver | 37 | use m_pexsi_solver, only: pexsi_solver |
299 | 38 | #endif | 38 | #endif |
300 | 39 | #ifdef SIESTA__ELSI | ||
301 | 40 | use m_elsi_interface, only: elsi_getdm | ||
302 | 41 | #endif | ||
303 | 39 | use m_hsx, only : write_hs_formatted | 42 | use m_hsx, only : write_hs_formatted |
304 | 40 | #ifdef MPI | 43 | #ifdef MPI |
305 | 41 | use mpi_siesta | 44 | use mpi_siesta |
306 | @@ -75,7 +78,7 @@ | |||
307 | 75 | if (SIESTA_worker) call timer( 'compute_dm', 1 ) | 78 | if (SIESTA_worker) call timer( 'compute_dm', 1 ) |
308 | 76 | 79 | ||
309 | 77 | #ifdef MPI | 80 | #ifdef MPI |
311 | 78 | call MPI_Bcast(isolve,1,MPI_integer,0,true_MPI_Comm_World,mpierr) | 81 | call MPI_Bcast(isolve,1,MPI_integer,0,MPI_Comm_DFT,mpierr) |
312 | 79 | #endif | 82 | #endif |
313 | 80 | 83 | ||
314 | 81 | if (SIESTA_worker) then | 84 | if (SIESTA_worker) then |
315 | @@ -137,6 +140,27 @@ | |||
316 | 137 | endif | 140 | endif |
317 | 138 | if (.not. SIESTA_worker) RETURN | 141 | if (.not. SIESTA_worker) RETURN |
318 | 139 | #endif | 142 | #endif |
319 | 143 | #ifdef SIESTA__ELSI | ||
320 | 144 | if (isolve .eq. SOLVE_ELSI) then | ||
321 | 145 | ! This test done in node 0 since NonCol and SpOrb | ||
322 | 146 | ! are not set for ELSI-solver-only processes | ||
323 | 147 | if (ionode) then | ||
324 | 148 | if (spin%NCol .or. spin%SO) call die( | ||
325 | 149 | $ "The ELSI solver does not implement "// | ||
326 | 150 | $ "non-coll spins or Spin-orbit yet") | ||
327 | 151 | endif | ||
328 | 152 | call elsi_getdm(iscf, no_s, spin%spinor, | ||
329 | 153 | & no_l, maxnh, no_u, | ||
330 | 154 | & numh, listhptr, listh, | ||
331 | 155 | & H, S, qtot, temp, | ||
332 | 156 | & xijo, | ||
333 | 157 | & kpoint_scf%N, kpoint_scf%k, kpoint_scf%w, | ||
334 | 158 | & eo, qo, Dscf, Escf, ef, Entropy, | ||
335 | 159 | & occtol, neigwanted, Get_EDM_Only=.false.) | ||
336 | 160 | Ecorrec = 0.0_dp | ||
337 | 161 | endif | ||
338 | 162 | if (.not. SIESTA_worker) RETURN | ||
339 | 163 | #endif | ||
340 | 140 | ! Here we decide if we want to calculate one or more SCF steps by | 164 | ! Here we decide if we want to calculate one or more SCF steps by |
341 | 141 | ! diagonalization before proceeding with the OMM routine | 165 | ! diagonalization before proceeding with the OMM routine |
342 | 142 | CallDiagon=.false. | 166 | CallDiagon=.false. |
343 | 143 | 167 | ||
344 | === modified file 'Src/dhscf.F' | |||
345 | --- Src/dhscf.F 2019-01-04 07:01:47 +0000 | |||
346 | +++ Src/dhscf.F 2019-01-16 11:00:58 +0000 | |||
347 | @@ -694,6 +694,10 @@ | |||
348 | 694 | use m_ts_voltage, only: ts_voltage | 694 | use m_ts_voltage, only: ts_voltage |
349 | 695 | use m_ts_hartree, only: ts_hartree_fix | 695 | use m_ts_hartree, only: ts_hartree_fix |
350 | 696 | 696 | ||
351 | 697 | #ifdef SIESTA__ELSI | ||
352 | 698 | use m_elsi_interface, only: elsi_save_potential | ||
353 | 699 | #endif | ||
354 | 700 | |||
355 | 697 | implicit none | 701 | implicit none |
356 | 698 | 702 | ||
357 | 699 | integer | 703 | integer |
358 | @@ -1653,6 +1657,12 @@ | |||
359 | 1653 | #endif | 1657 | #endif |
360 | 1654 | endif | 1658 | endif |
361 | 1655 | 1659 | ||
362 | 1660 | #ifdef SIESTA__ELSI | ||
363 | 1661 | ! This routine, and the associated data, live | ||
364 | 1662 | ! in the ELSI interface module | ||
365 | 1663 | call elsi_save_potential(ntpl,nspin,Vscf,comm=MPI_Comm_World) | ||
366 | 1664 | #endif | ||
367 | 1665 | |||
368 | 1656 | C ---------------------------------------------------------------------- | 1666 | C ---------------------------------------------------------------------- |
369 | 1657 | C Print vacuum level | 1667 | C Print vacuum level |
370 | 1658 | C ---------------------------------------------------------------------- | 1668 | C ---------------------------------------------------------------------- |
371 | 1659 | 1669 | ||
372 | === added file 'Src/fold_auxcell.f90' | |||
373 | --- Src/fold_auxcell.f90 1970-01-01 00:00:00 +0000 | |||
374 | +++ Src/fold_auxcell.f90 2019-01-16 11:00:58 +0000 | |||
375 | @@ -0,0 +1,85 @@ | |||
376 | 1 | module m_fold_auxcell | ||
377 | 2 | public :: fold_sparse_arrays | ||
378 | 3 | private | ||
379 | 4 | CONTAINS | ||
380 | 5 | subroutine fold_sparse_arrays(no_l,no_u,numh,listhptr,nnz,listh, & | ||
381 | 6 | numh_u,listhptr_u,nnz_u,listh_u,ind2ind_u) | ||
382 | 7 | |||
383 | 8 | ! Fold-in a sparse matrix from the auxiliary supercell into the | ||
384 | 9 | ! unit cell (see picture) | ||
385 | 10 | |||
386 | 11 | ! Number of orbitals handled by this node | ||
387 | 12 | integer, intent(in) :: no_l | ||
388 | 13 | ! Number of orbitals in unit cell | ||
389 | 14 | integer, intent(in) :: no_u | ||
390 | 15 | |||
391 | 16 | ! Number of interactions per orbital; pointer to beginning of sparse array data | ||
392 | 17 | integer, intent(in) :: numh(no_l), listhptr(no_l) | ||
393 | 18 | ! Total number of interactions | ||
394 | 19 | integer, intent(in) :: nnz | ||
395 | 20 | ! Columns of the (rectangular) supercell-based matrix | ||
396 | 21 | integer, intent(in) :: listh(nnz) | ||
397 | 22 | |||
398 | 23 | ! Output: All interactions are collapsed to the unit cell orbitals | ||
399 | 24 | |||
400 | 25 | ! Number of interactions per orbital; pointer to beginning of sparse array data | ||
401 | 26 | integer, intent(out) :: numh_u(no_l), listhptr_u(no_l) | ||
402 | 27 | ! Total number of interactions | ||
403 | 28 | integer, intent(out) :: nnz_u | ||
404 | 29 | ! Columns of the (square) unit cell-based matrix | ||
405 | 30 | integer, allocatable, intent(out) :: listh_u(:) | ||
406 | 31 | ! Mapper of indexes from supercell-sparse-array to unit-cell sparse array | ||
407 | 32 | integer, allocatable, intent(out) :: ind2ind_u(:) | ||
408 | 33 | |||
409 | 34 | |||
410 | 35 | ! Local variables | ||
411 | 36 | integer :: iuo, ind, j, jo, j_u, ind_u, juo | ||
412 | 37 | integer, allocatable :: mask(:) | ||
413 | 38 | |||
414 | 39 | allocate(mask(no_u)) | ||
415 | 40 | |||
416 | 41 | ! Find out how many "folded" interactions there are | ||
417 | 42 | nnz_u = 0 | ||
418 | 43 | do iuo = 1,no_l | ||
419 | 44 | mask = 0 | ||
420 | 45 | do j = 1,numh(iuo) | ||
421 | 46 | ind = listhptr(iuo) + j | ||
422 | 47 | jo = listh(ind) | ||
423 | 48 | juo = mod(jo-1,no_u) + 1 | ||
424 | 49 | mask(juo) = 1 ! Found one | ||
425 | 50 | enddo | ||
426 | 51 | numh_u(iuo) = sum(mask) | ||
427 | 52 | nnz_u = nnz_u + numh_u(iuo) | ||
428 | 53 | enddo | ||
429 | 54 | |||
430 | 55 | allocate(listh_u(nnz_u)) | ||
431 | 56 | allocate(ind2ind_u(nnz)) | ||
432 | 57 | |||
433 | 58 | ! Generate folded pointer array | ||
434 | 59 | listhptr_u(1) = 0 | ||
435 | 60 | do iuo = 2, no_l | ||
436 | 61 | listhptr_u(iuo) = listhptr_u(iuo-1) + numh_u(iuo-1) | ||
437 | 62 | enddo | ||
438 | 63 | |||
439 | 64 | ! Complete the mapping | ||
440 | 65 | do iuo = 1,no_l | ||
441 | 66 | mask(:) = 0 | ||
442 | 67 | ind_u = listhptr_u(iuo) | ||
443 | 68 | ind = listhptr(iuo) | ||
444 | 69 | do j = 1,numh(iuo) | ||
445 | 70 | ind = ind + 1 | ||
446 | 71 | jo = listh(ind) | ||
447 | 72 | juo = mod(jo-1,no_u) + 1 | ||
448 | 73 | if (mask(juo) > 0) then | ||
449 | 74 | ! juo already seen and its place recorded | ||
450 | 75 | ind2ind_u(ind) = mask(juo) | ||
451 | 76 | else | ||
452 | 77 | ind_u = ind_u + 1 | ||
453 | 78 | listh_u(ind_u) = juo | ||
454 | 79 | ind2ind_u(ind) = ind_u ! map | ||
455 | 80 | mask(juo) = ind_u ! record | ||
456 | 81 | endif | ||
457 | 82 | enddo | ||
458 | 83 | enddo | ||
459 | 84 | end subroutine fold_sparse_arrays | ||
460 | 85 | end module m_fold_auxcell | ||
461 | 0 | 86 | ||
462 | === modified file 'Src/fsiesta_mpi.F90' | |||
463 | --- Src/fsiesta_mpi.F90 2018-12-03 22:23:36 +0000 | |||
464 | +++ Src/fsiesta_mpi.F90 2019-01-16 11:00:58 +0000 | |||
465 | @@ -197,6 +197,7 @@ | |||
466 | 197 | ! MPI_COMM_WORLD | 197 | ! MPI_COMM_WORLD |
467 | 198 | use mpi_siesta, only: MPI_Comm_Siesta => MPI_Comm_World ! What siesta uses | 198 | use mpi_siesta, only: MPI_Comm_Siesta => MPI_Comm_World ! What siesta uses |
468 | 199 | ! as MPI_Comm_World | 199 | ! as MPI_Comm_World |
469 | 200 | use mpi_siesta, only: MPI_Comm_DFT ! Siesta-instance (dft-calc) | ||
470 | 200 | use mpi_siesta, only: MPI_Integer ! Integer data type | 201 | use mpi_siesta, only: MPI_Integer ! Integer data type |
471 | 201 | use mpi_siesta, only: MPI_Character ! Character data type | 202 | use mpi_siesta, only: MPI_Character ! Character data type |
472 | 202 | use mpi_siesta, only: MPI_Double_Precision ! Real double precision type | 203 | use mpi_siesta, only: MPI_Double_Precision ! Real double precision type |
473 | @@ -372,6 +373,9 @@ | |||
474 | 372 | // trim(label) // ' 2> /dev/null') | 373 | // trim(label) // ' 2> /dev/null') |
475 | 373 | endif | 374 | endif |
476 | 374 | 375 | ||
477 | 376 | ! Set the whole-siesta-instance (dft calc) communicator | ||
478 | 377 | MPI_Comm_DFT = MPI_Comm_Siesta | ||
479 | 378 | |||
480 | 375 | #endif | 379 | #endif |
481 | 376 | 380 | ||
482 | 377 | ! Initialize flags and counters | 381 | ! Initialize flags and counters |
483 | 378 | 382 | ||
484 | === modified file 'Src/initparallel.F' | |||
485 | --- Src/initparallel.F 2018-11-23 10:32:56 +0000 | |||
486 | +++ Src/initparallel.F 2019-01-16 11:00:58 +0000 | |||
487 | @@ -16,7 +16,7 @@ | |||
488 | 16 | use fdf | 16 | use fdf |
489 | 17 | use siesta_options, only: want_domain_decomposition | 17 | use siesta_options, only: want_domain_decomposition |
490 | 18 | use siesta_options, only: want_spatial_decomposition | 18 | use siesta_options, only: want_spatial_decomposition |
492 | 19 | use siesta_options, only: isolve, SOLVE_ORDERN, SOLVE_PEXSI | 19 | use siesta_options, only: isolve, SOLVE_ORDERN |
493 | 20 | use siesta_options, only: rcoor | 20 | use siesta_options, only: rcoor |
494 | 21 | use parallel, only : Node, Nodes, BlockSize, ProcessorY | 21 | use parallel, only : Node, Nodes, BlockSize, ProcessorY |
495 | 22 | use parallelsubs, only : WhichNodeOrb, GetNodeOrbs | 22 | use parallelsubs, only : WhichNodeOrb, GetNodeOrbs |
496 | 23 | 23 | ||
497 | === added file 'Src/m_elsi_interface.F90' | |||
498 | --- Src/m_elsi_interface.F90 1970-01-01 00:00:00 +0000 | |||
499 | +++ Src/m_elsi_interface.F90 2019-01-16 11:00:58 +0000 | |||
500 | @@ -0,0 +1,1601 @@ | |||
501 | 1 | ! | ||
502 | 2 | ! Alberto Garcia, February-July 2018 | ||
503 | 3 | ! Modified by Victor M. Garcia-Suarez. January 2019 | ||
504 | 4 | ! (Introduction of an extra flag to only get the EDM instead of carrying | ||
505 | 5 | ! out a full computation --- to be refactored) | ||
506 | 6 | ! | ||
507 | 7 | ! ELSI DM-based interface to Siesta. It uses the sparse matrices from Siesta, | ||
508 | 8 | ! and obtains the DM (and optionally the EDM) matrices in sparse form. | ||
509 | 9 | ! | ||
510 | 10 | ! The elsi_getdm routine is in principle able to perform (spin-polarized) | ||
511 | 11 | ! calculations for real matrices (i.e., at the Gamma point), and periodic | ||
512 | 12 | ! calculations for complex matrices (i.e., multiple k-points), including spin. | ||
513 | 13 | ! | ||
514 | 14 | ! The structure of the solver routine is such that it will detect when it is | ||
515 | 15 | ! called for the first scf step, so it can perform any needed initialization. | ||
516 | 16 | ! The same idea can be used for the diagonalization mode, with (more extensive) | ||
517 | 17 | ! appropriate changes. | ||
518 | 18 | ! | ||
519 | 19 | ! The module also exports the "elsi_finalize_scfloop" routine, to be called from | ||
520 | 20 | ! the appropriate place. Some variables are kept at the module level for this. | ||
521 | 21 | ! | ||
522 | 22 | ! Usage: Compile Siesta with -DSIESTA__ELSI | ||
523 | 23 | ! Define | ||
524 | 24 | ! SolutionMethod ELSI | ||
525 | 25 | ! in the fdf file | ||
526 | 26 | ! TODO: | ||
527 | 27 | ! - MPI.Nprocs.SIESTA is not working -- maybe we will remove that feature | ||
528 | 28 | ! - Add more documentation | ||
529 | 29 | ! - Maybe refactor a few things | ||
530 | 30 | ! | ||
531 | 31 | module m_elsi_interface | ||
532 | 32 | |||
533 | 33 | #if SIESTA__ELSI | ||
534 | 34 | |||
535 | 35 | use precision, only: dp | ||
536 | 36 | use elsi | ||
537 | 37 | |||
538 | 38 | implicit none | ||
539 | 39 | |||
540 | 40 | private | ||
541 | 41 | |||
542 | 42 | integer, parameter :: ELPA_SOLVER = 1 ! solver | ||
543 | 43 | integer, parameter :: OMM_SOLVER = 2 ! solver | ||
544 | 44 | integer, parameter :: PEXSI_SOLVER = 3 ! solver | ||
545 | 45 | integer, parameter :: SIPS_SOLVER = 5 ! solver | ||
546 | 46 | integer, parameter :: NTPOLY_SOLVER = 6 ! solver | ||
547 | 47 | integer, parameter :: MULTI_PROC = 1 ! parallel_mode | ||
548 | 48 | integer, parameter :: SIESTA_CSC = 2 ! distribution | ||
549 | 49 | integer, parameter :: GAUSSIAN = 0 ! broadening | ||
550 | 50 | integer, parameter :: FERMI = 1 ! broadening | ||
551 | 51 | integer, parameter :: METHFESSEL_PAXTON = 2 ! broadening | ||
552 | 52 | integer, parameter :: CUBIC = 3 ! broadening | ||
553 | 53 | integer, parameter :: COLD = 4 ! broadening | ||
554 | 54 | integer, parameter :: ELSI_NOT_SET = -910910 | ||
555 | 55 | |||
556 | 56 | type(elsi_handle) :: elsi_h | ||
557 | 57 | |||
558 | 58 | integer :: elsi_global_comm ! Used by all routines. Freed at end of scf loop | ||
559 | 59 | integer :: which_solver | ||
560 | 60 | integer :: which_broad | ||
561 | 61 | integer :: out_level | ||
562 | 62 | integer :: out_json | ||
563 | 63 | integer :: mp_order | ||
564 | 64 | integer :: elpa_flavor | ||
565 | 65 | integer :: omm_flavor | ||
566 | 66 | integer :: omm_n_elpa | ||
567 | 67 | integer :: pexsi_tasks_per_pole | ||
568 | 68 | integer :: pexsi_tasks_symbolic | ||
569 | 69 | integer :: sips_n_slice | ||
570 | 70 | integer :: sips_n_elpa | ||
571 | 71 | integer :: ntpoly_method | ||
572 | 72 | |||
573 | 73 | real(dp) :: omm_tol | ||
574 | 74 | real(dp) :: ntpoly_filter | ||
575 | 75 | real(dp) :: ntpoly_tol | ||
576 | 76 | |||
577 | 77 | character(len=6) :: solver_string | ||
578 | 78 | character(len=5) :: broad_string | ||
579 | 79 | |||
580 | 80 | real(dp), allocatable :: v_old(:,:) ! For mu update in PEXSI solver | ||
581 | 81 | real(dp), allocatable :: delta_v(:,:) ! For mu update in PEXSI solver | ||
582 | 82 | |||
583 | 83 | public :: elsi_getdm | ||
584 | 84 | public :: elsi_finalize_scfloop | ||
585 | 85 | public :: elsi_save_potential | ||
586 | 86 | |||
587 | 87 | CONTAINS | ||
588 | 88 | |||
589 | 89 | subroutine elsi_getdm(iscf, no_s, nspin, no_l, maxnh, no_u, & | ||
590 | 90 | numh, listhptr, listh, H, S, qtot, temp, & | ||
591 | 91 | xijo, nkpnt, kpoint, kweight, & | ||
592 | 92 | eo, qo, Dscf, Escf, ef, Entropy, occtol, neigwanted, Get_EDM_Only) | ||
593 | 93 | |||
594 | 94 | ! | ||
595 | 95 | ! Analogous to 'diagon', it dispatches ELSI solver routines as needed | ||
596 | 96 | ! | ||
597 | 97 | |||
598 | 98 | use m_fold_auxcell, only: fold_sparse_arrays ! Could be called in state_init | ||
599 | 99 | |||
600 | 100 | ! Missing for now | ||
601 | 101 | ! eo(no_u,nspin,nk) : Eigenvalues | ||
602 | 102 | ! qo(no_u,nspin,nk) : Occupations of eigenstates | ||
603 | 103 | |||
604 | 104 | |||
605 | 105 | real(dp), intent(inout) :: H(:,:), S(:) ! Note: we might overwrite these | ||
606 | 106 | integer, intent(in) :: iscf, maxnh, no_u, no_l, no_s, nkpnt | ||
607 | 107 | integer, intent(in) :: neigwanted, nspin | ||
608 | 108 | integer, intent(in) :: listh(maxnh), numh(no_l), listhptr(no_l) | ||
609 | 109 | real(dp), intent(in) :: kpoint(3,nkpnt), qtot, temp, kweight(nkpnt), occtol,xijo(3,maxnh) | ||
610 | 110 | |||
611 | 111 | real(dp), intent(out) :: Dscf(maxnh,nspin), ef, Escf(maxnh,nspin), Entropy | ||
612 | 112 | real(dp), intent(out) :: eo(no_u,nspin,nkpnt), qo(no_u,nspin,nkpnt) | ||
613 | 113 | |||
614 | 114 | ! Interim flag to just get the EDM | ||
615 | 115 | ! Note that, if .true., the DM is NOT obtained | ||
616 | 116 | ! This needs to be refactored | ||
617 | 117 | |||
618 | 118 | logical, intent(in) :: Get_EDM_Only | ||
619 | 119 | |||
620 | 120 | |||
621 | 121 | logical :: gamma, using_aux_cell | ||
622 | 122 | integer, allocatable :: numh_u(:), listhptr_u(:), listh_u(:) | ||
623 | 123 | integer, allocatable :: ind2ind_u(:) | ||
624 | 124 | |||
625 | 125 | ! | ||
626 | 126 | real(dp), allocatable, dimension(:,:) :: Dscf_u, Escf_u, H_u | ||
627 | 127 | real(dp), allocatable, dimension(:) :: S_u | ||
628 | 128 | |||
629 | 129 | integer :: iuo, ispin, j, ind, ind_u, nnz_u | ||
630 | 130 | |||
631 | 131 | external die | ||
632 | 132 | |||
633 | 133 | gamma = ((nkpnt == 1) .and. (sum(abs(kpoint(:,1))) == 0.0_dp)) | ||
634 | 134 | using_aux_cell = (no_s /= no_u) | ||
635 | 135 | |||
636 | 136 | if (gamma) then | ||
637 | 137 | |||
638 | 138 | if (.not. using_aux_cell) then | ||
639 | 139 | |||
640 | 140 | call elsi_real_solver(iscf, no_u, no_l, nspin, & | ||
641 | 141 | maxnh, listhptr, listh, qtot, temp, & | ||
642 | 142 | H, S, Dscf, Escf, ef, Entropy, Get_EDM_Only) | ||
643 | 143 | |||
644 | 144 | else | ||
645 | 145 | |||
646 | 146 | ! We fold-in the sparse arrays so that they add up all the | ||
647 | 147 | ! matrix elements whose 'column' supercell index maps to the same | ||
648 | 148 | ! unit-cell column. Note that they are still sparse. | ||
649 | 149 | |||
650 | 150 | ! First, determine the appropriate index arrays (ending in _u), and | ||
651 | 151 | ! a mapper ind2ind_u | ||
652 | 152 | |||
653 | 153 | allocate(numh_u(no_l), listhptr_u(no_l)) | ||
654 | 154 | call fold_sparse_arrays(no_l,no_u, & | ||
655 | 155 | numh,listhptr,maxnh,listh, & | ||
656 | 156 | numh_u,listhptr_u,nnz_u,listh_u,ind2ind_u) | ||
657 | 157 | |||
658 | 158 | allocate(H_u(nnz_u,nspin), S_u(nnz_u)) | ||
659 | 159 | S_u = 0 | ||
660 | 160 | H_u = 0 | ||
661 | 161 | do iuo = 1,no_l | ||
662 | 162 | do j = 1,numh(iuo) | ||
663 | 163 | ind = listhptr(iuo) + j | ||
664 | 164 | ind_u = ind2ind_u(ind) | ||
665 | 165 | S_u(ind_u) = S_u(ind_u) + S(ind) | ||
666 | 166 | do ispin = 1, nspin | ||
667 | 167 | H_u(ind_u,ispin) = H_u(ind_u,ispin) + H(ind,ispin) | ||
668 | 168 | enddo | ||
669 | 169 | enddo | ||
670 | 170 | enddo | ||
671 | 171 | |||
672 | 172 | ! We can now call the standard real solver routine | ||
673 | 173 | allocate(Dscf_u(nnz_u,nspin), Escf_u(nnz_u,nspin)) | ||
674 | 174 | |||
675 | 175 | call elsi_real_solver(iscf, no_u, no_l, nspin, & | ||
676 | 176 | nnz_u, listhptr_u, listh_u, qtot, temp, & | ||
677 | 177 | H_u, S_u, Dscf_u, Escf_u, ef, Entropy, Get_EDM_Only) | ||
678 | 178 | |||
679 | 179 | deallocate(H_u, S_u) | ||
680 | 180 | deallocate(numh_u, listhptr_u, listh_u) | ||
681 | 181 | |||
682 | 182 | |||
683 | 183 | ! Unfold. We put the same '_u' DM entry into all image slots. | ||
684 | 184 | do iuo = 1,no_l | ||
685 | 185 | do j = 1,numh(iuo) | ||
686 | 186 | ind = listhptr(iuo) + j | ||
687 | 187 | ind_u = ind2ind_u(ind) | ||
688 | 188 | do ispin = 1, nspin | ||
689 | 189 | Dscf(ind,ispin) = Dscf_u(ind_u,ispin) | ||
690 | 190 | Escf(ind,ispin) = Escf_u(ind_u,ispin) | ||
691 | 191 | enddo | ||
692 | 192 | enddo | ||
693 | 193 | enddo | ||
694 | 194 | deallocate(Dscf_u, Escf_u) | ||
695 | 195 | deallocate(ind2ind_u) | ||
696 | 196 | |||
697 | 197 | endif ! using auxiliary supercell with Gamma sampling | ||
698 | 198 | |||
699 | 199 | else | ||
700 | 200 | |||
701 | 201 | ! We need more preparation | ||
702 | 202 | call elsi_kpoints_dispatcher(iscf, no_s, nspin, no_l, maxnh, no_u, & | ||
703 | 203 | numh, listhptr, listh, H, S, qtot, temp, & | ||
704 | 204 | xijo, nkpnt, kpoint, kweight, & | ||
705 | 205 | eo, qo, Dscf, Escf, ef, Entropy, occtol, neigwanted, Get_EDM_Only) | ||
706 | 206 | |||
707 | 207 | endif | ||
708 | 208 | |||
709 | 209 | end subroutine elsi_getdm | ||
710 | 210 | |||
711 | 211 | subroutine elsi_get_opts() | ||
712 | 212 | |||
713 | 213 | use fdf, only: fdf_get | ||
714 | 214 | |||
715 | 215 | solver_string = fdf_get("ELSISolver", "elpa") | ||
716 | 216 | out_level = fdf_get("ELSIOutputLevel", 0) | ||
717 | 217 | out_json = fdf_get("ELSIOutputJson", 1) | ||
718 | 218 | broad_string = fdf_get("ELSIBroadeningMethod", "fermi") | ||
719 | 219 | mp_order = fdf_get("ELSIBroadeningMPOrder", 1) | ||
720 | 220 | elpa_flavor = fdf_get("ELSIELPAFlavor", 2) | ||
721 | 221 | omm_flavor = fdf_get("ELSIOMMFlavor", 0) | ||
722 | 222 | omm_n_elpa = fdf_get("ELSIOMMELPASteps", 3) | ||
723 | 223 | omm_tol = fdf_get("ELSIOMMTolerance", 1.0e-9_dp) | ||
724 | 224 | pexsi_tasks_per_pole = fdf_get("ELSIPEXSITasksPerPole", ELSI_NOT_SET) | ||
725 | 225 | pexsi_tasks_symbolic = fdf_get("ELSIPEXSITasksSymbolic", 1) | ||
726 | 226 | sips_n_slice = fdf_get("ELSISIPSSlices", ELSI_NOT_SET) | ||
727 | 227 | sips_n_elpa = fdf_get("ELSISIPSELPASteps", 2) | ||
728 | 228 | ntpoly_method = fdf_get("ELSINTPOLYMethod", 2) | ||
729 | 229 | ntpoly_filter = fdf_get("ELSINTPOLYFilter", 1.0e-9_dp) | ||
730 | 230 | ntpoly_tol = fdf_get("ELSINTPOLYTolerance", 1.0e-6_dp) | ||
731 | 231 | |||
732 | 232 | select case (solver_string) | ||
733 | 233 | case ("elpa", "ELPA") | ||
734 | 234 | which_solver = ELPA_SOLVER | ||
735 | 235 | case ("omm", "OMM") | ||
736 | 236 | which_solver = OMM_SOLVER | ||
737 | 237 | case ("pexsi", "PEXSI") | ||
738 | 238 | which_solver = PEXSI_SOLVER | ||
739 | 239 | case ("sips", "SIPS", "SIPs") | ||
740 | 240 | which_solver = SIPS_SOLVER | ||
741 | 241 | case ("ntpoly", "NTPOLY", "NTPoly") | ||
742 | 242 | which_solver = NTPOLY_SOLVER | ||
743 | 243 | case default | ||
744 | 244 | which_solver = ELPA_SOLVER | ||
745 | 245 | end select | ||
746 | 246 | |||
747 | 247 | select case (broad_string) | ||
748 | 248 | case ("gauss") | ||
749 | 249 | which_broad = GAUSSIAN | ||
750 | 250 | case ("fermi") | ||
751 | 251 | which_broad = FERMI | ||
752 | 252 | case ("mp") | ||
753 | 253 | which_broad = METHFESSEL_PAXTON | ||
754 | 254 | case ("cubic") | ||
755 | 255 | which_broad = CUBIC | ||
756 | 256 | case ("cold") | ||
757 | 257 | which_broad = COLD | ||
758 | 258 | case default | ||
759 | 259 | which_broad = FERMI | ||
760 | 260 | end select | ||
761 | 261 | |||
762 | 262 | end subroutine elsi_get_opts | ||
763 | 263 | |||
764 | 264 | !====================================================================================== | ||
765 | 265 | ! ELSI takes 1D block-cyclic distributed CSC/CSR matrices as its | ||
766 | 266 | ! input/output. | ||
767 | 267 | ! | ||
768 | 268 | ! But note taht this version assumes *the same* distributions for Siesta (setup_H et al) and ELSI | ||
769 | 269 | ! operations. | ||
770 | 270 | ! | ||
771 | 271 | subroutine elsi_real_solver(iscf, n_basis, n_basis_l, n_spin, nnz_l, row_ptr, & | ||
772 | 272 | col_idx, qtot, temp, ham, ovlp, dm, edm, ef, ets, Get_EDM_Only) | ||
773 | 273 | |||
774 | 274 | use m_mpi_utils, only: globalize_sum | ||
775 | 275 | use parallel, only: BlockSize | ||
776 | 276 | #ifdef MPI | ||
777 | 277 | use mpi_siesta | ||
778 | 278 | #endif | ||
779 | 279 | use class_Distribution | ||
780 | 280 | use m_redist_spmatrix, only: aux_matrix, redistribute_spmatrix | ||
781 | 281 | use alloc | ||
782 | 282 | |||
783 | 283 | implicit none | ||
784 | 284 | |||
785 | 285 | integer, intent(in) :: iscf ! SCF step counter | ||
786 | 286 | integer, intent(in) :: n_basis ! Global basis | ||
787 | 287 | integer, intent(in) :: n_basis_l ! Local basis | ||
788 | 288 | integer, intent(in) :: n_spin | ||
789 | 289 | integer, intent(in) :: nnz_l ! Local nonzero | ||
790 | 290 | integer, intent(in) :: row_ptr(n_basis_l) | ||
791 | 291 | integer, intent(in), target :: col_idx(nnz_l) | ||
792 | 292 | real(dp), intent(in) :: qtot | ||
793 | 293 | real(dp), intent(in) :: temp | ||
794 | 294 | real(dp), intent(inout), target :: ham(nnz_l,n_spin) | ||
795 | 295 | real(dp), intent(inout), target :: ovlp(nnz_l) | ||
796 | 296 | real(dp), intent(out) :: dm(nnz_l,n_spin) | ||
797 | 297 | real(dp), intent(out) :: edm(nnz_l,n_spin) | ||
798 | 298 | real(dp), intent(out) :: ef ! Fermi energy | ||
799 | 299 | real(dp), intent(out) :: ets ! Entropy/k, dimensionless | ||
800 | 300 | |||
801 | 301 | integer :: ierr | ||
802 | 302 | integer :: n_state | ||
803 | 303 | integer :: nnz_g | ||
804 | 304 | |||
805 | 305 | real(dp) :: energy | ||
806 | 306 | |||
807 | 307 | integer, allocatable, dimension(:) :: row_ptr2 | ||
808 | 308 | integer, allocatable, dimension(:), target :: numh | ||
809 | 309 | |||
810 | 310 | integer :: elsi_Spatial_comm, elsi_Spin_comm | ||
811 | 311 | |||
812 | 312 | type(distribution) :: dist_global | ||
813 | 313 | type(distribution) :: dist_spin(2) | ||
814 | 314 | |||
815 | 315 | type(aux_matrix) :: pkg_global, pkg_spin ! Packages for transfer | ||
816 | 316 | |||
817 | 317 | integer :: my_spin | ||
818 | 318 | |||
819 | 319 | integer :: my_no_l | ||
820 | 320 | integer :: my_nnz_l | ||
821 | 321 | integer :: my_nnz | ||
822 | 322 | integer, pointer :: my_row_ptr2(:) => null() | ||
823 | 323 | integer :: i, ih, ispin, spin_rank | ||
824 | 324 | real(dp) :: ets_spin | ||
825 | 325 | |||
826 | 326 | integer, pointer :: my_col_idx(:) | ||
827 | 327 | real(dp), pointer :: my_S(:) | ||
828 | 328 | real(dp), pointer :: my_H(:) | ||
829 | 329 | real(dp), pointer :: my_DM(:) => null() | ||
830 | 330 | real(dp), pointer :: my_EDM(:) => null() | ||
831 | 331 | |||
832 | 332 | integer :: date_stamp | ||
833 | 333 | |||
834 | 334 | logical :: Get_EDM_Only | ||
835 | 335 | |||
836 | 336 | external :: timer | ||
837 | 337 | |||
838 | 338 | #ifndef MPI | ||
839 | 339 | call die("This ELSI solver interface needs MPI") | ||
840 | 340 | #endif | ||
841 | 341 | |||
842 | 342 | ! Global communicator is a duplicate of passed communicator | ||
843 | 343 | call MPI_Comm_Dup(MPI_Comm_DFT, elsi_global_comm, ierr) | ||
844 | 344 | |||
845 | 345 | call timer("elsi", 1) | ||
846 | 346 | |||
847 | 347 | ! Initialization | ||
848 | 348 | if (iscf == 1) then | ||
849 | 349 | |||
850 | 350 | ! Get ELSI options | ||
851 | 351 | call elsi_get_opts() | ||
852 | 352 | |||
853 | 353 | ! Number of states to solve when calling an eigensolver | ||
854 | 354 | n_state = min(n_basis, n_basis/2+5) | ||
855 | 355 | |||
856 | 356 | ! Now we have all ingredients to initialize ELSI | ||
857 | 357 | call elsi_init(elsi_h, which_solver, MULTI_PROC, SIESTA_CSC, n_basis, & | ||
858 | 358 | qtot, n_state) | ||
859 | 359 | |||
860 | 360 | ! Output | ||
861 | 361 | call elsi_set_output(elsi_h, out_level) | ||
862 | 362 | call elsi_set_output_log(elsi_h, out_json) | ||
863 | 363 | call elsi_set_write_unit(elsi_h, 6) | ||
864 | 364 | |||
865 | 365 | ! Broadening | ||
866 | 366 | call elsi_set_mu_broaden_scheme(elsi_h, which_broad) | ||
867 | 367 | call elsi_set_mu_broaden_width(elsi_h, temp) | ||
868 | 368 | call elsi_set_mu_mp_order(elsi_h, mp_order) | ||
869 | 369 | |||
870 | 370 | ! Solver settings | ||
871 | 371 | call elsi_set_elpa_solver(elsi_h, elpa_flavor) | ||
872 | 372 | |||
873 | 373 | call elsi_set_omm_flavor(elsi_h, omm_flavor) | ||
874 | 374 | call elsi_set_omm_n_elpa(elsi_h, omm_n_elpa) | ||
875 | 375 | call elsi_set_omm_tol(elsi_h, omm_tol) | ||
876 | 376 | |||
877 | 377 | if (pexsi_tasks_per_pole /= ELSI_NOT_SET) then | ||
878 | 378 | call elsi_set_pexsi_np_per_pole(elsi_h, pexsi_tasks_per_pole) | ||
879 | 379 | end if | ||
880 | 380 | |||
881 | 381 | call elsi_set_pexsi_np_symbo(elsi_h, pexsi_tasks_symbolic) | ||
882 | 382 | call elsi_set_pexsi_temp(elsi_h, temp) | ||
883 | 383 | ! call elsi_set_pexsi_gap(elsi_h, gap) | ||
884 | 384 | ! call elsi_set_pexsi_delta_e(elsi_h, delta_e) | ||
885 | 385 | call elsi_set_pexsi_mu_min(elsi_h, -10.0_dp) | ||
886 | 386 | call elsi_set_pexsi_mu_max(elsi_h, 10.0_dp) | ||
887 | 387 | |||
888 | 388 | if (sips_n_slice /= ELSI_NOT_SET) then | ||
889 | 389 | call elsi_set_sips_n_slice(elsi_h, sips_n_slice) | ||
890 | 390 | end if | ||
891 | 391 | |||
892 | 392 | call elsi_set_sips_n_elpa(elsi_h, sips_n_elpa) | ||
893 | 393 | call elsi_set_sips_interval(elsi_h, -10.0_dp, 10.0_dp) | ||
894 | 394 | |||
895 | 395 | call elsi_set_ntpoly_method(elsi_h, ntpoly_method) | ||
896 | 396 | call elsi_set_ntpoly_filter(elsi_h, ntpoly_filter) | ||
897 | 397 | call elsi_set_ntpoly_tol(elsi_h, ntpoly_tol) | ||
898 | 398 | |||
899 | 399 | endif ! iscf == 1 | ||
900 | 400 | |||
901 | 401 | if (n_spin == 1) then | ||
902 | 402 | |||
903 | 403 | ! Sparsity pattern | ||
904 | 404 | call globalize_sum(nnz_l, nnz_g, comm=elsi_global_comm) | ||
905 | 405 | |||
906 | 406 | allocate(row_ptr2(n_basis_l+1)) | ||
907 | 407 | row_ptr2(1:n_basis_l) = row_ptr(1:n_basis_l)+1 | ||
908 | 408 | row_ptr2(n_basis_l+1) = nnz_l+1 | ||
909 | 409 | |||
910 | 410 | call elsi_set_csc(elsi_h, nnz_g, nnz_l, n_basis_l, col_idx, row_ptr2) | ||
911 | 411 | deallocate(row_ptr2) | ||
912 | 412 | |||
913 | 413 | call elsi_set_csc_blk(elsi_h, BlockSize) | ||
914 | 414 | call elsi_set_mpi(elsi_h, elsi_global_comm) | ||
915 | 415 | |||
916 | 416 | else | ||
917 | 417 | |||
918 | 418 | ! MPI logic for spin polarization | ||
919 | 419 | |||
920 | 420 | ! Re-create numh, as we use it in the transfer | ||
921 | 421 | allocate(numh(n_basis_l)) | ||
922 | 422 | numh(1) = row_ptr(2) | ||
923 | 423 | do i = 2, n_basis_l-1 | ||
924 | 424 | numh(i) = row_ptr(i+1)-row_ptr(i) | ||
925 | 425 | enddo | ||
926 | 426 | numh(n_basis_l) = nnz_l - row_ptr(n_basis_l) | ||
927 | 427 | |||
928 | 428 | ! Split the communicator in spins and get distribution objects | ||
929 | 429 | ! for the data redistribution needed | ||
930 | 430 | ! Note that dist_spin is an array | ||
931 | 431 | call get_spin_comms_and_dists(elsi_global_comm,elsi_global_comm, & | ||
932 | 432 | blocksize, n_spin, & | ||
933 | 433 | dist_global,dist_spin, elsi_spatial_comm, elsi_spin_comm) | ||
934 | 434 | |||
935 | 435 | ! Find out which spin team we are in, and tag the spin we work on | ||
936 | 436 | call mpi_comm_rank( elsi_Spin_Comm, spin_rank, ierr ) | ||
937 | 437 | my_spin = spin_rank+1 ! {1,2} | ||
938 | 438 | |||
939 | 439 | |||
940 | 440 | ! This is done serially, each time filling one spin set | ||
941 | 441 | ! Note that **all processes** need to have the same pkg_global | ||
942 | 442 | |||
943 | 443 | do ispin = 1, n_spin | ||
944 | 444 | |||
945 | 445 | ! Load pkg_global data package | ||
946 | 446 | pkg_global%norbs = n_basis | ||
947 | 447 | pkg_global%no_l = n_basis_l | ||
948 | 448 | pkg_global%nnzl = nnz_l | ||
949 | 449 | pkg_global%numcols => numh | ||
950 | 450 | pkg_global%cols => col_idx | ||
951 | 451 | |||
952 | 452 | allocate(pkg_global%vals(2)) | ||
953 | 453 | ! Link the vals items to the appropriate arrays (no extra memory here) | ||
954 | 454 | pkg_global%vals(1)%data => ovlp(:) | ||
955 | 455 | ! Note that we *cannot* say => ham(:,my_spin) | ||
956 | 456 | ! and avoid the sequential loop, as then half the processors will send | ||
957 | 457 | ! the information for 'spin up' and the other half the information for 'spin down', | ||
958 | 458 | ! which is *not* what we want. | ||
959 | 459 | pkg_global%vals(2)%data => ham(:,ispin) | ||
960 | 460 | |||
961 | 461 | call timer("redist_orbs_fwd", 1) | ||
962 | 462 | |||
963 | 463 | ! We are doing the transfers sequentially. One spin team is | ||
964 | 464 | ! 'idle' (in the receiving side) in each pass, as the dist_spin(ispin) distribution | ||
965 | 465 | ! does not involve them. | ||
966 | 466 | |||
967 | 467 | call redistribute_spmatrix(n_basis,pkg_global,dist_global, & | ||
968 | 468 | pkg_spin,dist_spin(ispin),elsi_global_Comm) | ||
969 | 469 | |||
970 | 470 | call timer("redist_orbs_fwd", 2) | ||
971 | 471 | |||
972 | 472 | if (my_spin == ispin) then ! Each team gets their own data | ||
973 | 473 | |||
974 | 474 | !nrows = pkg_spin%norbs ! or simply 'norbs' | ||
975 | 475 | my_no_l = pkg_spin%no_l | ||
976 | 476 | my_nnz_l = pkg_spin%nnzl | ||
977 | 477 | call MPI_AllReduce(my_nnz_l,my_nnz,1,MPI_integer,MPI_sum,elsi_Spatial_Comm,ierr) | ||
978 | 478 | ! generate off-by-one row pointer | ||
979 | 479 | call re_alloc(my_row_ptr2,1,my_no_l+1,"my_row_ptr2","elsi_solver") | ||
980 | 480 | my_row_ptr2(1) = 1 | ||
981 | 481 | do ih = 1,my_no_l | ||
982 | 482 | my_row_ptr2(ih+1) = my_row_ptr2(ih) + pkg_spin%numcols(ih) | ||
983 | 483 | enddo | ||
984 | 484 | |||
985 | 485 | my_col_idx => pkg_spin%cols | ||
986 | 486 | my_S => pkg_spin%vals(1)%data | ||
987 | 487 | my_H => pkg_spin%vals(2)%data | ||
988 | 488 | |||
989 | 489 | call re_alloc(my_DM,1,my_nnz_l,"my_DM","elsi_solver") | ||
990 | 490 | call re_alloc(my_EDM,1,my_nnz_l,"my_EDM","elsi_solver") | ||
991 | 491 | endif | ||
992 | 492 | |||
993 | 493 | ! Clean pkg_global | ||
994 | 494 | nullify(pkg_global%vals(1)%data) | ||
995 | 495 | nullify(pkg_global%vals(2)%data) | ||
996 | 496 | deallocate(pkg_global%vals) | ||
997 | 497 | nullify(pkg_global%numcols) | ||
998 | 498 | nullify(pkg_global%cols) | ||
999 | 499 | |||
1000 | 500 | enddo | ||
1001 | 501 | |||
1002 | 502 | call elsi_set_csc(elsi_h, my_nnz, my_nnz_l, my_no_l, my_col_idx, my_row_ptr2) | ||
1003 | 503 | call de_alloc(my_row_ptr2,"my_row_ptr2","elsi_solver") | ||
1004 | 504 | |||
1005 | 505 | call elsi_set_csc_blk(elsi_h, BlockSize) | ||
1006 | 506 | call elsi_set_spin(elsi_h, n_spin, my_spin) | ||
1007 | 507 | call elsi_set_mpi(elsi_h, elsi_Spatial_comm) | ||
1008 | 508 | call elsi_set_mpi_global(elsi_h, elsi_global_comm) | ||
1009 | 509 | |||
1010 | 510 | endif ! n_spin | ||
1011 | 511 | |||
1012 | 512 | call timer("elsi-solver", 1) | ||
1013 | 513 | |||
1014 | 514 | if (n_spin == 1) then | ||
1015 | 515 | if (.not.Get_EDM_Only) then | ||
1016 | 516 | call elsi_dm_real_sparse(elsi_h, ham, ovlp, DM, energy) | ||
1017 | 517 | call elsi_get_entropy(elsi_h, ets) | ||
1018 | 518 | else | ||
1019 | 519 | call elsi_get_edm_real_sparse(elsi_h, EDM) | ||
1020 | 520 | endif | ||
1021 | 521 | else | ||
1022 | 522 | ! Solve DM, and get (at every step for now) EDM, Fermi energy, and entropy | ||
1023 | 523 | ! Energy is already summed over spins | ||
1024 | 524 | if (.not.Get_EDM_Only) then | ||
1025 | 525 | call elsi_dm_real_sparse(elsi_h, my_H, my_S, my_DM, energy) | ||
1026 | 526 | call elsi_get_entropy(elsi_h, ets_spin) | ||
1027 | 527 | else | ||
1028 | 528 | call elsi_get_edm_real_sparse(elsi_h, my_EDM) | ||
1029 | 529 | endif | ||
1030 | 530 | #ifdef SIESTA__ELSI__OLD_SPIN_CONVENTION | ||
1031 | 531 | ! NOTE** | ||
1032 | 532 | ! For ELSI versions before 2018-08-17 we still need to sum the entropy over spins | ||
1033 | 533 | ! ... but to figure out the version is not trivial, as the relevant routines changed... | ||
1034 | 534 | call globalize_sum(ets_spin, ets, comm=elsi_Spin_comm) | ||
1035 | 535 | #else | ||
1036 | 536 | ! If this gives an error, then your version of ELSI is old, and you should | ||
1037 | 537 | ! be using the pre-processor symbol above | ||
1038 | 538 | ! (This works because 'elsi_get_datestamp' was added just | ||
1039 | 539 | ! around the same time as the spin-reduction-convention change) (Aug 17 vs Aug 21, 2018...) | ||
1040 | 540 | ! If you are unlucky enough to have an ELSI version in between, get rid of it. | ||
1041 | 541 | call elsi_get_datestamp(date_stamp) | ||
1042 | 542 | #endif | ||
1043 | 543 | endif | ||
1044 | 544 | |||
1045 | 545 | call elsi_get_mu(elsi_h, ef) | ||
1046 | 546 | ets = ets/temp | ||
1047 | 547 | |||
1048 | 548 | ! Ef, energy, and ets are known to all nodes | ||
1049 | 549 | |||
1050 | 550 | call timer("elsi-solver", 2) | ||
1051 | 551 | |||
1052 | 552 | if ( n_spin == 2) then | ||
1053 | 553 | ! Now we need to redistribute back | ||
1054 | 554 | |||
1055 | 555 | do ispin = 1, n_spin | ||
1056 | 556 | |||
1057 | 557 | if (my_spin == ispin) then | ||
1058 | 558 | ! Prepare pkg_spin to transfer the right spin information | ||
1059 | 559 | ! The other fields (numcols, cols) are the same and are still there | ||
1060 | 560 | ! Deallocate my_S and my_H | ||
1061 | 561 | call de_alloc(pkg_spin%vals(1)%data,"pkg_spin%vals(1)%data","elsi_solver") | ||
1062 | 562 | call de_alloc(pkg_spin%vals(2)%data,"pkg_spin%vals(2)%data","elsi_solver") | ||
1063 | 563 | |||
1064 | 564 | pkg_spin%vals(1)%data => my_DM(1:my_nnz_l) | ||
1065 | 565 | pkg_spin%vals(2)%data => my_EDM(1:my_nnz_l) | ||
1066 | 566 | |||
1067 | 567 | endif | ||
1068 | 568 | |||
1069 | 569 | ! pkg_global is clean now | ||
1070 | 570 | call timer("redist_orbs_bck", 1) | ||
1071 | 571 | call redistribute_spmatrix(n_basis,pkg_spin,dist_spin(ispin) & | ||
1072 | 572 | ,pkg_global,dist_global,elsi_global_Comm) | ||
1073 | 573 | call timer("redist_orbs_bck", 2) | ||
1074 | 574 | |||
1075 | 575 | ! Clean pkg_spin | ||
1076 | 576 | if (my_spin == ispin) then | ||
1077 | 577 | ! Each team deallocates during "its" spin cycle | ||
1078 | 578 | call de_alloc(my_DM, "my_DM", "elsi_solver") | ||
1079 | 579 | call de_alloc(my_EDM,"my_EDM","elsi_solver") | ||
1080 | 580 | |||
1081 | 581 | nullify(pkg_spin%vals(1)%data) ! formerly pointing to DM | ||
1082 | 582 | nullify(pkg_spin%vals(2)%data) ! formerly pointing to EDM | ||
1083 | 583 | deallocate(pkg_spin%vals) | ||
1084 | 584 | ! allocated in the direct transfer | ||
1085 | 585 | call de_alloc(pkg_spin%numcols,"pkg_spin%numcols","elsi_solver") | ||
1086 | 586 | call de_alloc(pkg_spin%cols, "pkg_spin%cols", "elsi_solver") | ||
1087 | 587 | endif | ||
1088 | 588 | |||
1089 | 589 | |||
1090 | 590 | ! In future, pkg_global%vals(1,2) could be pointing to DM and EDM, | ||
1091 | 591 | ! and the 'redistribute' routine check whether the vals arrays are | ||
1092 | 592 | ! associated, to use them instead of allocating them. | ||
1093 | 593 | DM(:,ispin) = pkg_global%vals(1)%data(:) | ||
1094 | 594 | EDM(:,ispin) = pkg_global%vals(2)%data(:) | ||
1095 | 595 | ! Check no_l | ||
1096 | 596 | if (n_basis_l /= pkg_global%no_l) then | ||
1097 | 597 | call die("Mismatch in no_l") | ||
1098 | 598 | endif | ||
1099 | 599 | ! Check listH | ||
1100 | 600 | if (any(col_idx(:) /= pkg_global%cols(:))) then | ||
1101 | 601 | call die("Mismatch in listH") | ||
1102 | 602 | endif | ||
1103 | 603 | |||
1104 | 604 | ! Clean pkg_global | ||
1105 | 605 | ! allocated by the transfer routine, but we did not actually | ||
1106 | 606 | ! look at them | ||
1107 | 607 | call de_alloc(pkg_global%numcols,"pkg_global%numcols","elsi_solver") | ||
1108 | 608 | call de_alloc(pkg_global%cols, "pkg_global%cols", "elsi_solver") | ||
1109 | 609 | |||
1110 | 610 | call de_alloc(pkg_global%vals(1)%data,"pkg_global%vals(1)%data","elsi_solver") | ||
1111 | 611 | call de_alloc(pkg_global%vals(2)%data,"pkg_global%vals(2)%data","elsi_solver") | ||
1112 | 612 | deallocate(pkg_global%vals) | ||
1113 | 613 | |||
1114 | 614 | enddo | ||
1115 | 615 | |||
1116 | 616 | call MPI_Comm_Free(elsi_Spatial_comm, ierr) | ||
1117 | 617 | call MPI_Comm_Free(elsi_Spin_comm, ierr) | ||
1118 | 618 | |||
1119 | 619 | endif | ||
1120 | 620 | |||
1121 | 621 | call timer("elsi", 2) | ||
1122 | 622 | |||
1123 | 623 | |||
1124 | 624 | end subroutine elsi_real_solver | ||
1125 | 625 | |||
1126 | 626 | subroutine elsi_kpoints_dispatcher(iscf, no_s, nspin, no_l, maxnh, no_u, & | ||
1127 | 627 | numh, listhptr, listh, H, S, qtot, temp, & | ||
1128 | 628 | xijo, nkpnt, kpoint, kweight, & | ||
1129 | 629 | eo, qo, Dscf, Escf, ef, Entropy, occtol, neigwanted, Get_EDM_Only) | ||
1130 | 630 | |||
1131 | 631 | use mpi_siesta, only: mpi_comm_dft | ||
1132 | 632 | use mpi | ||
1133 | 633 | use parallel, only: blocksize | ||
1134 | 634 | use class_Distribution | ||
1135 | 635 | use m_redist_spmatrix, only: aux_matrix, redistribute_spmatrix | ||
1136 | 636 | use alloc | ||
1137 | 637 | |||
1138 | 638 | ! | ||
1139 | 639 | ! K-point redistribution, Hk and Sk building, and call to complex ELSI solver | ||
1140 | 640 | ! | ||
1141 | 641 | |||
1142 | 642 | use m_fold_auxcell, only: fold_sparse_arrays ! Could be called in state_init | ||
1143 | 643 | |||
1144 | 644 | ! Missing for now | ||
1145 | 645 | ! eo(no_u,nspin,nk) : Eigenvalues | ||
1146 | 646 | ! qo(no_u,nspin,nk) : Occupations of eigenstates | ||
1147 | 647 | |||
1148 | 648 | |||
1149 | 649 | real(dp), intent(in), target :: H(:,:), S(:) ! Note that now we do not change them | ||
1150 | 650 | integer, intent(in) :: iscf, maxnh, no_u, no_l, no_s, nkpnt | ||
1151 | 651 | integer, intent(in) :: neigwanted, nspin | ||
1152 | 652 | integer, intent(in) :: listhptr(no_l) | ||
1153 | 653 | integer, intent(in), target :: listh(maxnh), numh(no_l) | ||
1154 | 654 | |||
1155 | 655 | real(dp), intent(out) :: Dscf(maxnh,nspin), ef, Escf(maxnh,nspin), Entropy | ||
1156 | 656 | real(dp), intent(out) :: eo(no_u,nspin,nkpnt), qo(no_u,nspin,nkpnt) | ||
1157 | 657 | real(dp), intent(in) :: kpoint(3,nkpnt), qtot, temp, kweight(nkpnt), occtol,xijo(3,maxnh) | ||
1158 | 658 | |||
1159 | 659 | |||
1160 | 660 | integer :: mpirank, kcolrank, npGlobal | ||
1161 | 661 | integer :: npPerK, color, my_kpt_n | ||
1162 | 662 | |||
1163 | 663 | integer :: kpt_comm, kpt_col_comm | ||
1164 | 664 | integer :: Global_Group, kpt_Group | ||
1165 | 665 | |||
1166 | 666 | integer, allocatable :: ranks_in_world(:), ranks_in_world_AllK(:,:) | ||
1167 | 667 | type(distribution) :: dist_global | ||
1168 | 668 | type(distribution), allocatable :: dist_k(:) | ||
1169 | 669 | |||
1170 | 670 | type(aux_matrix) :: pkg_global, pkg_k | ||
1171 | 671 | integer :: nvals | ||
1172 | 672 | real(dp), allocatable, target :: xijo_transp(:,:) | ||
1173 | 673 | real(dp), allocatable :: my_xijo_transp(:,:) | ||
1174 | 674 | real(dp), allocatable :: my_xij(:,:) | ||
1175 | 675 | |||
1176 | 676 | integer :: my_no_l, my_nnz_l | ||
1177 | 677 | integer, pointer :: my_numh(:) | ||
1178 | 678 | integer, pointer :: my_listh(:) | ||
1179 | 679 | integer, pointer :: my_listhptr(:) => null() | ||
1180 | 680 | real(dp), allocatable :: my_S(:) | ||
1181 | 681 | real(dp), allocatable :: my_H(:,:) | ||
1182 | 682 | real(dp), pointer :: buffer(:) ! for unpacking help | ||
1183 | 683 | |||
1184 | 684 | real(dp), allocatable :: my_Escf(:,:) | ||
1185 | 685 | real(dp), allocatable :: my_Dscf(:,:) | ||
1186 | 686 | real(dp), allocatable, target :: my_Escf_reduced(:,:) | ||
1187 | 687 | real(dp), allocatable, target :: my_Dscf_reduced(:,:) | ||
1188 | 688 | |||
1189 | 689 | complex(dp), allocatable :: DM_k(:,:) | ||
1190 | 690 | complex(dp), allocatable :: EDM_k(:,:) | ||
1191 | 691 | complex(dp), allocatable :: Hk(:,:) | ||
1192 | 692 | complex(dp), allocatable :: Sk(:) | ||
1193 | 693 | |||
1194 | 694 | integer :: iuo, j, ind, ind_u, ispin | ||
1195 | 695 | real(dp) :: kxij, my_kpoint(3) | ||
1196 | 696 | complex(dp) :: kphs | ||
1197 | 697 | |||
1198 | 698 | integer :: i, ih, ik, ierr | ||
1199 | 699 | |||
1200 | 700 | integer, allocatable :: numh_u(:), listhptr_u(:), listh_u(:), ind2ind_u(:) | ||
1201 | 701 | integer :: nnz_u | ||
1202 | 702 | |||
1203 | 703 | logical :: Get_EDM_Only | ||
1204 | 704 | |||
1205 | 705 | external die | ||
1206 | 706 | |||
1207 | 707 | ! Split the global communicator | ||
1208 | 708 | ! Re-distribute H and S to the k-point (and spin) teams | ||
1209 | 709 | ! Generate Hk, Sk | ||
1210 | 710 | ! Call elsi_complex_solver | ||
1211 | 711 | ! Construct and re-distribute global DM and EDM | ||
1212 | 712 | |||
1213 | 713 | ! Global communicator is a duplicate of passed communicator | ||
1214 | 714 | call MPI_Comm_Dup(MPI_Comm_DFT, elsi_global_comm, ierr) | ||
1215 | 715 | call MPI_Comm_Rank(elsi_global_comm, mpirank, ierr) | ||
1216 | 716 | call MPI_Comm_Size(elsi_global_comm, npGlobal, ierr) | ||
1217 | 717 | |||
1218 | 718 | ! Split elsi_global_comm | ||
1219 | 719 | |||
1220 | 720 | npPerK = npGlobal/nkpnt | ||
1221 | 721 | |||
1222 | 722 | ! Options for split: As many groups as nkpnt, so numbering is trivial | ||
1223 | 723 | color = mpirank/npPerK ! : color 0: 0,1,2,3 ; color 1: 4,5,6,7 | ||
1224 | 724 | call MPI_Comm_Split(elsi_global_comm, color, mpirank, kpt_Comm, ierr) | ||
1225 | 725 | my_kpt_n = 1 + color ! 1 + mpirank/npPerK | ||
1226 | 726 | ! Column communicator | ||
1227 | 727 | color = mod(mpirank, npPerK) ! : color 0: 0,4 1: 1,5 2: 2,6 3: 3,7 | ||
1228 | 728 | call MPI_Comm_Split(elsi_global_comm, color, mpirank, kpt_col_Comm, ierr) ! OK to use mpirank: just ordering | ||
1229 | 729 | call MPI_Comm_Rank(kpt_col_comm, kcolrank, ierr) | ||
1230 | 730 | |||
1231 | 731 | !print *, mpirank, "| ", "k-point ", my_kpt_n, " rank in col:", kcolrank | ||
1232 | 732 | |||
1233 | 733 | ! Create distribution for k-point group | ||
1234 | 734 | call MPI_Comm_Group(elsi_global_comm, Global_Group, Ierr) | ||
1235 | 735 | call MPI_Comm_Group(kpt_Comm, kpt_Group, Ierr) | ||
1236 | 736 | allocate(ranks_in_world(npPerK)) | ||
1237 | 737 | call MPI_Group_translate_ranks( kpt_Group, npPerK, & | ||
1238 | 738 | (/ (i,i=0,npPerK-1) /), & | ||
1239 | 739 | Global_Group, ranks_in_world, ierr ) | ||
1240 | 740 | |||
1241 | 741 | call MPI_Group_Free(kpt_Group, ierr) | ||
1242 | 742 | |||
1243 | 743 | allocate (ranks_in_World_AllK(npPerK,nkpnt)) | ||
1244 | 744 | ! We need everybody to have this information, as all nodes | ||
1245 | 745 | ! are part of the global distribution side of the communication | ||
1246 | 746 | ! (global_comm is the common-address space) | ||
1247 | 747 | |||
1248 | 748 | ! Use the k-column communicator | ||
1249 | 749 | call MPI_AllGather(ranks_in_world,npPerK,MPI_integer,& | ||
1250 | 750 | Ranks_in_World_AllK(1,1),npPerK, & | ||
1251 | 751 | MPI_integer,kpt_col_Comm,ierr) | ||
1252 | 752 | |||
1253 | 753 | allocate(dist_k(nkpnt)) | ||
1254 | 754 | ! Create distributions known to all nodes (again, those in base_comm) | ||
1255 | 755 | do ik = 1, nkpnt | ||
1256 | 756 | call newDistribution(dist_k(ik), elsi_global_Comm, & | ||
1257 | 757 | Ranks_in_World_AllK(:,ik), & | ||
1258 | 758 | TYPE_BLOCK_CYCLIC, blockSize, "kpt dist") | ||
1259 | 759 | enddo | ||
1260 | 760 | deallocate(ranks_in_world,Ranks_in_World_AllK) | ||
1261 | 761 | call MPI_Barrier(elsi_global_Comm,ierr) | ||
1262 | 762 | |||
1263 | 763 | call newDistribution(dist_global,elsi_global_Comm, (/ (i, i=0, npGlobal-1) /), & | ||
1264 | 764 | TYPE_BLOCK_CYCLIC,BlockSize,"global dist") | ||
1265 | 765 | call MPI_Barrier(elsi_global_Comm,ierr) | ||
1266 | 766 | |||
1267 | 767 | ! Redistribute arrays | ||
1268 | 768 | |||
1269 | 769 | ! No need to go sequentially over k-points | ||
1270 | 770 | ! Load pkg_global data package | ||
1271 | 771 | pkg_global%norbs = no_u | ||
1272 | 772 | pkg_global%no_l = no_l | ||
1273 | 773 | pkg_global%nnzl = maxnh | ||
1274 | 774 | pkg_global%numcols => numh | ||
1275 | 775 | pkg_global%cols => listh | ||
1276 | 776 | |||
1277 | 777 | nvals = 1 + 3 + nspin ! S, xijo (tranposed), H(:,nspin) | ||
1278 | 778 | allocate(pkg_global%vals(nvals)) | ||
1279 | 779 | ! Link the vals items to the appropriate arrays (no extra memory here) | ||
1280 | 780 | pkg_global%vals(1)%data => S(:) | ||
1281 | 781 | call transpose(xijo,xijo_transp) | ||
1282 | 782 | do i = 1, 3 | ||
1283 | 783 | pkg_global%vals(1+i)%data => xijo_transp(:,i) | ||
1284 | 784 | enddo | ||
1285 | 785 | do ispin = 1, nspin | ||
1286 | 786 | pkg_global%vals(4+ispin)%data => H(:,ispin) | ||
1287 | 787 | enddo | ||
1288 | 788 | |||
1289 | 789 | ! Do sequential | ||
1290 | 790 | do ik=1, nkpnt | ||
1291 | 791 | |||
1292 | 792 | call timer("redist_orbs_fwd", 1) | ||
1293 | 793 | call redistribute_spmatrix(no_u,pkg_global,dist_global, & | ||
1294 | 794 | pkg_k,dist_k(ik),elsi_global_Comm) | ||
1295 | 795 | call timer("redist_orbs_fwd", 2) | ||
1296 | 796 | |||
1297 | 797 | if (my_kpt_n == ik) then | ||
1298 | 798 | !------------------------------------------ | ||
1299 | 799 | ! Unpack info: real S and H (and index arrays) distributed over each kpt_comm | ||
1300 | 800 | my_no_l = pkg_k%no_l | ||
1301 | 801 | my_nnz_l = pkg_k%nnzl | ||
1302 | 802 | my_numh => pkg_k%numcols | ||
1303 | 803 | |||
1304 | 804 | my_listh => pkg_k%cols | ||
1305 | 805 | |||
1306 | 806 | allocate(my_S(my_nnz_l)) | ||
1307 | 807 | my_S(:) = pkg_k%vals(1)%data(:) | ||
1308 | 808 | call de_alloc(pkg_k%vals(1)%data) | ||
1309 | 809 | |||
1310 | 810 | allocate(my_xijo_transp(my_nnz_l,3)) | ||
1311 | 811 | do i = 1, 3 | ||
1312 | 812 | buffer => pkg_k%vals(1+i)%data | ||
1313 | 813 | my_xijo_transp(:,i) = buffer(:) | ||
1314 | 814 | call de_alloc(pkg_k%vals(1+i)%data) | ||
1315 | 815 | enddo | ||
1316 | 816 | |||
1317 | 817 | allocate(my_H(my_nnz_l,nspin)) | ||
1318 | 818 | do ispin = 1, nspin | ||
1319 | 819 | buffer => pkg_k%vals(4+ispin)%data | ||
1320 | 820 | my_H(:,ispin) = buffer(:) | ||
1321 | 821 | call de_alloc(pkg_k%vals(4+ispin)%data) | ||
1322 | 822 | enddo | ||
1323 | 823 | deallocate(pkg_k%vals) | ||
1324 | 824 | |||
1325 | 825 | ! Now we could clear the rest of pkg_k-- | ||
1326 | 826 | ! nullify(pkg_k%numcols) | ||
1327 | 827 | ! nullify(pkg_k%cols) | ||
1328 | 828 | ! | ||
1329 | 829 | ! but we need to remember to deallocate the actual arrays after use | ||
1330 | 830 | ! it is probably safer to keep the pkg references | ||
1331 | 831 | !--------------------------- | ||
1332 | 832 | |||
1333 | 833 | endif | ||
1334 | 834 | enddo !ik | ||
1335 | 835 | |||
1336 | 836 | ! Clean pkg_global -- This is safe, as we use pointers to data only | ||
1337 | 837 | do i = 1, size(pkg_global%vals) | ||
1338 | 838 | nullify(pkg_global%vals(i)%data) | ||
1339 | 839 | enddo | ||
1340 | 840 | deallocate(pkg_global%vals) | ||
1341 | 841 | nullify(pkg_global%numcols) | ||
1342 | 842 | nullify(pkg_global%cols) | ||
1343 | 843 | |||
1344 | 844 | deallocate(xijo_transp) ! Auxiliary array used for sending | ||
1345 | 845 | |||
1346 | 846 | ! generate listhptr for folding/unfolding operations | ||
1347 | 847 | call re_alloc(my_listhptr,1,my_no_l,"my_listhptr","elsi_solver") | ||
1348 | 848 | my_listhptr(1) = 0 | ||
1349 | 849 | do ih = 2,my_no_l | ||
1350 | 850 | my_listhptr(ih) = my_listhptr(ih-1) + my_numh(ih-1) | ||
1351 | 851 | enddo | ||
1352 | 852 | |||
1353 | 853 | ! The folded variables (*_u) are local to each team | ||
1354 | 854 | |||
1355 | 855 | allocate(numh_u(my_no_l), listhptr_u(my_no_l)) | ||
1356 | 856 | call fold_sparse_arrays(my_no_l,no_u, & | ||
1357 | 857 | my_numh,my_listhptr,my_nnz_l,my_listh, & | ||
1358 | 858 | numh_u,listhptr_u,nnz_u,listh_u,ind2ind_u) | ||
1359 | 859 | |||
1360 | 860 | ! | ||
1361 | 861 | call transpose(my_xijo_transp,my_xij) | ||
1362 | 862 | deallocate(my_xijo_transp) | ||
1363 | 863 | |||
1364 | 864 | my_kpoint(:) = kpoint(:,my_kpt_n) | ||
1365 | 865 | |||
1366 | 866 | allocate(Hk(nnz_u,nspin), Sk(nnz_u)) | ||
1367 | 867 | Sk = 0 | ||
1368 | 868 | Hk = 0 | ||
1369 | 869 | do iuo = 1,my_no_l | ||
1370 | 870 | do j = 1,my_numh(iuo) | ||
1371 | 871 | ind = my_listhptr(iuo) + j | ||
1372 | 872 | ind_u = ind2ind_u(ind) | ||
1373 | 873 | |||
1374 | 874 | kxij = my_kpoint(1) * my_xij(1,ind) + & | ||
1375 | 875 | my_kpoint(2) * my_xij(2,ind) + & | ||
1376 | 876 | my_kpoint(3) * my_xij(3,ind) | ||
1377 | 877 | kphs = cdexp(dcmplx(0.0_dp, -1.0_dp)*kxij) | ||
1378 | 878 | |||
1379 | 879 | Sk(ind_u) = Sk(ind_u) + my_S(ind) *kphs | ||
1380 | 880 | do ispin = 1, nspin | ||
1381 | 881 | Hk(ind_u,ispin) = Hk(ind_u,ispin) + my_H(ind,ispin) *kphs | ||
1382 | 882 | enddo | ||
1383 | 883 | enddo | ||
1384 | 884 | enddo | ||
1385 | 885 | |||
1386 | 886 | deallocate(my_S,my_H) | ||
1387 | 887 | ! | ||
1388 | 888 | |||
1389 | 889 | !print *, mpirank, "| ", "k-point ", my_kpt_n, " Done folding" | ||
1390 | 890 | ! Prepare arrays for holding results | ||
1391 | 891 | allocate(DM_k(nnz_u,nspin)) | ||
1392 | 892 | allocate(EDM_k(nnz_u,nspin)) | ||
1393 | 893 | |||
1394 | 894 | call elsi_complex_solver(iscf, no_u, my_no_l, nspin, nnz_u, numh_u, listhptr_u, & | ||
1395 | 895 | listh_u, qtot, temp, Hk, Sk, DM_k, EDM_k, Ef, Entropy, & | ||
1396 | 896 | nkpnt, my_kpt_n, kpoint(:,my_kpt_n), kweight(my_kpt_n), & | ||
1397 | 897 | kpt_Comm, Get_EDM_Only ) | ||
1398 | 898 | |||
1399 | 899 | !print *, mpirank, "| ", "k-point ", my_kpt_n, " Done elsi_complex_solver" | ||
1400 | 900 | deallocate(listhptr_u, numh_u, listh_u) | ||
1401 | 901 | deallocate(Hk,Sk) | ||
1402 | 902 | |||
1403 | 903 | ! Re-create DM and EDM: | ||
1404 | 904 | ! Unfold within a given k | ||
1405 | 905 | ! Add up all the k contributions with the appropriate phases | ||
1406 | 906 | |||
1407 | 907 | ! Prepare arrays for holding results: Note sizes: these are folded out | ||
1408 | 908 | allocate(my_Dscf(my_nnz_l,nspin)) | ||
1409 | 909 | allocate(my_Escf(my_nnz_l,nspin)) | ||
1410 | 910 | |||
1411 | 911 | do iuo = 1, my_no_l | ||
1412 | 912 | do j = 1, my_numh(iuo) | ||
1413 | 913 | ind = my_listhptr(iuo) + j | ||
1414 | 914 | ind_u = ind2ind_u(ind) | ||
1415 | 915 | |||
1416 | 916 | kxij = my_kpoint(1) * my_xij(1,ind) + & | ||
1417 | 917 | my_kpoint(2) * my_xij(2,ind) + & | ||
1418 | 918 | my_kpoint(3) * my_xij(3,ind) | ||
1419 | 919 | kphs = cdexp(dcmplx(0.0_dp, +1.0_dp)*kxij) | ||
1420 | 920 | |||
1421 | 921 | do ispin = 1, nspin | ||
1422 | 922 | my_Dscf(ind,ispin) = real( DM_k(ind_u,ispin) * kphs, kind=dp ) | ||
1423 | 923 | my_Escf(ind,ispin) = real( EDM_k(ind_u,ispin) * kphs, kind=dp ) | ||
1424 | 924 | enddo | ||
1425 | 925 | enddo | ||
1426 | 926 | enddo | ||
1427 | 927 | |||
1428 | 928 | ! Apply the k-point weight to the (apparently normalized) DM and EDM that | ||
1429 | 929 | ! come out of ELSI | ||
1430 | 930 | |||
1431 | 931 | my_Dscf = kweight(my_kpt_n) * my_Dscf | ||
1432 | 932 | my_Escf = kweight(my_kpt_n) * my_Escf | ||
1433 | 933 | |||
1434 | 934 | !print *, mpirank, "| ", "k-point ", my_kpt_n, " Done generating my_Dscf" | ||
1435 | 935 | deallocate(my_xij) | ||
1436 | 936 | deallocate(ind2ind_u) | ||
1437 | 937 | deallocate(DM_k,EDM_k) | ||
1438 | 938 | |||
1439 | 939 | if (my_kpt_n == 1 ) then | ||
1440 | 940 | ! Prepare arrays for holding reduced data | ||
1441 | 941 | allocate(my_Dscf_reduced(my_nnz_l,nspin)) | ||
1442 | 942 | allocate(my_Escf_reduced(my_nnz_l,nspin)) | ||
1443 | 943 | if (kcolrank /= 0) call die("Rank 0 in kpt_comm not doing kpt 1") | ||
1444 | 944 | else | ||
1445 | 945 | ! These should not be referenced | ||
1446 | 946 | allocate(my_Dscf_reduced(1,1)) | ||
1447 | 947 | allocate(my_Escf_reduced(1,1)) | ||
1448 | 948 | endif | ||
1449 | 949 | |||
1450 | 950 | ! Use k-point column communicator, and reduce to rank 0, | ||
1451 | 951 | ! which *should* correspond to kpt=1... (checked above) | ||
1452 | 952 | call MPI_Reduce( my_Dscf, my_Dscf_reduced, nspin*my_nnz_l, MPI_Double_Precision, & | ||
1453 | 953 | MPI_Sum, 0, kpt_col_comm, ierr ) | ||
1454 | 954 | call MPI_Reduce( my_Escf, my_Escf_reduced, nspin*my_nnz_l, MPI_Double_Precision, & | ||
1455 | 955 | MPI_Sum, 0, kpt_col_comm, ierr ) | ||
1456 | 956 | |||
1457 | 957 | !print *, mpirank, "| ", "k-point ", my_kpt_n, " Done reducing my_Dscf" | ||
1458 | 958 | deallocate(my_Dscf, my_Escf) | ||
1459 | 959 | |||
1460 | 960 | ! redistribute to global distribution, only from the first k-point | ||
1461 | 961 | |||
1462 | 962 | if (my_kpt_n == 1) then | ||
1463 | 963 | |||
1464 | 964 | ! These bits are still there *** update if we ever clean pkgs after use | ||
1465 | 965 | ! pkg_k%norbs = no_u | ||
1466 | 966 | ! pkg_k%no_l = my_no_l | ||
1467 | 967 | ! pkg_k%nnzl = my_nnz_l | ||
1468 | 968 | ! pkg_k%numcols => my_numh | ||
1469 | 969 | ! pkg_k%cols => my_listh | ||
1470 | 970 | |||
1471 | 971 | nvals = 2*nspin ! DM, EDM | ||
1472 | 972 | allocate(pkg_k%vals(nvals)) | ||
1473 | 973 | do ispin = 1, nspin | ||
1474 | 974 | pkg_k%vals(ispin)%data => my_Dscf_reduced(:,ispin) | ||
1475 | 975 | pkg_k%vals(nspin+ispin)%data => my_Escf_reduced(:,ispin) | ||
1476 | 976 | enddo | ||
1477 | 977 | |||
1478 | 978 | endif | ||
1479 | 979 | |||
1480 | 980 | ! Everybody participates in the transfer in the receiving side, but | ||
1481 | 981 | ! only kpt=1 in the sending side, because we are using dist_k(1) | ||
1482 | 982 | call timer("redist_dm-edm_bck", 1) | ||
1483 | 983 | call redistribute_spmatrix(no_u,pkg_k,dist_k(1), & | ||
1484 | 984 | pkg_global,dist_global,elsi_global_Comm) | ||
1485 | 985 | call timer("redist_dm-edm_bck", 2) | ||
1486 | 986 | |||
1487 | 987 | ! Deallocate aux arrays | ||
1488 | 988 | deallocate(my_Dscf_reduced, my_Escf_reduced) | ||
1489 | 989 | if (my_kpt_n == 1) then | ||
1490 | 990 | !Clean pkg_k in sender | ||
1491 | 991 | deallocate(pkg_k%vals) ! just pointers | ||
1492 | 992 | endif | ||
1493 | 993 | |||
1494 | 994 | !Clean all pkg_k: These were actually allocated in the forward transfer | ||
1495 | 995 | call de_alloc(pkg_k%numcols,"pkg_k%numcols") | ||
1496 | 996 | call de_alloc(pkg_k%cols,"pkg_k%cols") | ||
1497 | 997 | |||
1498 | 998 | !print *, mpirank, "| ", "k-point ", my_kpt_n, " Done cleaning pkg_k" | ||
1499 | 999 | |||
1500 | 1000 | ! Unpack data (all processors, original global distribution) | ||
1501 | 1001 | ! In future, pkg_global%vals(:) could be pointing to DM and EDM, | ||
1502 | 1002 | ! and the 'redistribute' routine check whether the vals arrays are | ||
1503 | 1003 | ! associated, to use them instead of allocating them. | ||
1504 | 1004 | do ispin = 1, nspin | ||
1505 | 1005 | Dscf(:,ispin) = pkg_global%vals(ispin)%data(:) | ||
1506 | 1006 | Escf(:,ispin) = pkg_global%vals(nspin+ispin)%data(:) | ||
1507 | 1007 | enddo | ||
1508 | 1008 | ! Check no_l | ||
1509 | 1009 | if (no_l /= pkg_global%no_l) then | ||
1510 | 1010 | call die("Mismatch in no_l at end of kpoints-dispatcher") | ||
1511 | 1011 | endif | ||
1512 | 1012 | ! Check listH | ||
1513 | 1013 | if (any(listh(:) /= pkg_global%cols(:))) then | ||
1514 | 1014 | call die("Mismatch in listH at end of kpoints-dispatcher") | ||
1515 | 1015 | endif | ||
1516 | 1016 | !print *, mpirank, "| ", "k-point ", my_kpt_n, " Done Dscf" | ||
1517 | 1017 | |||
1518 | 1018 | ! Clean pkg_global | ||
1519 | 1019 | call de_alloc(pkg_global%numcols,"pkg_global%numcols","elsi_solver") | ||
1520 | 1020 | call de_alloc(pkg_global%cols, "pkg_global%cols", "elsi_solver") | ||
1521 | 1021 | do i = 1, size(pkg_global%vals) | ||
1522 | 1022 | call de_alloc(pkg_global%vals(i)%data,"pkg_global%vals%data","kpoints_dispatcher") | ||
1523 | 1023 | enddo | ||
1524 | 1024 | deallocate(pkg_global%vals) | ||
1525 | 1025 | !print *, mpirank, "| ", "k-point ", my_kpt_n, " Done cleaning pkg_global" | ||
1526 | 1026 | |||
1527 | 1027 | ! Reduction of entropy over kpt_col_comm is not necessary | ||
1528 | 1028 | |||
1529 | 1029 | call MPI_Comm_Free(kpt_comm, ierr) | ||
1530 | 1030 | call MPI_Comm_Free(kpt_col_comm, ierr) | ||
1531 | 1031 | |||
1532 | 1032 | end subroutine elsi_kpoints_dispatcher | ||
1533 | 1033 | |||
1534 | 1034 | ! Clean up: Finalize ELSI instance and free MPI communicator. | ||
1535 | 1035 | ! | ||
1536 | 1036 | subroutine elsi_finalize_scfloop() | ||
1537 | 1037 | |||
1538 | 1038 | integer :: ierr | ||
1539 | 1039 | |||
1540 | 1040 | ! Make which_solver invalid | ||
1541 | 1041 | which_solver = ELSI_NOT_SET | ||
1542 | 1042 | |||
1543 | 1043 | if (allocated(v_old)) then | ||
1544 | 1044 | deallocate(v_old) | ||
1545 | 1045 | deallocate(delta_v) | ||
1546 | 1046 | end if | ||
1547 | 1047 | |||
1548 | 1048 | call elsi_finalize(elsi_h) | ||
1549 | 1049 | |||
1550 | 1050 | call MPI_Comm_Free(elsi_global_comm, ierr) | ||
1551 | 1051 | |||
1552 | 1052 | end subroutine elsi_finalize_scfloop | ||
1553 | 1053 | |||
1554 | 1054 | ! Save Hartree + XC potential and find minimum and maximum change of it between | ||
1555 | 1055 | ! two SCF iterations. | ||
1556 | 1056 | ! | ||
1557 | 1057 | subroutine elsi_save_potential(n_pts, n_spin, v_scf, comm) | ||
1558 | 1058 | |||
1559 | 1059 | use m_mpi_utils, only: globalize_min, globalize_max | ||
1560 | 1060 | use parallel, only: ionode, node | ||
1561 | 1061 | use units, only: eV | ||
1562 | 1062 | |||
1563 | 1063 | integer, intent(in) :: n_pts | ||
1564 | 1064 | integer, intent(in) :: n_spin | ||
1565 | 1065 | real(dp), intent(in) :: v_scf(n_pts,n_spin) | ||
1566 | 1066 | integer , intent(in) :: comm ! The Siesta communicator used for grid operations | ||
1567 | 1067 | ! since this routine is called from dhscf... | ||
1568 | 1068 | |||
1569 | 1069 | real(dp) :: mu_min | ||
1570 | 1070 | real(dp) :: mu_max | ||
1571 | 1071 | real(dp) :: dv_min | ||
1572 | 1072 | real(dp) :: dv_max | ||
1573 | 1073 | real(dp) :: tmp | ||
1574 | 1074 | |||
1575 | 1075 | if (which_solver == PEXSI_SOLVER) then | ||
1576 | 1076 | if (.not. allocated(v_old)) then | ||
1577 | 1077 | allocate(v_old(n_pts,n_spin)) | ||
1578 | 1078 | allocate(delta_v(n_pts,n_spin)) | ||
1579 | 1079 | |||
1580 | 1080 | v_old = v_scf | ||
1581 | 1081 | |||
1582 | 1082 | mu_min = -10.0_dp | ||
1583 | 1083 | mu_max = 10.0_dp | ||
1584 | 1084 | else | ||
1585 | 1085 | call elsi_get_pexsi_mu_min(elsi_h, mu_min) | ||
1586 | 1086 | call elsi_get_pexsi_mu_max(elsi_h, mu_max) | ||
1587 | 1087 | if (ionode) then | ||
1588 | 1088 | print *, "*-- solver mu_min, mu_max:", mu_min/eV, mu_max/eV | ||
1589 | 1089 | endif | ||
1590 | 1090 | |||
1591 | 1091 | delta_v = v_scf - v_old | ||
1592 | 1092 | v_old = v_scf | ||
1593 | 1093 | |||
1594 | 1094 | ! Get minimum and maximum of change of total potential | ||
1595 | 1095 | tmp = minval(delta_v) | ||
1596 | 1096 | |||
1597 | 1097 | call globalize_min(tmp, dv_min, comm=comm) | ||
1598 | 1098 | |||
1599 | 1099 | tmp = maxval(delta_v) | ||
1600 | 1100 | |||
1601 | 1101 | call globalize_max(tmp, dv_max, comm=comm) | ||
1602 | 1102 | if (ionode) then | ||
1603 | 1103 | print *, " *---- min and max Delta-V: ", dv_min/eV, dv_max/eV | ||
1604 | 1104 | endif | ||
1605 | 1105 | |||
1606 | 1106 | mu_min = mu_min+dv_min | ||
1607 | 1107 | mu_max = mu_max+dv_max | ||
1608 | 1108 | end if | ||
1609 | 1109 | |||
1610 | 1110 | ! Adjust chemical potential range for PEXSI | ||
1611 | 1111 | call elsi_set_pexsi_mu_min(elsi_h, mu_min) | ||
1612 | 1112 | call elsi_set_pexsi_mu_max(elsi_h, mu_max) | ||
1613 | 1113 | if (ionode) then | ||
1614 | 1114 | print *, "*-- updated mu_min, mu_max:", mu_min/eV, mu_max/eV | ||
1615 | 1115 | endif | ||
1616 | 1116 | end if | ||
1617 | 1117 | |||
1618 | 1118 | end subroutine elsi_save_potential | ||
1619 | 1119 | |||
1620 | 1120 | ! To-Do: Check the implications of distinguishing between 'global_comm' | ||
1621 | 1121 | ! (common space for communications) and 'base_comm' (to be split) | ||
1622 | 1122 | ! For the real case they can be the same | ||
1623 | 1123 | ! | ||
1624 | 1124 | ! This routine should be called by everybody in global_comm | ||
1625 | 1125 | |||
1626 | 1126 | subroutine get_spin_comms_and_dists(global_comm, base_comm, blocksize, n_spin,& | ||
1627 | 1127 | dist_global, dist_spin, spatial_comm, spin_comm) | ||
1628 | 1128 | |||
1629 | 1129 | use mpi_siesta | ||
1630 | 1130 | use class_Distribution ! distribution, newDistribution, types | ||
1631 | 1131 | |||
1632 | 1132 | integer, intent(in) :: global_comm ! Communicator for global distribution | ||
1633 | 1133 | ! Needed to include the actual global ranks | ||
1634 | 1134 | ! in the distribution objects | ||
1635 | 1135 | |||
1636 | 1136 | integer, intent(in) :: base_comm ! Communicator to be split | ||
1637 | 1137 | integer, intent(out) :: spatial_comm ! "Orbital" comm (one for each spin team) | ||
1638 | 1138 | integer, intent(out) :: spin_comm ! "Inner" spin comm (for reductions) | ||
1639 | 1139 | |||
1640 | 1140 | integer, intent(in) :: blocksize | ||
1641 | 1141 | integer, intent(in) :: n_spin ! should be 2 in this version | ||
1642 | 1142 | |||
1643 | 1143 | ! Note inout for bud objects | ||
1644 | 1144 | type(distribution), intent(inout) :: dist_global ! global distribution object | ||
1645 | 1145 | type(distribution), intent(inout) :: dist_spin(2) ! per-spin objects | ||
1646 | 1146 | |||
1647 | 1147 | ! Local variables | ||
1648 | 1148 | integer :: color, base_rank | ||
1649 | 1149 | integer :: npGlobal, npPerSpin | ||
1650 | 1150 | integer, allocatable, dimension(:) :: global_ranks_in_world | ||
1651 | 1151 | integer, allocatable, dimension(:) :: ranks_in_world ! should be 'spatial_ranks...' | ||
1652 | 1152 | integer, allocatable, dimension(:,:) :: ranks_in_World_Spin | ||
1653 | 1153 | integer :: global_group, Spatial_group | ||
1654 | 1154 | integer :: i, ispin, ierr | ||
1655 | 1155 | |||
1656 | 1156 | call MPI_Comm_Size(global_comm, npGlobal, ierr) | ||
1657 | 1157 | ! This distribution could be created by the caller... | ||
1658 | 1158 | allocate(global_ranks_in_world(npGlobal)) | ||
1659 | 1159 | global_ranks_in_world = (/ (i, i=0, npGlobal-1) /) | ||
1660 | 1160 | call newDistribution(dist_global,global_Comm,global_ranks_in_world, & | ||
1661 | 1161 | TYPE_BLOCK_CYCLIC,BlockSize,"global dist") | ||
1662 | 1162 | deallocate(global_ranks_in_world) | ||
1663 | 1163 | call MPI_Barrier(global_Comm,ierr) | ||
1664 | 1164 | |||
1665 | 1165 | ! Split the base communicator | ||
1666 | 1166 | call MPI_Comm_Rank(base_comm, base_rank, ierr) | ||
1667 | 1167 | ! "Row" communicator for independent operations on each spin | ||
1668 | 1168 | ! The name refers to "spatial" degrees of freedom. | ||
1669 | 1169 | color = mod(base_rank,n_spin) ! {0,1} for n_spin = 2, or {0} for n_spin = 1 | ||
1670 | 1170 | call MPI_Comm_Split(base_comm, color, base_rank, Spatial_Comm, ierr) | ||
1671 | 1171 | ! "Column" communicator for spin reductions | ||
1672 | 1172 | color = base_rank/n_spin | ||
1673 | 1173 | call MPI_Comm_Split(base_comm, color, base_rank, Spin_Comm, ierr) | ||
1674 | 1174 | |||
1675 | 1175 | call MPI_Comm_Size(spatial_comm, npPerSpin, ierr) ! number of procs in each spin team | ||
1676 | 1176 | |||
1677 | 1177 | call MPI_Comm_Group(Spatial_Comm, Spatial_Group, Ierr) | ||
1678 | 1178 | allocate(ranks_in_world(npPerSpin)) | ||
1679 | 1179 | call MPI_Comm_Group(global_comm, Global_Group, Ierr) | ||
1680 | 1180 | call MPI_Group_translate_ranks( Spatial_Group, npPerSpin, & | ||
1681 | 1181 | (/ (i,i=0,npPerSpin-1) /), & | ||
1682 | 1182 | Global_Group, ranks_in_world, ierr ) | ||
1683 | 1183 | |||
1684 | 1184 | call MPI_Group_Free(Spatial_Group, ierr) | ||
1685 | 1185 | call MPI_Group_Free(Global_Group, ierr) | ||
1686 | 1186 | |||
1687 | 1187 | allocate (ranks_in_World_Spin(npPerSpin,n_spin)) | ||
1688 | 1188 | ! We need everybody to have this information, as all nodes | ||
1689 | 1189 | ! are part of the global distribution side of the communication | ||
1690 | 1190 | ! (global_comm is the common-address space) | ||
1691 | 1191 | |||
1692 | 1192 | ! But note that this will tell only those in base_comm... | ||
1693 | 1193 | ! This routine might not be the end of the story for cascading splits | ||
1694 | 1194 | ! (k-points and spin) | ||
1695 | 1195 | ! We might need an extra 'broadcast' over the k-point 'column' comm. | ||
1696 | 1196 | call MPI_AllGather(ranks_in_world,npPerSpin,MPI_integer,& | ||
1697 | 1197 | Ranks_in_World_Spin(1,1),npPerSpin, & | ||
1698 | 1198 | MPI_integer,Spin_Comm,ierr) | ||
1699 | 1199 | |||
1700 | 1200 | ! Create distributions known to all nodes (again, those in base_comm) | ||
1701 | 1201 | do ispin = 1, n_spin | ||
1702 | 1202 | call newDistribution(dist_spin(ispin), global_Comm, & | ||
1703 | 1203 | Ranks_in_World_Spin(:,ispin), & | ||
1704 | 1204 | TYPE_BLOCK_CYCLIC, blockSize, "SPATIAL dist") | ||
1705 | 1205 | enddo | ||
1706 | 1206 | deallocate(ranks_in_world,Ranks_in_World_Spin) | ||
1707 | 1207 | call MPI_Barrier(global_Comm,ierr) | ||
1708 | 1208 | |||
1709 | 1209 | end subroutine get_spin_comms_and_dists | ||
1710 | 1210 | |||
1711 | 1211 | #endif /* SIESTA__ELSI */ | ||
1712 | 1212 | |||
1713 | 1213 | #if SIESTA__ELSI || SIESTA__PEXSI | ||
1714 | 1214 | |||
1715 | 1215 | subroutine elsi_complex_solver(iscf, n_basis, n_basis_l, n_spin, nnz_l, numh, row_ptr, & | ||
1716 | 1216 | col_idx, qtot, temp, ham, ovlp, dm, edm, ef, ets, & | ||
1717 | 1217 | nkpnt, kpt_n, kpt, weight, kpt_comm, Get_EDM_Only) | ||
1718 | 1218 | |||
1719 | 1219 | use m_mpi_utils, only: globalize_sum | ||
1720 | 1220 | use parallel, only: BlockSize | ||
1721 | 1221 | #ifdef MPI | ||
1722 | 1222 | use mpi_siesta | ||
1723 | 1223 | #endif | ||
1724 | 1224 | use class_Distribution | ||
1725 | 1225 | use m_redist_spmatrix, only: aux_matrix, redistribute_spmatrix | ||
1726 | 1226 | use alloc | ||
1727 | 1227 | use m_mpi_utils, only: globalize_sum | ||
1728 | 1228 | |||
1729 | 1229 | implicit none | ||
1730 | 1230 | |||
1731 | 1231 | integer, intent(in) :: iscf ! SCF step counter | ||
1732 | 1232 | integer, intent(in) :: n_basis ! Global basis | ||
1733 | 1233 | integer, intent(in) :: n_basis_l ! Local basis | ||
1734 | 1234 | integer, intent(in) :: n_spin | ||
1735 | 1235 | integer, intent(in) :: nnz_l ! Local nonzero | ||
1736 | 1236 | integer, intent(in), target :: numh(n_basis_l) | ||
1737 | 1237 | integer, intent(in) :: row_ptr(n_basis_l) | ||
1738 | 1238 | integer, intent(in), target :: col_idx(nnz_l) | ||
1739 | 1239 | real(dp), intent(in) :: qtot | ||
1740 | 1240 | real(dp), intent(in) :: temp | ||
1741 | 1241 | complex(dp), intent(inout), target :: ham(nnz_l,n_spin) | ||
1742 | 1242 | complex(dp), intent(inout), target :: ovlp(nnz_l) | ||
1743 | 1243 | complex(dp), intent(out) :: dm(nnz_l,n_spin) | ||
1744 | 1244 | complex(dp), intent(out) :: edm(nnz_l,n_spin) | ||
1745 | 1245 | real(dp), intent(out) :: ef ! Fermi energy | ||
1746 | 1246 | real(dp), intent(out) :: ets ! Entropy/k, dimensionless | ||
1747 | 1247 | integer, intent(in) :: nkpnt ! number of k-points | ||
1748 | 1248 | integer, intent(in) :: kpt_n | ||
1749 | 1249 | real(dp), intent(in) :: kpt(3:) | ||
1750 | 1250 | real(dp), intent(in) :: weight | ||
1751 | 1251 | integer, intent(in) :: kpt_comm | ||
1752 | 1252 | |||
1753 | 1253 | integer :: ierr | ||
1754 | 1254 | integer :: n_state | ||
1755 | 1255 | integer :: nnz_g | ||
1756 | 1256 | |||
1757 | 1257 | real(dp) :: energy | ||
1758 | 1258 | |||
1759 | 1259 | integer, allocatable, dimension(:) :: row_ptr2 | ||
1760 | 1260 | |||
1761 | 1261 | integer :: elsi_Spatial_comm, elsi_Spin_comm | ||
1762 | 1262 | |||
1763 | 1263 | type(distribution) :: dist_global | ||
1764 | 1264 | type(distribution) :: dist_spin(2) | ||
1765 | 1265 | |||
1766 | 1266 | type(aux_matrix) :: pkg_global, pkg_spin ! Packages for transfer | ||
1767 | 1267 | |||
1768 | 1268 | integer :: my_spin | ||
1769 | 1269 | |||
1770 | 1270 | integer :: my_no_l | ||
1771 | 1271 | integer :: my_nnz_l | ||
1772 | 1272 | integer :: my_nnz | ||
1773 | 1273 | integer, pointer :: my_row_ptr2(:) => null() | ||
1774 | 1274 | integer :: i, ih, ispin, spin_rank, global_rank | ||
1775 | 1275 | real(dp) :: ets_spin | ||
1776 | 1276 | |||
1777 | 1277 | integer, pointer :: my_col_idx(:) | ||
1778 | 1278 | complex(dp), pointer :: my_S(:) | ||
1779 | 1279 | complex(dp), pointer :: my_H(:) | ||
1780 | 1280 | complex(dp), pointer :: my_DM(:) => null() | ||
1781 | 1281 | complex(dp), pointer :: my_EDM(:) => null() | ||
1782 | 1282 | |||
1783 | 1283 | integer :: date_stamp | ||
1784 | 1284 | |||
1785 | 1285 | logical :: Get_EDM_Only | ||
1786 | 1286 | |||
1787 | 1287 | external :: timer | ||
1788 | 1288 | |||
1789 | 1289 | #ifndef MPI | ||
1790 | 1290 | call die("This ELSI solver interface needs MPI") | ||
1791 | 1291 | #endif | ||
1792 | 1292 | |||
1793 | 1293 | call timer("elsi-complex-solver", 1) | ||
1794 | 1294 | |||
1795 | 1295 | ! Initialization | ||
1796 | 1296 | if (iscf == 1) then | ||
1797 | 1297 | |||
1798 | 1298 | ! Get ELSI options | ||
1799 | 1299 | call elsi_get_opts() | ||
1800 | 1300 | |||
1801 | 1301 | ! Number of states to solve when calling an eigensolver | ||
1802 | 1302 | n_state = min(n_basis, n_basis/2+5) | ||
1803 | 1303 | |||
1804 | 1304 | ! Now we have all ingredients to initialize ELSI | ||
1805 | 1305 | call elsi_init(elsi_h, which_solver, MULTI_PROC, SIESTA_CSC, n_basis, & | ||
1806 | 1306 | qtot, n_state) | ||
1807 | 1307 | |||
1808 | 1308 | ! Output | ||
1809 | 1309 | call elsi_set_output(elsi_h, out_level) | ||
1810 | 1310 | call elsi_set_output_log(elsi_h, out_json) | ||
1811 | 1311 | call elsi_set_write_unit(elsi_h, 6) | ||
1812 | 1312 | |||
1813 | 1313 | ! Broadening | ||
1814 | 1314 | call elsi_set_mu_broaden_scheme(elsi_h, which_broad) | ||
1815 | 1315 | call elsi_set_mu_broaden_width(elsi_h, temp) | ||
1816 | 1316 | call elsi_set_mu_mp_order(elsi_h, mp_order) | ||
1817 | 1317 | |||
1818 | 1318 | ! Solver settings | ||
1819 | 1319 | call elsi_set_elpa_solver(elsi_h, elpa_flavor) | ||
1820 | 1320 | |||
1821 | 1321 | call elsi_set_omm_flavor(elsi_h, omm_flavor) | ||
1822 | 1322 | call elsi_set_omm_n_elpa(elsi_h, omm_n_elpa) | ||
1823 | 1323 | call elsi_set_omm_tol(elsi_h, omm_tol) | ||
1824 | 1324 | |||
1825 | 1325 | if (pexsi_tasks_per_pole /= ELSI_NOT_SET) then | ||
1826 | 1326 | call elsi_set_pexsi_np_per_pole(elsi_h, pexsi_tasks_per_pole) | ||
1827 | 1327 | end if | ||
1828 | 1328 | |||
1829 | 1329 | call elsi_set_pexsi_np_symbo(elsi_h, pexsi_tasks_symbolic) | ||
1830 | 1330 | call elsi_set_pexsi_temp(elsi_h, temp) | ||
1831 | 1331 | ! call elsi_set_pexsi_gap(elsi_h, gap) | ||
1832 | 1332 | ! call elsi_set_pexsi_delta_e(elsi_h, delta_e) | ||
1833 | 1333 | call elsi_set_pexsi_mu_min(elsi_h, -10.0_dp) | ||
1834 | 1334 | call elsi_set_pexsi_mu_max(elsi_h, 10.0_dp) | ||
1835 | 1335 | |||
1836 | 1336 | if (sips_n_slice /= ELSI_NOT_SET) then | ||
1837 | 1337 | call elsi_set_sips_n_slice(elsi_h, sips_n_slice) | ||
1838 | 1338 | end if | ||
1839 | 1339 | |||
1840 | 1340 | call elsi_set_sips_n_elpa(elsi_h, sips_n_elpa) | ||
1841 | 1341 | call elsi_set_sips_interval(elsi_h, -10.0_dp, 10.0_dp) | ||
1842 | 1342 | |||
1843 | 1343 | call elsi_set_ntpoly_method(elsi_h, ntpoly_method) | ||
1844 | 1344 | call elsi_set_ntpoly_filter(elsi_h, ntpoly_filter) | ||
1845 | 1345 | call elsi_set_ntpoly_tol(elsi_h, ntpoly_tol) | ||
1846 | 1346 | |||
1847 | 1347 | endif ! iscf == 1 | ||
1848 | 1348 | |||
1849 | 1349 | !print *, global_rank, "| ", " Entering elsi_complex_solver" | ||
1850 | 1350 | |||
1851 | 1351 | if (n_spin == 1) then | ||
1852 | 1352 | |||
1853 | 1353 | ! Sparsity pattern | ||
1854 | 1354 | call globalize_sum(nnz_l, nnz_g, comm=kpt_comm) | ||
1855 | 1355 | |||
1856 | 1356 | allocate(row_ptr2(n_basis_l+1)) | ||
1857 | 1357 | row_ptr2(1:n_basis_l) = row_ptr(1:n_basis_l)+1 | ||
1858 | 1358 | row_ptr2(n_basis_l+1) = nnz_l+1 | ||
1859 | 1359 | |||
1860 | 1360 | call elsi_set_csc(elsi_h, nnz_g, nnz_l, n_basis_l, col_idx, row_ptr2) | ||
1861 | 1361 | deallocate(row_ptr2) | ||
1862 | 1362 | |||
1863 | 1363 | call elsi_set_csc_blk(elsi_h, BlockSize) | ||
1864 | 1364 | call elsi_set_kpoint(elsi_h, nkpnt, kpt_n, weight) | ||
1865 | 1365 | call elsi_set_mpi(elsi_h, kpt_comm) | ||
1866 | 1366 | call elsi_set_mpi_global(elsi_h, elsi_global_comm) | ||
1867 | 1367 | |||
1868 | 1368 | else | ||
1869 | 1369 | |||
1870 | 1370 | call mpi_comm_rank( elsi_global_Comm, global_rank, ierr ) | ||
1871 | 1371 | |||
1872 | 1372 | ! MPI logic for spin polarization | ||
1873 | 1373 | |||
1874 | 1374 | ! Split the communicator in spins and get distribution objects | ||
1875 | 1375 | ! for the data redistribution needed | ||
1876 | 1376 | ! Note that dist_spin is an array | ||
1877 | 1377 | call get_spin_comms_and_dists(kpt_comm,kpt_comm, & !! **** kpt_comm as global? | ||
1878 | 1378 | blocksize, n_spin, & | ||
1879 | 1379 | dist_global,dist_spin, elsi_spatial_comm, elsi_spin_comm) | ||
1880 | 1380 | |||
1881 | 1381 | ! Find out which spin team we are in, and tag the spin we work on | ||
1882 | 1382 | call mpi_comm_rank( elsi_Spin_Comm, spin_rank, ierr ) | ||
1883 | 1383 | my_spin = spin_rank+1 ! {1,2} | ||
1884 | 1384 | |||
1885 | 1385 | !print *, global_rank, "| ", "spin ", my_spin, " After spin splitting" | ||
1886 | 1386 | |||
1887 | 1387 | ! This is done serially, each time filling one spin set | ||
1888 | 1388 | ! Note that **all processes** need to have the same pkg_global | ||
1889 | 1389 | |||
1890 | 1390 | do ispin = 1, n_spin | ||
1891 | 1391 | |||
1892 | 1392 | ! Load pkg_global data package | ||
1893 | 1393 | pkg_global%norbs = n_basis | ||
1894 | 1394 | pkg_global%no_l = n_basis_l | ||
1895 | 1395 | pkg_global%nnzl = nnz_l | ||
1896 | 1396 | pkg_global%numcols => numh | ||
1897 | 1397 | pkg_global%cols => col_idx | ||
1898 | 1398 | |||
1899 | 1399 | allocate(pkg_global%complex_vals(2)) | ||
1900 | 1400 | ! Link the vals items to the appropriate arrays (no extra memory here) | ||
1901 | 1401 | pkg_global%complex_vals(1)%data => ovlp(:) | ||
1902 | 1402 | ! Note that we *cannot* say => ham(:,my_spin) | ||
1903 | 1403 | ! and avoid the sequential loop, as then half the processors will send | ||
1904 | 1404 | ! the information for 'spin up' and the other half the information for 'spin down', | ||
1905 | 1405 | ! which is *not* what we want. | ||
1906 | 1406 | pkg_global%complex_vals(2)%data => ham(:,ispin) | ||
1907 | 1407 | |||
1908 | 1408 | call timer("redist_orbs_fwd", 1) | ||
1909 | 1409 | |||
1910 | 1410 | ! We are doing the transfers sequentially. One spin team is | ||
1911 | 1411 | ! 'idle' (in the receiving side) in each pass, as the dist_spin(ispin) distribution | ||
1912 | 1412 | ! does not involve them. | ||
1913 | 1413 | |||
1914 | 1414 | call redistribute_spmatrix(n_basis,pkg_global,dist_global, & | ||
1915 | 1415 | pkg_spin,dist_spin(ispin),kpt_Comm) | ||
1916 | 1416 | |||
1917 | 1417 | call timer("redist_orbs_fwd", 2) | ||
1918 | 1418 | |||
1919 | 1419 | if (my_spin == ispin) then ! Each team gets their own data | ||
1920 | 1420 | |||
1921 | 1421 | !nrows = pkg_spin%norbs ! or simply 'norbs' | ||
1922 | 1422 | my_no_l = pkg_spin%no_l | ||
1923 | 1423 | my_nnz_l = pkg_spin%nnzl | ||
1924 | 1424 | call MPI_AllReduce(my_nnz_l,my_nnz,1,MPI_integer,MPI_sum,elsi_Spatial_Comm,ierr) | ||
1925 | 1425 | ! generate off-by-one row pointer | ||
1926 | 1426 | call re_alloc(my_row_ptr2,1,my_no_l+1,"my_row_ptr2","elsi_solver") | ||
1927 | 1427 | my_row_ptr2(1) = 1 | ||
1928 | 1428 | do ih = 1,my_no_l | ||
1929 | 1429 | my_row_ptr2(ih+1) = my_row_ptr2(ih) + pkg_spin%numcols(ih) | ||
1930 | 1430 | enddo | ||
1931 | 1431 | |||
1932 | 1432 | my_col_idx => pkg_spin%cols | ||
1933 | 1433 | my_S => pkg_spin%complex_vals(1)%data | ||
1934 | 1434 | my_H => pkg_spin%complex_vals(2)%data | ||
1935 | 1435 | |||
1936 | 1436 | call re_alloc(my_DM,1,my_nnz_l,"my_DM","elsi_solver") | ||
1937 | 1437 | call re_alloc(my_EDM,1,my_nnz_l,"my_EDM","elsi_solver") | ||
1938 | 1438 | endif | ||
1939 | 1439 | |||
1940 | 1440 | ! Clean pkg_global | ||
1941 | 1441 | nullify(pkg_global%complex_vals(1)%data) | ||
1942 | 1442 | nullify(pkg_global%complex_vals(2)%data) | ||
1943 | 1443 | deallocate(pkg_global%complex_vals) | ||
1944 | 1444 | nullify(pkg_global%numcols) | ||
1945 | 1445 | nullify(pkg_global%cols) | ||
1946 | 1446 | |||
1947 | 1447 | enddo | ||
1948 | 1448 | |||
1949 | 1449 | !print *, global_rank, "| ", "spin ", my_spin, "Done spin transfers" | ||
1950 | 1450 | |||
1951 | 1451 | call elsi_set_csc(elsi_h, my_nnz, my_nnz_l, my_no_l, my_col_idx, my_row_ptr2) | ||
1952 | 1452 | call de_alloc(my_row_ptr2,"my_row_ptr2","elsi_solver") | ||
1953 | 1453 | |||
1954 | 1454 | call elsi_set_csc_blk(elsi_h, BlockSize) | ||
1955 | 1455 | call elsi_set_spin(elsi_h, n_spin, my_spin) | ||
1956 | 1456 | call elsi_set_kpoint(elsi_h, nkpnt, kpt_n, weight) | ||
1957 | 1457 | call elsi_set_mpi(elsi_h, elsi_Spatial_comm) | ||
1958 | 1458 | call elsi_set_mpi_global(elsi_h, elsi_global_comm) | ||
1959 | 1459 | |||
1960 | 1460 | endif ! n_spin | ||
1961 | 1461 | |||
1962 | 1462 | call timer("elsi-solver", 1) | ||
1963 | 1463 | |||
1964 | 1464 | !print *, global_rank, "| ", "About to call elsi_dm" | ||
1965 | 1465 | if (n_spin == 1) then | ||
1966 | 1466 | if (.not.Get_EDM_Only) then | ||
1967 | 1467 | call elsi_dm_complex_sparse(elsi_h, ham, ovlp, DM, energy) | ||
1968 | 1468 | call elsi_get_entropy(elsi_h, ets) | ||
1969 | 1469 | else | ||
1970 | 1470 | call elsi_get_edm_complex_sparse(elsi_h, EDM) | ||
1971 | 1471 | endif | ||
1972 | 1472 | else | ||
1973 | 1473 | ! Solve DM, and get (at every step for now) EDM, Fermi energy, and entropy | ||
1974 | 1474 | ! Energy is already summed over spins | ||
1975 | 1475 | if (.not.Get_EDM_Only) then | ||
1976 | 1476 | call elsi_dm_complex_sparse(elsi_h, my_H, my_S, my_DM, energy) | ||
1977 | 1477 | !... but we still need to sum the entropy over spins | ||
1978 | 1478 | call elsi_get_entropy(elsi_h, ets_spin) | ||
1979 | 1479 | else | ||
1980 | 1480 | call elsi_get_edm_complex_sparse(elsi_h, my_EDM) | ||
1981 | 1481 | endif | ||
1982 | 1482 | #ifdef SIESTA__ELSI__OLD_SPIN_CONVENTION | ||
1983 | 1483 | ! NOTE** | ||
1984 | 1484 | ! For ELSI versions before 2018-08-17 we still need to sum the entropy over spins | ||
1985 | 1485 | ! ... but to figure out the version is not trivial, as the relevant routines changed... | ||
1986 | 1486 | call globalize_sum(ets_spin, ets, comm=elsi_Spin_comm) | ||
1987 | 1487 | #else | ||
1988 | 1488 | ! If this gives an error, then your version of ELSI is old, and you should | ||
1989 | 1489 | ! be using the pre-processor symbol above | ||
1990 | 1490 | ! (This works because 'elsi_get_datestamp' was added just | ||
1991 | 1491 | ! around the same time as the spin-reduction-convention change) (Aug 17 vs Aug 21, 2018...) | ||
1992 | 1492 | ! If you are unlucky enough to have an ELSI version in between, get rid of it. | ||
1993 | 1493 | call elsi_get_datestamp(date_stamp) | ||
1994 | 1494 | #endif | ||
1995 | 1495 | ! And over kpoints?? -- not necessary, ever | ||
1996 | 1496 | endif | ||
1997 | 1497 | |||
1998 | 1498 | call elsi_get_mu(elsi_h, ef) | ||
1999 | 1499 | ets = ets/temp | ||
2000 | 1500 | |||
2001 | 1501 | ! Ef, energy, and ets are known to all nodes | ||
2002 | 1502 | |||
2003 | 1503 | call timer("elsi-solver", 2) | ||
2004 | 1504 | !print *, global_rank, "| ", "Done elsi_dm" | ||
2005 | 1505 | |||
2006 | 1506 | if ( n_spin == 2) then | ||
2007 | 1507 | ! Now we need to redistribute back | ||
2008 | 1508 | |||
2009 | 1509 | do ispin = 1, n_spin | ||
2010 | 1510 | |||
2011 | 1511 | if (my_spin == ispin) then | ||
2012 | 1512 | ! Prepare pkg_spin to transfer the right spin information | ||
2013 | 1513 | ! The other fields (numcols, cols) are the same and are still there | ||
2014 | 1514 | ! Deallocate my_S and my_H | ||
2015 | 1515 | call de_alloc(pkg_spin%complex_vals(1)%data,"pkg_spin%vals(1)%data","elsi_solver") | ||
2016 | 1516 | call de_alloc(pkg_spin%complex_vals(2)%data,"pkg_spin%vals(2)%data","elsi_solver") | ||
2017 | 1517 | |||
2018 | 1518 | pkg_spin%complex_vals(1)%data => my_DM(1:my_nnz_l) | ||
2019 | 1519 | pkg_spin%complex_vals(2)%data => my_EDM(1:my_nnz_l) | ||
2020 | 1520 | |||
2021 | 1521 | endif | ||
2022 | 1522 | |||
2023 | 1523 | ! pkg_global is clean now | ||
2024 | 1524 | call timer("redist_orbs_bck", 1) | ||
2025 | 1525 | call redistribute_spmatrix(n_basis,pkg_spin,dist_spin(ispin) & | ||
2026 | 1526 | ,pkg_global,dist_global,kpt_Comm) | ||
2027 | 1527 | call timer("redist_orbs_bck", 2) | ||
2028 | 1528 | |||
2029 | 1529 | ! Clean pkg_spin | ||
2030 | 1530 | if (my_spin == ispin) then | ||
2031 | 1531 | ! Each team deallocates during "its" spin cycle | ||
2032 | 1532 | call de_alloc(my_DM, "my_DM", "elsi_solver") | ||
2033 | 1533 | call de_alloc(my_EDM,"my_EDM","elsi_solver") | ||
2034 | 1534 | |||
2035 | 1535 | nullify(pkg_spin%complex_vals(1)%data) ! formerly pointing to DM | ||
2036 | 1536 | nullify(pkg_spin%complex_vals(2)%data) ! formerly pointing to EDM | ||
2037 | 1537 | deallocate(pkg_spin%complex_vals) | ||
2038 | 1538 | ! allocated in the direct transfer | ||
2039 | 1539 | call de_alloc(pkg_spin%numcols,"pkg_spin%numcols","elsi_solver") | ||
2040 | 1540 | call de_alloc(pkg_spin%cols, "pkg_spin%cols", "elsi_solver") | ||
2041 | 1541 | endif | ||
2042 | 1542 | |||
2043 | 1543 | |||
2044 | 1544 | ! In future, pkg_global%vals(1,2) could be pointing to DM and EDM, | ||
2045 | 1545 | ! and the 'redistribute' routine check whether the vals arrays are | ||
2046 | 1546 | ! associated, to use them instead of allocating them. | ||
2047 | 1547 | DM(:,ispin) = pkg_global%complex_vals(1)%data(:) | ||
2048 | 1548 | EDM(:,ispin) = pkg_global%complex_vals(2)%data(:) | ||
2049 | 1549 | ! Check no_l | ||
2050 | 1550 | if (n_basis_l /= pkg_global%no_l) then | ||
2051 | 1551 | call die("Mismatch in no_l") | ||
2052 | 1552 | endif | ||
2053 | 1553 | ! Check listH | ||
2054 | 1554 | if (any(col_idx(:) /= pkg_global%cols(:))) then | ||
2055 | 1555 | call die("Mismatch in listH") | ||
2056 | 1556 | endif | ||
2057 | 1557 | |||
2058 | 1558 | ! Clean pkg_global | ||
2059 | 1559 | ! allocated by the transfer routine, but we did not actually | ||
2060 | 1560 | ! look at them | ||
2061 | 1561 | call de_alloc(pkg_global%numcols,"pkg_global%numcols","elsi_solver") | ||
2062 | 1562 | call de_alloc(pkg_global%cols, "pkg_global%cols", "elsi_solver") | ||
2063 | 1563 | |||
2064 | 1564 | call de_alloc(pkg_global%complex_vals(1)%data,"pkg_global%vals(1)%data","elsi_solver") | ||
2065 | 1565 | call de_alloc(pkg_global%complex_vals(2)%data,"pkg_global%vals(2)%data","elsi_solver") | ||
2066 | 1566 | deallocate(pkg_global%complex_vals) | ||
2067 | 1567 | |||
2068 | 1568 | enddo | ||
2069 | 1569 | |||
2070 | 1570 | call MPI_Comm_Free(elsi_Spatial_comm, ierr) | ||
2071 | 1571 | call MPI_Comm_Free(elsi_Spin_comm, ierr) | ||
2072 | 1572 | |||
2073 | 1573 | else ! n_spin == 1 | ||
2074 | 1574 | |||
2075 | 1575 | ! Nothing else to do | ||
2076 | 1576 | endif | ||
2077 | 1577 | |||
2078 | 1578 | call timer("elsi-complex-solver", 2) | ||
2079 | 1579 | |||
2080 | 1580 | |||
2081 | 1581 | end subroutine elsi_complex_solver | ||
2082 | 1582 | |||
2083 | 1583 | subroutine transpose(a,b) | ||
2084 | 1584 | real(dp), intent(in) :: a(:,:) | ||
2085 | 1585 | real(dp), allocatable, intent(out) :: b(:,:) | ||
2086 | 1586 | |||
2087 | 1587 | integer n, m, i, j | ||
2088 | 1588 | |||
2089 | 1589 | n = size(a,1) | ||
2090 | 1590 | m = size(a,2) | ||
2091 | 1591 | allocate(b(m,n)) | ||
2092 | 1592 | do i = 1, n | ||
2093 | 1593 | do j = 1, m | ||
2094 | 1594 | b(j, i) = a(i, j) | ||
2095 | 1595 | enddo | ||
2096 | 1596 | enddo | ||
2097 | 1597 | end subroutine transpose | ||
2098 | 1598 | |||
2099 | 1599 | # endif | ||
2100 | 1600 | |||
2101 | 1601 | end module m_elsi_interface | ||
2102 | 0 | 1602 | ||
2103 | === modified file 'Src/m_ncdf_siesta.F90' | |||
2104 | --- Src/m_ncdf_siesta.F90 2019-01-04 07:01:47 +0000 | |||
2105 | +++ Src/m_ncdf_siesta.F90 2019-01-16 11:00:58 +0000 | |||
2106 | @@ -51,6 +51,7 @@ | |||
2107 | 51 | use siesta_options, only: SOLVE_DIAGON, SOLVE_ORDERN | 51 | use siesta_options, only: SOLVE_DIAGON, SOLVE_ORDERN |
2108 | 52 | use siesta_options, only: SOLVE_MINIM, SOLVE_TRANSI | 52 | use siesta_options, only: SOLVE_MINIM, SOLVE_TRANSI |
2109 | 53 | use siesta_options, only: SOLVE_PEXSI | 53 | use siesta_options, only: SOLVE_PEXSI |
2110 | 54 | use siesta_options, only: SOLVE_ELSI | ||
2111 | 54 | use siesta_options, only: savehs | 55 | use siesta_options, only: savehs |
2112 | 55 | use siesta_options, only: fixspin, total_spin | 56 | use siesta_options, only: fixspin, total_spin |
2113 | 56 | use siesta_options, only: ia1, ia2, dx ! FC information | 57 | use siesta_options, only: ia1, ia2, dx ! FC information |
2114 | @@ -361,6 +362,8 @@ | |||
2115 | 361 | dic = dic//('method'.kv.'transiesta') | 362 | dic = dic//('method'.kv.'transiesta') |
2116 | 362 | else if ( isolve == SOLVE_PEXSI ) then | 363 | else if ( isolve == SOLVE_PEXSI ) then |
2117 | 363 | dic = dic//('method'.kv.'pexsi') | 364 | dic = dic//('method'.kv.'pexsi') |
2118 | 365 | else if ( isolve == SOLVE_ELSI ) then | ||
2119 | 366 | dic = dic//('method'.kv.'elsi') | ||
2120 | 364 | end if | 367 | end if |
2121 | 365 | 368 | ||
2122 | 366 | ! Attributes are collective | 369 | ! Attributes are collective |
2123 | 367 | 370 | ||
2124 | === modified file 'Src/m_pexsi_dos.F90' | |||
2125 | --- Src/m_pexsi_dos.F90 2016-08-04 09:03:32 +0000 | |||
2126 | +++ Src/m_pexsi_dos.F90 2019-01-16 11:00:58 +0000 | |||
2127 | @@ -99,7 +99,7 @@ | |||
2128 | 99 | ! | 99 | ! |
2129 | 100 | ! Our global communicator is a duplicate of the passed communicator | 100 | ! Our global communicator is a duplicate of the passed communicator |
2130 | 101 | ! | 101 | ! |
2132 | 102 | call MPI_Comm_Dup(true_MPI_Comm_World, World_Comm, ierr) | 102 | call MPI_Comm_Dup(mpi_comm_dft, World_Comm, ierr) |
2133 | 103 | call mpi_comm_rank( World_Comm, mpirank, ierr ) | 103 | call mpi_comm_rank( World_Comm, mpirank, ierr ) |
2134 | 104 | 104 | ||
2135 | 105 | call timer("pexsi_dos", 1) | 105 | call timer("pexsi_dos", 1) |
2136 | 106 | 106 | ||
2137 | === modified file 'Src/m_pexsi_driver.F90' | |||
2138 | --- Src/m_pexsi_driver.F90 2016-08-04 09:03:32 +0000 | |||
2139 | +++ Src/m_pexsi_driver.F90 2019-01-16 11:00:58 +0000 | |||
2140 | @@ -123,7 +123,7 @@ | |||
2141 | 123 | ! | 123 | ! |
2142 | 124 | ! Our global communicator is a duplicate of the passed communicator | 124 | ! Our global communicator is a duplicate of the passed communicator |
2143 | 125 | ! | 125 | ! |
2145 | 126 | call MPI_Comm_Dup(true_MPI_Comm_World, World_Comm, ierr) | 126 | call MPI_Comm_Dup(MPI_Comm_DFT, World_Comm, ierr) |
2146 | 127 | call mpi_comm_rank( World_Comm, mpirank, ierr ) | 127 | call mpi_comm_rank( World_Comm, mpirank, ierr ) |
2147 | 128 | 128 | ||
2148 | 129 | ! NOTE: fdf calls will assign values to the whole processor set, | 129 | ! NOTE: fdf calls will assign values to the whole processor set, |
2149 | 130 | 130 | ||
2150 | === modified file 'Src/m_pexsi_local_dos.F90' | |||
2151 | --- Src/m_pexsi_local_dos.F90 2018-04-27 09:35:52 +0000 | |||
2152 | +++ Src/m_pexsi_local_dos.F90 2019-01-16 11:00:58 +0000 | |||
2153 | @@ -144,7 +144,7 @@ | |||
2154 | 144 | ! | 144 | ! |
2155 | 145 | ! Our global communicator is a duplicate of the passed communicator | 145 | ! Our global communicator is a duplicate of the passed communicator |
2156 | 146 | ! | 146 | ! |
2158 | 147 | call MPI_Comm_Dup(true_MPI_Comm_World, World_Comm, ierr) | 147 | call MPI_Comm_Dup(MPI_Comm_DFT, World_Comm, ierr) |
2159 | 148 | call mpi_comm_rank( World_Comm, mpirank, ierr ) | 148 | call mpi_comm_rank( World_Comm, mpirank, ierr ) |
2160 | 149 | 149 | ||
2161 | 150 | call timer("pexsi-ldos", 1) | 150 | call timer("pexsi-ldos", 1) |
2162 | 151 | 151 | ||
2163 | === modified file 'Src/m_redist_spmatrix.F90' | |||
2164 | --- Src/m_redist_spmatrix.F90 2016-09-14 09:35:16 +0000 | |||
2165 | +++ Src/m_redist_spmatrix.F90 2019-01-16 11:00:58 +0000 | |||
2166 | @@ -1,18 +1,44 @@ | |||
2169 | 1 | 1 | ! | |
2170 | 2 | ! --- Tangled code | 2 | ! This module implements functionality to change the MPI parallel |
2171 | 3 | ! distribution of a sparse matrix stored in the modified | ||
2172 | 4 | ! block-compressed form used in Siesta. | ||
2173 | 5 | ! | ||
2174 | 6 | ! The immediate goal is to exchange matrices between Siesta and the | ||
2175 | 7 | ! PEXSI library. Siesta uses a "block-cyclic" distribution over | ||
2176 | 8 | ! N_Siesta processors, and PEXSI uses a simple "greedy" blocked | ||
2177 | 9 | ! distribution on each pole-group, with npPerPole processors. The | ||
2178 | 10 | ! code works in principle with any distribution (subject to some | ||
2179 | 11 | ! conditions spelled out below). The source and target process groups | ||
2180 | 12 | ! are arbitrary, and can overlap. In fact, in SIESTA-PEXSI they | ||
2181 | 13 | ! *will* overlap, as otherwise we would need extra processors for the | ||
2182 | 14 | ! Siesta operations. This overlap forces the code to re-invent much | ||
2183 | 15 | ! of the logic involved in MPI intercommunicators, which cannot be | ||
2184 | 16 | ! created for non-disjoint groups. | ||
2185 | 17 | |||
2186 | 18 | ! Written by Alberto Garcia | ||
2187 | 19 | |||
2188 | 20 | ! --- Tangled code (using Org mode in emacs) | ||
2189 | 21 | ! Alas, the Org version is no longer maintained. | ||
2190 | 22 | ! | ||
2191 | 3 | module m_redist_spmatrix | 23 | module m_redist_spmatrix |
2193 | 4 | #ifdef SIESTA__PEXSI | 24 | #if defined (SIESTA__PEXSI) || defined (SIESTA__ELSI) |
2194 | 5 | implicit none | 25 | implicit none |
2195 | 26 | integer, parameter, private :: dp = selected_real_kind(10,100) | ||
2196 | 27 | |||
2197 | 28 | ! Some auxiliary derived types | ||
2198 | 29 | |||
2199 | 6 | type, public :: comm_t | 30 | type, public :: comm_t |
2200 | 7 | integer :: src, dst, i1, i2, nitems | 31 | integer :: src, dst, i1, i2, nitems |
2201 | 8 | end type comm_t | 32 | end type comm_t |
2205 | 9 | 33 | ||
2203 | 10 | integer, parameter, private :: dp = selected_real_kind(10,100) | ||
2204 | 11 | |||
2206 | 12 | type, public :: dp_pointer | 34 | type, public :: dp_pointer |
2207 | 13 | ! boxed array pointer type | 35 | ! boxed array pointer type |
2208 | 14 | real(dp), pointer :: data(:) => null() | 36 | real(dp), pointer :: data(:) => null() |
2209 | 15 | end type dp_pointer | 37 | end type dp_pointer |
2210 | 38 | type, public :: complex_dp_pointer | ||
2211 | 39 | ! boxed array pointer type | ||
2212 | 40 | complex(dp), pointer :: data(:) => null() | ||
2213 | 41 | end type complex_dp_pointer | ||
2214 | 16 | 42 | ||
2215 | 17 | type, public :: aux_matrix | 43 | type, public :: aux_matrix |
2216 | 18 | integer :: norbs = -1 | 44 | integer :: norbs = -1 |
2217 | @@ -20,14 +46,21 @@ | |||
2218 | 20 | integer :: nnzl = -1 | 46 | integer :: nnzl = -1 |
2219 | 21 | integer, pointer :: numcols(:) => null() | 47 | integer, pointer :: numcols(:) => null() |
2220 | 22 | integer, pointer :: cols(:) => null() | 48 | integer, pointer :: cols(:) => null() |
2222 | 23 | ! array of 1D pointers | 49 | ! arrays of 1D pointers |
2223 | 24 | type(dp_pointer), dimension(:), pointer :: vals(:) => null() | 50 | type(dp_pointer), dimension(:), pointer :: vals(:) => null() |
2224 | 51 | type(complex_dp_pointer), dimension(:), pointer :: complex_vals(:) => null() | ||
2225 | 25 | end type aux_matrix | 52 | end type aux_matrix |
2226 | 53 | |||
2227 | 54 | |||
2228 | 26 | public :: redistribute_spmatrix | 55 | public :: redistribute_spmatrix |
2229 | 56 | |||
2230 | 27 | CONTAINS | 57 | CONTAINS |
2231 | 58 | |||
2232 | 28 | subroutine redistribute_spmatrix(norbs,m1,dist1,m2,dist2,bridge_comm) | 59 | subroutine redistribute_spmatrix(norbs,m1,dist1,m2,dist2,bridge_comm) |
2233 | 29 | 60 | ||
2235 | 30 | use mpi | 61 | use mpi ! Note that this is fine, as we do not use any Siesta-specific |
2236 | 62 | ! parameter, such as a modified mpi_comm_world | ||
2237 | 63 | |||
2238 | 31 | use class_Distribution | 64 | use class_Distribution |
2239 | 32 | use alloc, only: re_alloc, de_alloc | 65 | use alloc, only: re_alloc, de_alloc |
2240 | 33 | 66 | ||
2241 | @@ -47,10 +80,11 @@ | |||
2242 | 47 | logical :: proc_in_set1, proc_in_set2 | 80 | logical :: proc_in_set1, proc_in_set2 |
2243 | 48 | integer :: ierr | 81 | integer :: ierr |
2244 | 49 | 82 | ||
2246 | 50 | integer :: i, io, g1, g2, j, nvals | 83 | integer :: i, io, g1, g2, j, nvals, nvals_complex |
2247 | 51 | integer :: comparison, n1, n2, c1, c2 | 84 | integer :: comparison, n1, n2, c1, c2 |
2248 | 52 | integer, parameter :: dp = selected_real_kind(10,100) | 85 | integer, parameter :: dp = selected_real_kind(10,100) |
2249 | 53 | real(dp), dimension(:), pointer :: data1 => null(), data2 => null() | 86 | real(dp), dimension(:), pointer :: data1 => null(), data2 => null() |
2250 | 87 | complex(dp), dimension(:), pointer :: cdata1 => null(), cdata2 => null() | ||
2251 | 54 | 88 | ||
2252 | 55 | integer, allocatable :: ranks1(:), ranks2(:) | 89 | integer, allocatable :: ranks1(:), ranks2(:) |
2253 | 56 | 90 | ||
2254 | @@ -109,10 +143,10 @@ | |||
2255 | 109 | proc_in_set1 = (myrank1 /= MPI_UNDEFINED) | 143 | proc_in_set1 = (myrank1 /= MPI_UNDEFINED) |
2256 | 110 | proc_in_set2 = (myrank2 /= MPI_UNDEFINED) | 144 | proc_in_set2 = (myrank2 /= MPI_UNDEFINED) |
2257 | 111 | 145 | ||
2262 | 112 | if (proc_in_set1 .or. proc_in_set2) then | 146 | ! if (proc_in_set1 .or. proc_in_set2) then |
2263 | 113 | print "(a,3i6,2l2)", "world_rank, rank1, rank2, ing1?, ing2?", myid, & | 147 | ! print "(a,3i6,2l2)", "world_rank, rank1, rank2, ing1?, ing2?", myid, & |
2264 | 114 | myrank1, myrank2, proc_in_set1, proc_in_set2 | 148 | ! myrank1, myrank2, proc_in_set1, proc_in_set2 |
2265 | 115 | endif | 149 | ! endif |
2266 | 116 | 150 | ||
2267 | 117 | ! Figure out the communication needs | 151 | ! Figure out the communication needs |
2268 | 118 | call analyze_comms() | 152 | call analyze_comms() |
2269 | @@ -130,10 +164,10 @@ | |||
2270 | 130 | call re_alloc(m2%numcols,1,m2%no_l,"m2%numcols","redistribute_spmatrix") | 164 | call re_alloc(m2%numcols,1,m2%no_l,"m2%numcols","redistribute_spmatrix") |
2271 | 131 | endif | 165 | endif |
2272 | 132 | 166 | ||
2274 | 133 | if (myid == 0) print *, "About to transfer numcols..." | 167 | ! if (myid == 0) print *, "About to transfer numcols..." |
2275 | 134 | call do_transfers_int(comms,m1%numcols,m2%numcols, & | 168 | call do_transfers_int(comms,m1%numcols,m2%numcols, & |
2276 | 135 | g1,g2,bridge_comm) | 169 | g1,g2,bridge_comm) |
2278 | 136 | if (myid == 0) print *, "Transferred numcols." | 170 | ! if (myid == 0) print *, "Transferred numcols." |
2279 | 137 | 171 | ||
2280 | 138 | ! We need to tell the processes in set 2 how many | 172 | ! We need to tell the processes in set 2 how many |
2281 | 139 | ! "vals" to expect. | 173 | ! "vals" to expect. |
2282 | @@ -143,12 +177,18 @@ | |||
2283 | 143 | else | 177 | else |
2284 | 144 | nvals = 0 | 178 | nvals = 0 |
2285 | 145 | endif | 179 | endif |
2286 | 180 | if (associated(m1%complex_vals)) then | ||
2287 | 181 | nvals_complex = size(m1%complex_vals) | ||
2288 | 182 | else | ||
2289 | 183 | nvals_complex = 0 | ||
2290 | 184 | endif | ||
2291 | 146 | endif | 185 | endif |
2292 | 147 | ! Now do a broadcast within bridge_comm, using as root one | 186 | ! Now do a broadcast within bridge_comm, using as root one |
2293 | 148 | ! process in the first set. Let's say the one with rank 0 | 187 | ! process in the first set. Let's say the one with rank 0 |
2294 | 149 | ! in g1, the first in the set, which will have rank=ranks1(1) | 188 | ! in g1, the first in the set, which will have rank=ranks1(1) |
2295 | 150 | ! in bridge_comm | 189 | ! in bridge_comm |
2296 | 151 | call MPI_Bcast(nvals,1,MPI_Integer,ranks1(1),bridge_comm,ierr) | 190 | call MPI_Bcast(nvals,1,MPI_Integer,ranks1(1),bridge_comm,ierr) |
2297 | 191 | call MPI_Bcast(nvals_complex,1,MPI_Integer,ranks1(1),bridge_comm,ierr) | ||
2298 | 152 | 192 | ||
2299 | 153 | ! Now we can figure out how many non-zeros there are | 193 | ! Now we can figure out how many non-zeros there are |
2300 | 154 | if (proc_in_set2) then | 194 | if (proc_in_set2) then |
2301 | @@ -163,6 +203,14 @@ | |||
2302 | 163 | enddo | 203 | enddo |
2303 | 164 | endif | 204 | endif |
2304 | 165 | 205 | ||
2305 | 206 | if (nvals_complex > 0) then | ||
2306 | 207 | allocate(m2%complex_vals(nvals_complex)) | ||
2307 | 208 | do j=1,nvals_complex | ||
2308 | 209 | call re_alloc(m2%complex_vals(j)%data,1,m2%nnzl, & | ||
2309 | 210 | "m2%complex_vals(j)%data","redistribute_spmatrix") | ||
2310 | 211 | enddo | ||
2311 | 212 | endif | ||
2312 | 213 | |||
2313 | 166 | endif | 214 | endif |
2314 | 167 | 215 | ||
2315 | 168 | ! Generate a new comms-structure with new start/count indexes | 216 | ! Generate a new comms-structure with new start/count indexes |
2316 | @@ -202,12 +250,12 @@ | |||
2317 | 202 | !!$ endif | 250 | !!$ endif |
2318 | 203 | !!$ enddo | 251 | !!$ enddo |
2319 | 204 | 252 | ||
2321 | 205 | if (myid == 0) print *, "About to transfer cols..." | 253 | ! if (myid == 0) print *, "About to transfer cols..." |
2322 | 206 | ! Transfer the cols arrays | 254 | ! Transfer the cols arrays |
2323 | 207 | call do_transfers_int(commsnnz,m1%cols,m2%cols, & | 255 | call do_transfers_int(commsnnz,m1%cols,m2%cols, & |
2324 | 208 | g1, g2, bridge_comm) | 256 | g1, g2, bridge_comm) |
2325 | 209 | 257 | ||
2327 | 210 | if (myid == 0) print *, "About to transfer values..." | 258 | ! if (myid == 0) print *, "About to transfer values..." |
2328 | 211 | ! Transfer the values arrays | 259 | ! Transfer the values arrays |
2329 | 212 | do j=1, nvals | 260 | do j=1, nvals |
2330 | 213 | if (proc_in_set1) data1 => m1%vals(j)%data | 261 | if (proc_in_set1) data1 => m1%vals(j)%data |
2331 | @@ -216,7 +264,17 @@ | |||
2332 | 216 | g1,g2,bridge_comm) | 264 | g1,g2,bridge_comm) |
2333 | 217 | enddo | 265 | enddo |
2334 | 218 | nullify(data1,data2) | 266 | nullify(data1,data2) |
2336 | 219 | if (myid == 0) print *, "Done transfers." | 267 | |
2337 | 268 | ! if (myid == 0) print *, "About to transfer complex values..." | ||
2338 | 269 | ! Transfer the values arrays | ||
2339 | 270 | do j=1, nvals_complex | ||
2340 | 271 | if (proc_in_set1) cdata1 => m1%complex_vals(j)%data | ||
2341 | 272 | if (proc_in_set2) cdata2 => m2%complex_vals(j)%data | ||
2342 | 273 | call do_transfers_complex_dp(commsnnz,cdata1,cdata2, & | ||
2343 | 274 | g1,g2,bridge_comm) | ||
2344 | 275 | enddo | ||
2345 | 276 | nullify(cdata1,cdata2) | ||
2346 | 277 | ! if (myid == 0) print *, "Done transfers." | ||
2347 | 220 | 278 | ||
2348 | 221 | deallocate(commsnnz) | 279 | deallocate(commsnnz) |
2349 | 222 | deallocate(comms) | 280 | deallocate(comms) |
2350 | @@ -312,9 +370,9 @@ | |||
2351 | 312 | if (myid == 0 .and. comms_not_printed) then | 370 | if (myid == 0 .and. comms_not_printed) then |
2352 | 313 | do i = 1, ncomms | 371 | do i = 1, ncomms |
2353 | 314 | c => comms(i) | 372 | c => comms(i) |
2357 | 315 | write(6,"(a,i5,a,2i5,2i7,i5)") & | 373 | ! write(6,"(a,i5,a,2i5,2i7,i5)") & |
2358 | 316 | "comm: ", i, " src, dst, i1, i2, n:", & | 374 | ! "comm: ", i, " src, dst, i1, i2, n:", & |
2359 | 317 | c%src, c%dst, c%i1, c%i2, c%nitems | 375 | ! c%src, c%dst, c%i1, c%i2, c%nitems |
2360 | 318 | enddo | 376 | enddo |
2361 | 319 | comms_not_printed = .false. | 377 | comms_not_printed = .false. |
2362 | 320 | endif | 378 | endif |
2363 | @@ -543,6 +601,114 @@ | |||
2364 | 543 | deallocate(local_reqR, local_reqS, statuses) | 601 | deallocate(local_reqR, local_reqS, statuses) |
2365 | 544 | 602 | ||
2366 | 545 | end subroutine do_transfers_dp | 603 | end subroutine do_transfers_dp |
2367 | 604 | !-------------------------------------------------- | ||
2368 | 605 | subroutine do_transfers_complex_dp(comms,data1,data2,g1,g2,bridge_comm) | ||
2369 | 606 | |||
2370 | 607 | use mpi | ||
2371 | 608 | integer, parameter :: dp = selected_real_kind(10,100) | ||
2372 | 609 | |||
2373 | 610 | type(comm_t), intent(in), target :: comms(:) | ||
2374 | 611 | complex(dp), dimension(:), pointer :: data1 | ||
2375 | 612 | complex(dp), dimension(:), pointer :: data2 | ||
2376 | 613 | integer, intent(in) :: g1 | ||
2377 | 614 | integer, intent(in) :: g2 | ||
2378 | 615 | integer, intent(in) :: bridge_comm | ||
2379 | 616 | |||
2380 | 617 | integer :: basegroup, nsize1, nsize2, ierr | ||
2381 | 618 | integer, allocatable :: comm_rank1(:), comm_rank2(:) | ||
2382 | 619 | |||
2383 | 620 | |||
2384 | 621 | integer :: ncomms | ||
2385 | 622 | integer :: i | ||
2386 | 623 | integer :: nrecvs_local, nsends_local | ||
2387 | 624 | integer, allocatable :: statuses(:,:), local_reqR(:), local_reqS(:) | ||
2388 | 625 | integer :: src_in_comm, dst_in_comm | ||
2389 | 626 | integer :: myrank1, myrank2, myid | ||
2390 | 627 | type(comm_t), pointer :: c | ||
2391 | 628 | |||
2392 | 629 | call MPI_Comm_Rank( bridge_comm, myid, ierr ) | ||
2393 | 630 | ! print *, "Entering transfer_complex_dp" | ||
2394 | 631 | ! print *, "rank, Associated data1: ", myid, associated(data1) | ||
2395 | 632 | ! print *, "rank, Associated data2: ", myid, associated(data2) | ||
2396 | 633 | |||
2397 | 634 | ! Find the rank correspondences, in case | ||
2398 | 635 | ! there is implicit renumbering at the time of group creation | ||
2399 | 636 | |||
2400 | 637 | call MPI_Comm_group( bridge_comm, basegroup, ierr ) | ||
2401 | 638 | call MPI_Group_Size( g1, nsize1, ierr ) | ||
2402 | 639 | call MPI_Group_Size( g2, nsize2, ierr ) | ||
2403 | 640 | allocate(comm_rank1(0:nsize1-1)) | ||
2404 | 641 | call MPI_Group_translate_ranks( g1, nsize1, (/ (i,i=0,nsize1-1) /), & | ||
2405 | 642 | basegroup, comm_rank1, ierr ) | ||
2406 | 643 | ! print "(a,10i3)", "Ranks of g1 in base group:", comm_rank1 | ||
2407 | 644 | allocate(comm_rank2(0:nsize2-1)) | ||
2408 | 645 | call MPI_Group_translate_ranks( g2, nsize2, (/ (i,i=0,nsize2-1) /), & | ||
2409 | 646 | basegroup, comm_rank2, ierr ) | ||
2410 | 647 | ! print "(a,10i3)", "Ranks of g2 in base group:", comm_rank2 | ||
2411 | 648 | |||
2412 | 649 | call mpi_group_rank(g1,myrank1,ierr) | ||
2413 | 650 | call mpi_group_rank(g2,myrank2,ierr) | ||
2414 | 651 | |||
2415 | 652 | ! Do the actual transfers. | ||
2416 | 653 | ! This version with non-blocking communications | ||
2417 | 654 | |||
2418 | 655 | ncomms = size(comms) | ||
2419 | 656 | |||
2420 | 657 | ! Some bookkeeping for the requests | ||
2421 | 658 | nrecvs_local = 0 | ||
2422 | 659 | nsends_local = 0 | ||
2423 | 660 | do i=1,ncomms | ||
2424 | 661 | c => comms(i) | ||
2425 | 662 | if (myrank2 == c%dst) then | ||
2426 | 663 | nrecvs_local = nrecvs_local + 1 | ||
2427 | 664 | endif | ||
2428 | 665 | if (myrank1 == c%src) then | ||
2429 | 666 | nsends_local = nsends_local + 1 | ||
2430 | 667 | endif | ||
2431 | 668 | enddo | ||
2432 | 669 | allocate(local_reqR(nrecvs_local)) | ||
2433 | 670 | allocate(local_reqS(nsends_local)) | ||
2434 | 671 | allocate(statuses(mpi_status_size,nrecvs_local)) | ||
2435 | 672 | |||
2436 | 673 | ! First, post the receives | ||
2437 | 674 | nrecvs_local = 0 | ||
2438 | 675 | do i=1,ncomms | ||
2439 | 676 | c => comms(i) | ||
2440 | 677 | if (myrank2 == c%dst) then | ||
2441 | 678 | nrecvs_local = nrecvs_local + 1 | ||
2442 | 679 | src_in_comm = comm_rank1(c%src) | ||
2443 | 680 | call MPI_irecv(data2(c%i2),c%nitems,MPI_Double_Complex,src_in_comm, & | ||
2444 | 681 | i,bridge_comm,local_reqR(nrecvs_local),ierr) | ||
2445 | 682 | endif | ||
2446 | 683 | enddo | ||
2447 | 684 | |||
2448 | 685 | ! Post the sends | ||
2449 | 686 | nsends_local = 0 | ||
2450 | 687 | do i=1,ncomms | ||
2451 | 688 | c => comms(i) | ||
2452 | 689 | if (myrank1 == c%src) then | ||
2453 | 690 | nsends_local = nsends_local + 1 | ||
2454 | 691 | dst_in_comm = comm_rank2(c%dst) | ||
2455 | 692 | call MPI_isend(data1(c%i1),c%nitems,MPI_Double_Complex,dst_in_comm, & | ||
2456 | 693 | i,bridge_comm,local_reqS(nsends_local),ierr) | ||
2457 | 694 | endif | ||
2458 | 695 | enddo | ||
2459 | 696 | |||
2460 | 697 | ! A former loop of waits can be substituted by a "waitall", | ||
2461 | 698 | ! with every processor keeping track of the actual number of | ||
2462 | 699 | ! requests in which it is involved. | ||
2463 | 700 | |||
2464 | 701 | ! Should we wait also on the sends? | ||
2465 | 702 | |||
2466 | 703 | call MPI_waitall(nrecvs_local, local_reqR, statuses, ierr) | ||
2467 | 704 | |||
2468 | 705 | |||
2469 | 706 | ! This barrier is needed, I think | ||
2470 | 707 | call MPI_Barrier(bridge_comm,ierr) | ||
2471 | 708 | |||
2472 | 709 | deallocate(local_reqR, local_reqS, statuses) | ||
2473 | 710 | |||
2474 | 711 | end subroutine do_transfers_complex_dp | ||
2475 | 546 | #endif | 712 | #endif |
2476 | 547 | end module m_redist_spmatrix | 713 | end module m_redist_spmatrix |
2477 | 548 | ! --- End of tangled code | 714 | ! --- End of tangled code |
2478 | 549 | 715 | ||
2479 | === modified file 'Src/parallel.F' | |||
2480 | --- Src/parallel.F 2017-07-14 12:17:28 +0000 | |||
2481 | +++ Src/parallel.F 2019-01-16 11:00:58 +0000 | |||
2482 | @@ -1,5 +1,5 @@ | |||
2483 | 1 | ! --- | 1 | ! --- |
2485 | 2 | ! Copyright (C) 1996-2016 The SIESTA group | 2 | ! Copyright- (C) 1996-2016 The SIESTA group |
2486 | 3 | ! This file is distributed under the terms of the | 3 | ! This file is distributed under the terms of the |
2487 | 4 | ! GNU General Public License: see COPYING in the top directory | 4 | ! GNU General Public License: see COPYING in the top directory |
2488 | 5 | ! or http://www.gnu.org/copyleft/gpl.txt . | 5 | ! or http://www.gnu.org/copyleft/gpl.txt . |
2489 | 6 | 6 | ||
2490 | === modified file 'Src/post_scf_work.F' | |||
2491 | --- Src/post_scf_work.F 2018-09-12 13:49:21 +0000 | |||
2492 | +++ Src/post_scf_work.F 2019-01-16 11:00:58 +0000 | |||
2493 | @@ -27,12 +27,13 @@ | |||
2494 | 27 | use class_Fstack_Pair_Geometry_dSpData2D, only: new, max_size | 27 | use class_Fstack_Pair_Geometry_dSpData2D, only: new, max_size |
2495 | 28 | use class_Fstack_Pair_Geometry_dSpData2D, only: push | 28 | use class_Fstack_Pair_Geometry_dSpData2D, only: push |
2496 | 29 | 29 | ||
2498 | 30 | use parallel, only: ionode | 30 | use parallel, only : IOnode, SIESTA_worker |
2499 | 31 | |||
2500 | 31 | use atomlist, only: lasto, rmaxo, datm, indxuo, no_s, no_u, | 32 | use atomlist, only: lasto, rmaxo, datm, indxuo, no_s, no_u, |
2501 | 32 | & iphorb, no_l, qtot, qtots | 33 | & iphorb, no_l, qtot, qtots |
2502 | 33 | use m_energies | 34 | use m_energies |
2503 | 34 | use neighbour, only : maxna=>maxnna ! For plcharge... | 35 | use neighbour, only : maxna=>maxnna ! For plcharge... |
2505 | 35 | use m_spin, only : nspin, h_spin_dim | 36 | use m_spin, only : nspin, h_spin_dim, spin |
2506 | 36 | use m_spin, only : spinor_dim | 37 | use m_spin, only : spinor_dim |
2507 | 37 | use m_diagon, only : diagon | 38 | use m_diagon, only : diagon |
2508 | 38 | use m_dminim, only : dminim | 39 | use m_dminim, only : dminim |
2509 | @@ -41,6 +42,9 @@ | |||
2510 | 41 | use m_compute_dm, only : PreviousCallDiagon | 42 | use m_compute_dm, only : PreviousCallDiagon |
2511 | 42 | use m_eo | 43 | use m_eo |
2512 | 43 | use kpoint_scf_m, only: kpoint_scf, gamma_scf | 44 | use kpoint_scf_m, only: kpoint_scf, gamma_scf |
2513 | 45 | #ifdef SIESTA__ELSI | ||
2514 | 46 | use m_elsi_interface, only: elsi_getdm | ||
2515 | 47 | #endif | ||
2516 | 44 | implicit none | 48 | implicit none |
2517 | 45 | 49 | ||
2518 | 46 | ! MD-step, SCF-step | 50 | ! MD-step, SCF-step |
2519 | @@ -51,10 +55,37 @@ | |||
2520 | 51 | type(Pair_Geometry_dSpData2D) :: pair | 55 | type(Pair_Geometry_dSpData2D) :: pair |
2521 | 52 | type(Geometry) :: geom | 56 | type(Geometry) :: geom |
2522 | 53 | 57 | ||
2523 | 58 | real(dp), allocatable :: Dscf_dummy(:,:) | ||
2524 | 59 | real(dp) :: ef_dummy | ||
2525 | 60 | real(dp) :: Entropy_dummy | ||
2526 | 61 | |||
2527 | 54 | call timer( 'PostSCF', 1 ) | 62 | call timer( 'PostSCF', 1 ) |
2528 | 55 | 63 | ||
2529 | 56 | ! If converged, make one last iteration to find forces and stress | 64 | ! If converged, make one last iteration to find forces and stress |
2530 | 57 | 65 | ||
2531 | 66 | ! If we use the ELSI interface, the energy-density | ||
2532 | 67 | ! matrix is not calculated inside the SCF step, and | ||
2533 | 68 | ! so this must be done now | ||
2534 | 69 | |||
2535 | 70 | #ifdef SIESTA__ELSI | ||
2536 | 71 | if (isolve .eq. SOLVE_ELSI) then | ||
2537 | 72 | allocate(Dscf_dummy(maxnh,spin%DM)) | ||
2538 | 73 | ! Note that we do not care about the content of H and S | ||
2539 | 74 | ! Only that the appropriate elsi_h handle is still active | ||
2540 | 75 | ! and allows us to get the appropriate EDM | ||
2541 | 76 | call elsi_getdm(iscf, no_s, spin%spinor, | ||
2542 | 77 | & no_l, maxnh, no_u, | ||
2543 | 78 | & numh, listhptr, listh, | ||
2544 | 79 | & H, S, qtot, temp, | ||
2545 | 80 | & xijo, | ||
2546 | 81 | & kpoint_scf%N, kpoint_scf%k, kpoint_scf%w, | ||
2547 | 82 | & eo, qo, Dscf_dummy, Escf, ef_dummy, Entropy_dummy, | ||
2548 | 83 | & occtol, neigwanted, Get_EDM_Only=.true.) | ||
2549 | 84 | deallocate(Dscf_dummy) | ||
2550 | 85 | endif | ||
2551 | 86 | if (.not. SIESTA_worker) RETURN | ||
2552 | 87 | #endif | ||
2553 | 88 | |||
2554 | 58 | ! If we use the minimization routine, the energy-density | 89 | ! If we use the minimization routine, the energy-density |
2555 | 59 | ! matrix is not calculated inside the SCF step, and | 90 | ! matrix is not calculated inside the SCF step, and |
2556 | 60 | ! so this must be done now | 91 | ! so this must be done now |
2557 | 61 | 92 | ||
2558 | === modified file 'Src/read_options.F90' | |||
2559 | --- Src/read_options.F90 2018-12-02 00:15:31 +0000 | |||
2560 | +++ Src/read_options.F90 2019-01-16 11:00:58 +0000 | |||
2561 | @@ -76,6 +76,7 @@ | |||
2562 | 76 | ! 4 = PEXSI | 76 | ! 4 = PEXSI |
2563 | 77 | ! 5 = (Matrix write) | 77 | ! 5 = (Matrix write) |
2564 | 78 | ! 6 = CheSS | 78 | ! 6 = CheSS |
2565 | 79 | ! 7 = ELSI | ||
2566 | 79 | ! real*8 temp : Temperature for Fermi smearing (Ry) | 80 | ! real*8 temp : Temperature for Fermi smearing (Ry) |
2567 | 80 | ! logical fixspin : Fix the spin of the system? | 81 | ! logical fixspin : Fix the spin of the system? |
2568 | 81 | ! real*8 total_spin : Total spin of the system | 82 | ! real*8 total_spin : Total spin of the system |
2569 | @@ -706,6 +707,16 @@ | |||
2570 | 706 | #else | 707 | #else |
2571 | 707 | call die("PEXSI solver is not compiled in. Use -DSIESTA__PEXSI") | 708 | call die("PEXSI solver is not compiled in. Use -DSIESTA__PEXSI") |
2572 | 708 | #endif | 709 | #endif |
2573 | 710 | else if (leqi(method,"elsi")) then | ||
2574 | 711 | #ifdef SIESTA__ELSI | ||
2575 | 712 | isolve = SOLVE_ELSI | ||
2576 | 713 | if (ionode) then | ||
2577 | 714 | call add_citation("ELSI PAPER***") | ||
2578 | 715 | write(*,3) 'redata: Method of Calculation', 'ELSI' | ||
2579 | 716 | endif | ||
2580 | 717 | #else | ||
2581 | 718 | call die("ELSI solver is not compiled in. Use -DSIESTA__ELSI") | ||
2582 | 719 | #endif | ||
2583 | 709 | 720 | ||
2584 | 710 | #ifdef SIESTA__CHESS | 721 | #ifdef SIESTA__CHESS |
2585 | 711 | else if (leqi(method,'chess')) then | 722 | else if (leqi(method,'chess')) then |
2586 | 712 | 723 | ||
2587 | === modified file 'Src/siesta.F' | |||
2588 | --- Src/siesta.F 2018-05-30 09:15:30 +0000 | |||
2589 | +++ Src/siesta.F 2019-01-16 11:00:58 +0000 | |||
2590 | @@ -21,7 +21,7 @@ | |||
2591 | 21 | use parallel, only: SIESTA_worker ! whether part of Siesta's communicator | 21 | use parallel, only: SIESTA_worker ! whether part of Siesta's communicator |
2592 | 22 | use parallel, only: ionode | 22 | use parallel, only: ionode |
2593 | 23 | #ifdef MPI | 23 | #ifdef MPI |
2595 | 24 | use mpi_siesta, only: true_mpi_comm_world | 24 | use mpi_siesta, only: mpi_comm_dft ! Includes Solver nodes |
2596 | 25 | #endif | 25 | #endif |
2597 | 26 | use m_mpi_utils, only: broadcast | 26 | use m_mpi_utils, only: broadcast |
2598 | 27 | 27 | ||
2599 | @@ -35,12 +35,12 @@ | |||
2600 | 35 | integer :: istep | 35 | integer :: istep |
2601 | 36 | logical :: relaxd | 36 | logical :: relaxd |
2602 | 37 | 37 | ||
2604 | 38 | ! Notes for PEXSI operation | 38 | ! Notes for PEXSI and ELSI operation (extra procs for Solver) |
2605 | 39 | ! | 39 | ! |
2607 | 40 | ! A subset of nodes carries out non-PEXSI Siesta operations | 40 | ! A subset of nodes carries out non-Solver Siesta operations |
2608 | 41 | ! (i.e., setting up H, moving atoms, diagonalizing...). | 41 | ! (i.e., setting up H, moving atoms, diagonalizing...). |
2609 | 42 | ! These are tagged as "SIESTA_worker" (admittedly, a bad name) | 42 | ! These are tagged as "SIESTA_worker" (admittedly, a bad name) |
2611 | 43 | ! All nodes are involved in the PEXSI electronic-structure solver, | 43 | ! All nodes are involved in the (PEXSI or ELSI) electronic-structure solver, |
2612 | 44 | ! and in the new LocalDOS computation based on selected inversion. | 44 | ! and in the new LocalDOS computation based on selected inversion. |
2613 | 45 | ! | 45 | ! |
2614 | 46 | ! 'siesta_init', 'siesta_forces', and 'siesta_analysis' need to | 46 | ! 'siesta_init', 'siesta_forces', and 'siesta_analysis' need to |
2615 | @@ -66,11 +66,11 @@ | |||
2616 | 66 | C Begin of coordinate relaxation iteration | 66 | C Begin of coordinate relaxation iteration |
2617 | 67 | relaxd = .false. | 67 | relaxd = .false. |
2618 | 68 | 68 | ||
2620 | 69 | #ifdef SIESTA__PEXSI | 69 | #if defined (SIESTA__PEXSI) || defined (SIESTA__ELSI) |
2621 | 70 | ! Broadcast relevant things for program logic | 70 | ! Broadcast relevant things for program logic |
2622 | 71 | ! These were set in siesta_options, called only by "SIESTA_workers". | 71 | ! These were set in siesta_options, called only by "SIESTA_workers". |
2625 | 72 | call broadcast(inicoor,comm=true_MPI_Comm_World) | 72 | call broadcast(inicoor,comm=mpi_comm_dft) |
2626 | 73 | call broadcast(fincoor,comm=true_MPI_Comm_World) | 73 | call broadcast(fincoor,comm=mpi_comm_dft) |
2627 | 74 | #endif | 74 | #endif |
2628 | 75 | istep = inicoor | 75 | istep = inicoor |
2629 | 76 | DO WHILE ((istep.le.fincoor) .AND. (.not. relaxd)) | 76 | DO WHILE ((istep.le.fincoor) .AND. (.not. relaxd)) |
2630 | @@ -82,8 +82,8 @@ | |||
2631 | 82 | end if | 82 | end if |
2632 | 83 | 83 | ||
2633 | 84 | if (SIESTA_worker) call siesta_move( istep, relaxd ) | 84 | if (SIESTA_worker) call siesta_move( istep, relaxd ) |
2636 | 85 | #ifdef SIESTA__PEXSI | 85 | #if defined (SIESTA__PEXSI) || defined (SIESTA__ELSI) |
2637 | 86 | call broadcast(relaxd,comm=true_MPI_Comm_World) | 86 | call broadcast(relaxd,comm=mpi_comm_dft) |
2638 | 87 | #endif | 87 | #endif |
2639 | 88 | if (.not. relaxd) then | 88 | if (.not. relaxd) then |
2640 | 89 | istep = istep + 1 | 89 | istep = istep + 1 |
2641 | 90 | 90 | ||
2642 | === modified file 'Src/siesta_forces.F90' | |||
2643 | --- Src/siesta_forces.F90 2018-09-24 07:34:04 +0000 | |||
2644 | +++ Src/siesta_forces.F90 2019-01-16 11:00:58 +0000 | |||
2645 | @@ -84,6 +84,9 @@ | |||
2646 | 84 | #ifdef SIESTA__PEXSI | 84 | #ifdef SIESTA__PEXSI |
2647 | 85 | use m_pexsi, only: pexsi_finalize_scfloop | 85 | use m_pexsi, only: pexsi_finalize_scfloop |
2648 | 86 | #endif | 86 | #endif |
2649 | 87 | #ifdef SIESTA__ELSI | ||
2650 | 88 | use m_elsi_interface, only: elsi_finalize_scfloop | ||
2651 | 89 | #endif | ||
2652 | 87 | use m_check_walltime | 90 | use m_check_walltime |
2653 | 88 | 91 | ||
2654 | 89 | use m_energies, only: DE_NEGF | 92 | use m_energies, only: DE_NEGF |
2655 | @@ -140,10 +143,10 @@ | |||
2656 | 140 | call write_debug( ' PRE siesta_forces' ) | 143 | call write_debug( ' PRE siesta_forces' ) |
2657 | 141 | #endif | 144 | #endif |
2658 | 142 | 145 | ||
2660 | 143 | #ifdef SIESTA__PEXSI | 146 | #if defined (SIESTA__PEXSI) || defined (SIESTA__ELSI) |
2661 | 144 | ! Broadcast relevant things for program logic | 147 | ! Broadcast relevant things for program logic |
2662 | 145 | ! These were set in read_options, called only by "SIESTA_workers". | 148 | ! These were set in read_options, called only by "SIESTA_workers". |
2664 | 146 | call broadcast(nscf, comm=true_MPI_Comm_World) | 149 | call broadcast(nscf, comm=mpi_comm_dft) |
2665 | 147 | #endif | 150 | #endif |
2666 | 148 | 151 | ||
2667 | 149 | if ( SIESTA_worker ) then | 152 | if ( SIESTA_worker ) then |
2668 | @@ -484,9 +487,9 @@ | |||
2669 | 484 | 487 | ||
2670 | 485 | end if | 488 | end if |
2671 | 486 | 489 | ||
2675 | 487 | #ifdef SIESTA__PEXSI | 490 | #if defined (SIESTA__PEXSI) || defined (SIESTA__ELSI) |
2676 | 488 | call broadcast(iscf, comm=true_MPI_Comm_World) | 491 | call broadcast(iscf, comm=mpi_comm_dft) |
2677 | 489 | call broadcast(SCFconverged, comm=true_MPI_Comm_World) | 492 | call broadcast(SCFconverged, comm=mpi_comm_dft) |
2678 | 490 | #endif | 493 | #endif |
2679 | 491 | 494 | ||
2680 | 492 | ! Exit if converged | 495 | ! Exit if converged |
2681 | @@ -500,9 +503,15 @@ | |||
2682 | 500 | end if | 503 | end if |
2683 | 501 | #endif | 504 | #endif |
2684 | 502 | 505 | ||
2685 | 506 | <<<<<<< TREE | ||
2686 | 503 | if ( .not. SIESTA_worker ) return | 507 | if ( .not. SIESTA_worker ) return |
2687 | 504 | 508 | ||
2688 | 505 | call end_of_cycle_save_operations(SCFconverged) | 509 | call end_of_cycle_save_operations(SCFconverged) |
2689 | 510 | ======= | ||
2690 | 511 | if ( SIESTA_worker ) then | ||
2691 | 512 | !=== | ||
2692 | 513 | call end_of_cycle_save_operations() | ||
2693 | 514 | >>>>>>> MERGE-SOURCE | ||
2694 | 506 | 515 | ||
2695 | 507 | if ( .not. SCFconverged ) then | 516 | if ( .not. SCFconverged ) then |
2696 | 508 | if ( SCFMustConverge ) then | 517 | if ( SCFMustConverge ) then |
2697 | @@ -538,11 +547,18 @@ | |||
2698 | 538 | ! Clean-up here to limit memory usage | 547 | ! Clean-up here to limit memory usage |
2699 | 539 | call mixers_scf_history_init( ) | 548 | call mixers_scf_history_init( ) |
2700 | 540 | 549 | ||
2701 | 550 | !=== | ||
2702 | 551 | endif ! Siesta_Worker | ||
2703 | 552 | |||
2704 | 541 | ! End of standard SCF loop. | 553 | ! End of standard SCF loop. |
2705 | 542 | ! Do one more pass to compute forces and stresses | 554 | ! Do one more pass to compute forces and stresses |
2706 | 543 | 555 | ||
2707 | 544 | ! Note that this call will no longer overwrite H while computing the | 556 | ! Note that this call will no longer overwrite H while computing the |
2708 | 545 | ! final energies, forces and stresses... | 557 | ! final energies, forces and stresses... |
2709 | 558 | |||
2710 | 559 | ! If we want to preserve the "Siesta_Worker" subset implementation for ELSI, | ||
2711 | 560 | ! this block needs to be executed by everybody | ||
2712 | 561 | ! as it contains a call to the ELSI interface to get the EDM | ||
2713 | 546 | 562 | ||
2714 | 547 | if ( fdf_get("compute-forces",.true.) ) then | 563 | if ( fdf_get("compute-forces",.true.) ) then |
2715 | 548 | call post_scf_work( istep, iscf , SCFconverged ) | 564 | call post_scf_work( istep, iscf , SCFconverged ) |
2716 | @@ -550,6 +566,15 @@ | |||
2717 | 550 | if (ionode) call memory_snapshot("after post_scf_work") | 566 | if (ionode) call memory_snapshot("after post_scf_work") |
2718 | 551 | #endif | 567 | #endif |
2719 | 552 | end if | 568 | end if |
2720 | 569 | |||
2721 | 570 | #ifdef SIESTA__ELSI | ||
2722 | 571 | ! Recall that there could be an extra call after the scf loop to get the EDM | ||
2723 | 572 | if ( isolve == SOLVE_ELSI ) then | ||
2724 | 573 | call elsi_finalize_scfloop() | ||
2725 | 574 | end if | ||
2726 | 575 | #endif | ||
2727 | 576 | |||
2728 | 577 | if (.not. Siesta_Worker) RETURN | ||
2729 | 553 | 578 | ||
2730 | 554 | ! ... so H at this point is the latest generator of the DM, except | 579 | ! ... so H at this point is the latest generator of the DM, except |
2731 | 555 | ! if mixing H beyond self-consistency or terminating the scf loop | 580 | ! if mixing H beyond self-consistency or terminating the scf loop |
2732 | 556 | 581 | ||
2733 | === modified file 'Src/siesta_init.F' | |||
2734 | --- Src/siesta_init.F 2018-11-27 14:28:55 +0000 | |||
2735 | +++ Src/siesta_init.F 2019-01-16 11:00:58 +0000 | |||
2736 | @@ -267,8 +267,11 @@ | |||
2737 | 267 | call reinit( sname ) | 267 | call reinit( sname ) |
2738 | 268 | 268 | ||
2739 | 269 | #ifdef MPI | 269 | #ifdef MPI |
2740 | 270 | |||
2741 | 271 | #ifdef SIESTA__PEXSI | ||
2742 | 270 | ! Optionally, restrict the number of processors that SIESTA uses, out | 272 | ! Optionally, restrict the number of processors that SIESTA uses, out |
2744 | 271 | ! of the total pool | 273 | ! of the total pool (but only for PEXSI, not yet for other solvers) |
2745 | 274 | |||
2746 | 272 | npSIESTA = fdf_get("MPI.Nprocs.SIESTA",Nodes) | 275 | npSIESTA = fdf_get("MPI.Nprocs.SIESTA",Nodes) |
2747 | 273 | call MPI_Comm_Group(MPI_Comm_World, World_Group, MPIerror) | 276 | call MPI_Comm_Group(MPI_Comm_World, World_Group, MPIerror) |
2748 | 274 | call MPI_Group_incl(World_Group, npSIESTA, | 277 | call MPI_Group_incl(World_Group, npSIESTA, |
2749 | @@ -278,8 +281,16 @@ | |||
2750 | 278 | $ SIESTA_Comm, MPIerror) | 281 | $ SIESTA_Comm, MPIerror) |
2751 | 279 | 282 | ||
2752 | 280 | SIESTA_worker = (Node < npSIESTA) | 283 | SIESTA_worker = (Node < npSIESTA) |
2755 | 281 | 284 | #else | |
2756 | 282 | ! Swap communicator | 285 | SIESTA_Comm = MPI_Comm_World |
2757 | 286 | SIESTA_worker = .true. | ||
2758 | 287 | #endif | ||
2759 | 288 | ! Swap communicators | ||
2760 | 289 | ! This is needed in case that the whole program is run with | ||
2761 | 290 | ! a subset of the global processes. In that case, the DFT instance | ||
2762 | 291 | ! communicator (a better name than 'true world' communicator) | ||
2763 | 292 | ! is at this point MPI_COMM_WORLD | ||
2764 | 293 | MPI_COMM_DFT = MPI_COMM_WORLD | ||
2765 | 283 | ! This is needed since MPI_COMM_WORLD is used implicitly by | 294 | ! This is needed since MPI_COMM_WORLD is used implicitly by |
2766 | 284 | ! Siesta for all operations. | 295 | ! Siesta for all operations. |
2767 | 285 | MPI_COMM_WORLD = SIESTA_Comm | 296 | MPI_COMM_WORLD = SIESTA_Comm |
2768 | @@ -287,7 +298,7 @@ | |||
2769 | 287 | call MPI_Comm_Rank( MPI_Comm_World, Node, MPIerror ) | 298 | call MPI_Comm_Rank( MPI_Comm_World, Node, MPIerror ) |
2770 | 288 | call MPI_Comm_Size( MPI_Comm_World, Nodes, MPIerror ) | 299 | call MPI_Comm_Size( MPI_Comm_World, Nodes, MPIerror ) |
2771 | 289 | endif | 300 | endif |
2773 | 290 | #else | 301 | #else /* not MPI */ |
2774 | 291 | SIESTA_worker = .true. | 302 | SIESTA_worker = .true. |
2775 | 292 | Node = 0 | 303 | Node = 0 |
2776 | 293 | Nodes = 1 | 304 | Nodes = 1 |
2777 | @@ -586,7 +597,14 @@ | |||
2778 | 586 | ! auxiliary supercell for the calculation of matrix elements. | 597 | ! auxiliary supercell for the calculation of matrix elements. |
2779 | 587 | call setup_kpoint_scf( ucell ) | 598 | call setup_kpoint_scf( ucell ) |
2780 | 588 | not_using_auxcell = gamma_scf | 599 | not_using_auxcell = gamma_scf |
2782 | 589 | 600 | #ifdef SIESTA__ELSI | |
2783 | 601 | if (isolve == SOLVE_ELSI) then | ||
2784 | 602 | if (mod(Nodes,kpoint_scf%N*spin%spinor) /=0) then | ||
2785 | 603 | call die("The number of MPI processes " // | ||
2786 | 604 | $ "must be a multiple of nk*nspin") | ||
2787 | 605 | endif | ||
2788 | 606 | endif | ||
2789 | 607 | #endif | ||
2790 | 590 | ! Call initialisation of PDOS here since we need to check if | 608 | ! Call initialisation of PDOS here since we need to check if |
2791 | 591 | ! the auxiliary supercell is needed for a non-gamma calculation | 609 | ! the auxiliary supercell is needed for a non-gamma calculation |
2792 | 592 | call init_projected_DOS( ucell ) | 610 | call init_projected_DOS( ucell ) |
2793 | 593 | 611 | ||
2794 | === modified file 'Src/siesta_options.F90' | |||
2795 | --- Src/siesta_options.F90 2018-09-12 13:49:21 +0000 | |||
2796 | +++ Src/siesta_options.F90 2019-01-16 11:00:58 +0000 | |||
2797 | @@ -246,6 +246,7 @@ | |||
2798 | 246 | integer, parameter :: SOLVE_PEXSI = 4 | 246 | integer, parameter :: SOLVE_PEXSI = 4 |
2799 | 247 | integer, parameter :: MATRIX_WRITE = 5 | 247 | integer, parameter :: MATRIX_WRITE = 5 |
2800 | 248 | integer, parameter :: SOLVE_CHESS = 6 | 248 | integer, parameter :: SOLVE_CHESS = 6 |
2801 | 249 | integer, parameter :: SOLVE_ELSI = 7 | ||
2802 | 249 | 250 | ||
2803 | 250 | #ifdef SIESTA__FLOOK | 251 | #ifdef SIESTA__FLOOK |
2804 | 251 | ! LUA-handle | 252 | ! LUA-handle |
2805 | 252 | 253 | ||
2806 | === modified file 'Src/siesta_tddft.F90' | |||
2807 | --- Src/siesta_tddft.F90 2018-06-26 17:09:38 +0000 | |||
2808 | +++ Src/siesta_tddft.F90 2019-01-16 11:00:58 +0000 | |||
2809 | @@ -61,7 +61,7 @@ | |||
2810 | 61 | #ifdef SIESTA__PEXSI | 61 | #ifdef SIESTA__PEXSI |
2811 | 62 | ! Broadcast relevant things for program logic | 62 | ! Broadcast relevant things for program logic |
2812 | 63 | ! These were set in read_options, called only by "SIESTA_workers". | 63 | ! These were set in read_options, called only by "SIESTA_workers". |
2814 | 64 | call broadcast(nscf,comm=true_MPI_Comm_World) | 64 | call broadcast(nscf,comm=MPI_Comm_DFT) |
2815 | 65 | #endif | 65 | #endif |
2816 | 66 | 66 | ||
2817 | 67 | if ( SIESTA_worker ) then | 67 | if ( SIESTA_worker ) then |
2818 | 68 | 68 | ||
2819 | === modified file 'Src/state_init.F' | |||
2820 | --- Src/state_init.F 2018-10-23 09:46:30 +0000 | |||
2821 | +++ Src/state_init.F 2019-01-16 11:00:58 +0000 | |||
2822 | @@ -811,6 +811,10 @@ | |||
2823 | 811 | #endif | 811 | #endif |
2824 | 812 | call timer( 'state_init', 2 ) | 812 | call timer( 'state_init', 2 ) |
2825 | 813 | 813 | ||
2826 | 814 | ! Call BLACS setup here if needed (all solvers except PEXSI) | ||
2827 | 815 | ! Setup S in 2d Scalapack distribution if needed (ELSI ELPA solver) | ||
2828 | 816 | ! Initialize ELSI | ||
2829 | 817 | |||
2830 | 814 | END subroutine state_init | 818 | END subroutine state_init |
2831 | 815 | 819 | ||
2832 | 816 | subroutine check_cohp() | 820 | subroutine check_cohp() |
2833 | 817 | 821 | ||
2834 | === modified file 'Src/write_subs.F' | |||
2835 | --- Src/write_subs.F 2018-06-04 14:08:20 +0000 | |||
2836 | +++ Src/write_subs.F 2019-01-16 11:00:58 +0000 | |||
2837 | @@ -441,6 +441,7 @@ | |||
2838 | 441 | write(6,"(/a,f14.6,/)") 'siesta: Eharris(eV) = ', Eharrs/eV | 441 | write(6,"(/a,f14.6,/)") 'siesta: Eharris(eV) = ', Eharrs/eV |
2839 | 442 | ! No need for further cml output | 442 | ! No need for further cml output |
2840 | 443 | elseif ((isolve==SOLVE_DIAGON) .or. (isolve==SOLVE_PEXSI) | 443 | elseif ((isolve==SOLVE_DIAGON) .or. (isolve==SOLVE_PEXSI) |
2841 | 444 | . .or. (isolve==SOLVE_ELSI) | ||
2842 | 444 | . .or. (isolve==SOLVE_CHESS) | 445 | . .or. (isolve==SOLVE_CHESS) |
2843 | 445 | . .or. (isolve==SOLVE_TRANSI)) then | 446 | . .or. (isolve==SOLVE_TRANSI)) then |
2844 | 446 | if (cml_p) then | 447 | if (cml_p) then |
2845 | 447 | 448 | ||
2846 | === added directory 'Tests/si-quantum-dot' | |||
2847 | === added file 'Tests/si-quantum-dot/coords.Si987H372.fdf' | |||
2848 | --- Tests/si-quantum-dot/coords.Si987H372.fdf 1970-01-01 00:00:00 +0000 | |||
2849 | +++ Tests/si-quantum-dot/coords.Si987H372.fdf 2019-01-16 11:00:58 +0000 | |||
2850 | @@ -0,0 +1,1368 @@ | |||
2851 | 1 | number-of-atoms 1359 | ||
2852 | 2 | number-of-species 2 | ||
2853 | 3 | # | ||
2854 | 4 | # Si987H372 from CSIRO Silicon Quantum Dot dataset | ||
2855 | 5 | # https://doi.org/10.4225/08/5721BB609EDB0 | ||
2856 | 6 | # | ||
2857 | 7 | atomic-coordinates-format Ang | ||
2858 | 8 | %block atomic-coordinates-and-atomic-species | ||
2859 | 9 | -12.27486761 -6.80192861 -4.06859976 1 # Si | ||
2860 | 10 | -12.25680064 -9.54338724 -1.35303719 1 # Si | ||
2861 | 11 | -15.00302593 -6.81988895 -1.33325565 1 # Si | ||
2862 | 12 | -13.61801556 -8.18242131 -0.02610591 1 # Si | ||
2863 | 13 | -12.27960089 -6.82966552 1.35920843 1 # Si | ||
2864 | 14 | -12.28371979 -9.54137501 4.12509126 1 # Si | ||
2865 | 15 | -13.62454044 -8.34100436 5.61139268 1 # Si | ||
2866 | 16 | -12.30649445 -6.84800235 6.84800235 1 # Si | ||
2867 | 17 | -12.25680064 -1.35303719 -9.54338724 1 # Si | ||
2868 | 18 | -12.27486761 -4.06859976 -6.80192861 1 # Si | ||
2869 | 19 | -15.00302593 -1.33325565 -6.81988895 1 # Si | ||
2870 | 20 | -13.66848041 -2.72110232 -5.45900176 1 # Si | ||
2871 | 21 | -13.66848041 -5.45900176 -2.72110232 1 # Si | ||
2872 | 22 | -16.37023166 -2.73136988 -2.73136988 1 # Si | ||
2873 | 23 | -15.01032944 -4.07390228 -4.07390228 1 # Si | ||
2874 | 24 | -12.30121531 -1.35797308 -4.09496434 1 # Si | ||
2875 | 25 | -12.30121531 -4.09496434 -1.35797308 1 # Si | ||
2876 | 26 | -15.04397328 -1.36373167 -1.36373167 1 # Si | ||
2877 | 27 | -16.34134070 -5.63195305 0.16771494 1 # Si | ||
2878 | 28 | -13.68153993 -2.73058729 0.00300340 1 # Si | ||
2879 | 29 | -13.61156377 -5.42510828 2.69385812 1 # Si | ||
2880 | 30 | -16.34634363 -2.90187977 2.90187977 1 # Si | ||
2881 | 31 | -15.03413728 -4.10489826 1.37590571 1 # Si | ||
2882 | 32 | -12.30671934 -1.37011664 1.37011664 1 # Si | ||
2883 | 33 | -12.27225867 -4.09402380 4.09402380 1 # Si | ||
2884 | 34 | -15.03413728 -1.37590571 4.10489826 1 # Si | ||
2885 | 35 | -13.61156377 -2.69385812 5.42510828 1 # Si | ||
2886 | 36 | -13.62454044 -5.61139268 8.34100436 1 # Si | ||
2887 | 37 | -12.27960089 -1.35920843 6.82966552 1 # Si | ||
2888 | 38 | -12.28371979 -4.12509126 9.54137501 1 # Si | ||
2889 | 39 | -13.61801556 -0.02610591 -8.18242131 1 # Si | ||
2890 | 40 | -12.28371979 4.12509126 -9.54137501 1 # Si | ||
2891 | 41 | -12.27960089 1.35920843 -6.82966552 1 # Si | ||
2892 | 42 | -16.34134070 0.16771494 -5.63195305 1 # Si | ||
2893 | 43 | -13.61156377 2.69385812 -5.42510828 1 # Si | ||
2894 | 44 | -13.68153993 0.00300340 -2.73058729 1 # Si | ||
2895 | 45 | -16.34634363 2.90187977 -2.90187977 1 # Si | ||
2896 | 46 | -15.03413728 1.37590571 -4.10489826 1 # Si | ||
2897 | 47 | -12.27225867 4.09402380 -4.09402380 1 # Si | ||
2898 | 48 | -12.30671934 1.37011664 -1.37011664 1 # Si | ||
2899 | 49 | -15.03413728 4.10489826 -1.37590571 1 # Si | ||
2900 | 50 | -16.37821316 0.00000000 0.00000000 1 # Si | ||
2901 | 51 | -13.68153993 2.73058729 -0.00300340 1 # Si | ||
2902 | 52 | -13.68153993 -0.00300340 2.73058729 1 # Si | ||
2903 | 53 | -16.37023166 2.73136988 2.73136988 1 # Si | ||
2904 | 54 | -15.04397328 1.36373167 1.36373167 1 # Si | ||
2905 | 55 | -12.30121531 4.09496434 1.35797308 1 # Si | ||
2906 | 56 | -12.30121531 1.35797308 4.09496434 1 # Si | ||
2907 | 57 | -15.01032944 4.07390228 4.07390228 1 # Si | ||
2908 | 58 | -16.34134070 -0.16771494 5.63195305 1 # Si | ||
2909 | 59 | -13.66848041 2.72110232 5.45900176 1 # Si | ||
2910 | 60 | -13.61801556 0.02610591 8.18242131 1 # Si | ||
2911 | 61 | -15.00302593 1.33325565 6.81988895 1 # Si | ||
2912 | 62 | -12.27486761 4.06859976 6.80192861 1 # Si | ||
2913 | 63 | -12.25680064 1.35303719 9.54338724 1 # Si | ||
2914 | 64 | -13.62454044 5.61139268 -8.34100436 1 # Si | ||
2915 | 65 | -12.30649445 6.84800235 -6.84800235 1 # Si | ||
2916 | 66 | -13.62454044 8.34100436 -5.61139268 1 # Si | ||
2917 | 67 | -13.61156377 5.42510828 -2.69385812 1 # Si | ||
2918 | 68 | -12.28371979 9.54137501 -4.12509126 1 # Si | ||
2919 | 69 | -12.27960089 6.82966552 -1.35920843 1 # Si | ||
2920 | 70 | -16.34134070 5.63195305 -0.16771494 1 # Si | ||
2921 | 71 | -13.61801556 8.18242131 0.02610591 1 # Si | ||
2922 | 72 | -13.66848041 5.45900176 2.72110232 1 # Si | ||
2923 | 73 | -15.00302593 6.81988895 1.33325565 1 # Si | ||
2924 | 74 | -12.25680064 9.54338724 1.35303719 1 # Si | ||
2925 | 75 | -12.27486761 6.80192861 4.06859976 1 # Si | ||
2926 | 76 | -6.80192861 -12.27486761 -4.06859976 1 # Si | ||
2927 | 77 | -6.81988895 -15.00302593 -1.33325565 1 # Si | ||
2928 | 78 | -9.54338724 -12.25680064 -1.35303719 1 # Si | ||
2929 | 79 | -8.18242131 -13.61801556 -0.02610591 1 # Si | ||
2930 | 80 | -6.82966552 -12.27960089 1.35920843 1 # Si | ||
2931 | 81 | -9.54137501 -12.28371979 4.12509126 1 # Si | ||
2932 | 82 | -8.34100436 -13.62454044 5.61139268 1 # Si | ||
2933 | 83 | -6.84800235 -12.30649445 6.84800235 1 # Si | ||
2934 | 84 | -6.80203106 -6.80203106 -9.53854106 1 # Si | ||
2935 | 85 | -6.80203106 -9.53854106 -6.80203106 1 # Si | ||
2936 | 86 | -9.53854106 -6.80203106 -6.80203106 1 # Si | ||
2937 | 87 | -8.18684496 -8.18684496 -5.46061302 1 # Si | ||
2938 | 88 | -8.18958251 -10.91859845 -2.73303284 1 # Si | ||
2939 | 89 | -10.91859845 -8.18958251 -2.73303284 1 # Si | ||
2940 | 90 | -9.53373688 -9.53373688 -4.08178398 1 # Si | ||
2941 | 91 | -6.82463094 -6.82463094 -4.09496380 1 # Si | ||
2942 | 92 | -6.82852418 -9.55456223 -1.36492084 1 # Si | ||
2943 | 93 | -9.55456223 -6.82852418 -1.36492084 1 # Si | ||
2944 | 94 | -10.90149235 -10.90149235 -0.01304838 1 # Si | ||
2945 | 95 | -8.19611273 -8.19611273 0.01202455 1 # Si | ||
2946 | 96 | -8.19260795 -10.93410102 2.74437054 1 # Si | ||
2947 | 97 | -10.93410102 -8.19260795 2.74437054 1 # Si | ||
2948 | 98 | -9.56265344 -9.56265344 1.38318968 1 # Si | ||
2949 | 99 | -6.82894278 -6.82894278 1.37205363 1 # Si | ||
2950 | 100 | -6.82705083 -9.56489675 4.10298675 1 # Si | ||
2951 | 101 | -9.56489675 -6.82705083 4.10298675 1 # Si | ||
2952 | 102 | -10.90291341 -10.90291341 5.43284542 1 # Si | ||
2953 | 103 | -8.19345007 -8.19345007 5.46312108 1 # Si | ||
2954 | 104 | -8.17530342 -10.89255734 8.17530342 1 # Si | ||
2955 | 105 | -10.89255734 -8.17530342 8.17530342 1 # Si | ||
2956 | 106 | -9.55790920 -9.55790920 6.82271744 1 # Si | ||
2957 | 107 | -6.82700831 -6.82700831 6.82700831 1 # Si | ||
2958 | 108 | -6.82271744 -9.55790920 9.55790920 1 # Si | ||
2959 | 109 | -9.55790920 -6.82271744 9.55790920 1 # Si | ||
2960 | 110 | -8.17530342 -8.17530342 10.89255734 1 # Si | ||
2961 | 111 | -6.84800235 -6.84800235 12.30649445 1 # Si | ||
2962 | 112 | -6.81988895 -1.33325565 -15.00302593 1 # Si | ||
2963 | 113 | -6.80192861 -4.06859976 -12.27486761 1 # Si | ||
2964 | 114 | -9.54338724 -1.35303719 -12.25680064 1 # Si | ||
2965 | 115 | -8.18958251 -2.73303284 -10.91859845 1 # Si | ||
2966 | 116 | -8.18684496 -5.46061302 -8.18684496 1 # Si | ||
2967 | 117 | -10.91859845 -2.73303284 -8.18958251 1 # Si | ||
2968 | 118 | -9.53373688 -4.08178398 -9.53373688 1 # Si | ||
2969 | 119 | -6.82852418 -1.36492084 -9.55456223 1 # Si | ||
2970 | 120 | -6.82463094 -4.09496380 -6.82463094 1 # Si | ||
2971 | 121 | -9.55456223 -1.36492084 -6.82852418 1 # Si | ||
2972 | 122 | -10.92814020 -5.45537137 -5.45537137 1 # Si | ||
2973 | 123 | -8.19145655 -2.72890018 -5.45886981 1 # Si | ||
2974 | 124 | -8.19145655 -5.45886981 -2.72890018 1 # Si | ||
2975 | 125 | -10.93548204 -2.72665137 -2.72665137 1 # Si | ||
2976 | 126 | -9.56309566 -4.09195916 -4.09195916 1 # Si | ||
2977 | 127 | -6.82665093 -1.36387577 -4.09489509 1 # Si | ||
2978 | 128 | -6.82665093 -4.09489509 -1.36387577 1 # Si | ||
2979 | 129 | -9.56805296 -1.36256401 -1.36256401 1 # Si | ||
2980 | 130 | -10.91922202 -5.46070202 -0.00117430 1 # Si | ||
2981 | 131 | -8.19459074 -2.72767707 -0.00218763 1 # Si | ||
2982 | 132 | -8.19802839 -5.46221414 2.73481248 1 # Si | ||
2983 | 133 | -10.91829649 -2.72813440 2.72813440 1 # Si | ||
2984 | 134 | -9.55550648 -4.09408870 1.36300571 1 # Si | ||
2985 | 135 | -6.82823155 -1.36467215 1.36467215 1 # Si | ||
2986 | 136 | -6.82965269 -4.09758805 4.09758805 1 # Si | ||
2987 | 137 | -9.55550648 -1.36300571 4.09408870 1 # Si | ||
2988 | 138 | -10.94234231 -5.47569502 5.47569502 1 # Si | ||
2989 | 139 | -8.19802839 -2.73481248 5.46221414 1 # Si | ||
2990 | 140 | -8.19345007 -5.46312108 8.19345007 1 # Si | ||
2991 | 141 | -10.93410102 -2.74437054 8.19260795 1 # Si | ||
2992 | 142 | -9.56489675 -4.10298675 6.82705083 1 # Si | ||
2993 | 143 | -6.82894278 -1.37205363 6.82894278 1 # Si | ||
2994 | 144 | -6.82705083 -4.10298675 9.56489675 1 # Si | ||
2995 | 145 | -9.56265344 -1.38318968 9.56265344 1 # Si | ||
2996 | 146 | -10.90291341 -5.43284542 10.90291341 1 # Si | ||
2997 | 147 | -8.19260795 -2.74437054 10.93410102 1 # Si | ||
2998 | 148 | -8.34100436 -5.61139268 13.62454044 1 # Si | ||
2999 | 149 | -9.54137501 -4.12509126 12.28371979 1 # Si | ||
3000 | 150 | -6.82966552 -1.35920843 12.27960089 1 # Si | ||
3001 | 151 | -8.18242131 -0.02610591 -13.61801556 1 # Si | ||
3002 | 152 | -6.82966552 1.35920843 -12.27960089 1 # Si | ||
3003 | 153 | -9.54137501 4.12509126 -12.28371979 1 # Si | ||
3004 | 154 | -10.90149235 -0.01304838 -10.90149235 1 # Si | ||
3005 | 155 | -8.19260795 2.74437054 -10.93410102 1 # Si | ||
3006 | 156 | -8.19611273 0.01202455 -8.19611273 1 # Si | ||
3007 | 157 | -10.93410102 2.74437054 -8.19260795 1 # Si | ||
3008 | 158 | -9.56265344 1.38318968 -9.56265344 1 # Si | ||
3009 | 159 | -6.82705083 4.10298675 -9.56489675 1 # Si | ||
3010 | 160 | -6.82894278 1.37205363 -6.82894278 1 # Si | ||
3011 | 161 | -9.56489675 4.10298675 -6.82705083 1 # Si | ||
3012 | 162 | -10.91922202 -0.00117430 -5.46070202 1 # Si | ||
3013 | 163 | -8.19802839 2.73481248 -5.46221414 1 # Si | ||
3014 | 164 | -8.19459074 -0.00218763 -2.72767707 1 # Si | ||
3015 | 165 | -10.91829649 2.72813440 -2.72813440 1 # Si | ||
3016 | 166 | -9.55550648 1.36300571 -4.09408870 1 # Si | ||
3017 | 167 | -6.82965269 4.09758805 -4.09758805 1 # Si | ||
3018 | 168 | -6.82823155 1.36467215 -1.36467215 1 # Si | ||
3019 | 169 | -9.55550648 4.09408870 -1.36300571 1 # Si | ||
3020 | 170 | -10.94349563 0.00000000 -0.00000000 1 # Si | ||
3021 | 171 | -8.19459074 2.72767707 0.00218763 1 # Si | ||
3022 | 172 | -8.19459074 0.00218763 2.72767707 1 # Si | ||
3023 | 173 | -10.93548204 2.72665137 2.72665137 1 # Si | ||
3024 | 174 | -9.56805296 1.36256401 1.36256401 1 # Si | ||
3025 | 175 | -6.82665093 4.09489509 1.36387577 1 # Si | ||
3026 | 176 | -6.82665093 1.36387577 4.09489509 1 # Si | ||
3027 | 177 | -9.56309566 4.09195916 4.09195916 1 # Si | ||
3028 | 178 | -10.91922202 0.00117430 5.46070202 1 # Si | ||
3029 | 179 | -8.19145655 2.72890018 5.45886981 1 # Si | ||
3030 | 180 | -8.19611273 -0.01202455 8.19611273 1 # Si | ||
3031 | 181 | -10.91859845 2.73303284 8.18958251 1 # Si | ||
3032 | 182 | -9.55456223 1.36492084 6.82852418 1 # Si | ||
3033 | 183 | -6.82463094 4.09496380 6.82463094 1 # Si | ||
3034 | 184 | -6.82852418 1.36492084 9.55456223 1 # Si | ||
3035 | 185 | -9.53373688 4.08178398 9.53373688 1 # Si | ||
3036 | 186 | -10.90149235 0.01304838 10.90149235 1 # Si | ||
3037 | 187 | -8.18958251 2.73303284 10.91859845 1 # Si | ||
3038 | 188 | -8.18242131 0.02610591 13.61801556 1 # Si | ||
3039 | 189 | -9.54338724 1.35303719 12.25680064 1 # Si | ||
3040 | 190 | -6.80192861 4.06859976 12.27486761 1 # Si | ||
3041 | 191 | -6.81988895 1.33325565 15.00302593 1 # Si | ||
3042 | 192 | -8.34100436 5.61139268 -13.62454044 1 # Si | ||
3043 | 193 | -6.84800235 6.84800235 -12.30649445 1 # Si | ||
3044 | 194 | -10.90291341 5.43284542 -10.90291341 1 # Si | ||
3045 | 195 | -8.17530342 8.17530342 -10.89255734 1 # Si | ||
3046 | 196 | -8.19345007 5.46312108 -8.19345007 1 # Si | ||
3047 | 197 | -10.89255734 8.17530342 -8.17530342 1 # Si | ||
3048 | 198 | -9.55790920 6.82271744 -9.55790920 1 # Si | ||
3049 | 199 | -6.82271744 9.55790920 -9.55790920 1 # Si | ||
3050 | 200 | -6.82700831 6.82700831 -6.82700831 1 # Si | ||
3051 | 201 | -9.55790920 9.55790920 -6.82271744 1 # Si | ||
3052 | 202 | -10.94234231 5.47569502 -5.47569502 1 # Si | ||
3053 | 203 | -8.19345007 8.19345007 -5.46312108 1 # Si | ||
3054 | 204 | -8.19802839 5.46221414 -2.73481248 1 # Si | ||
3055 | 205 | -10.93410102 8.19260795 -2.74437054 1 # Si | ||
3056 | 206 | -9.56489675 6.82705083 -4.10298675 1 # Si | ||
3057 | 207 | -6.82705083 9.56489675 -4.10298675 1 # Si | ||
3058 | 208 | -6.82894278 6.82894278 -1.37205363 1 # Si | ||
3059 | 209 | -9.56265344 9.56265344 -1.38318968 1 # Si | ||
3060 | 210 | -10.91922202 5.46070202 0.00117430 1 # Si | ||
3061 | 211 | -8.19611273 8.19611273 -0.01202455 1 # Si | ||
3062 | 212 | -8.19145655 5.45886981 2.72890018 1 # Si | ||
3063 | 213 | -10.91859845 8.18958251 2.73303284 1 # Si | ||
3064 | 214 | -9.55456223 6.82852418 1.36492084 1 # Si | ||
3065 | 215 | -6.82852418 9.55456223 1.36492084 1 # Si | ||
3066 | 216 | -6.82463094 6.82463094 4.09496380 1 # Si | ||
3067 | 217 | -9.53373688 9.53373688 4.08178398 1 # Si | ||
3068 | 218 | -10.92814020 5.45537137 5.45537137 1 # Si | ||
3069 | 219 | -8.18684496 8.18684496 5.46061302 1 # Si | ||
3070 | 220 | -8.18684496 5.46061302 8.18684496 1 # Si | ||
3071 | 221 | -9.53854106 6.80203106 6.80203106 1 # Si | ||
3072 | 222 | -6.80203106 9.53854106 6.80203106 1 # Si | ||
3073 | 223 | -6.80203106 6.80203106 9.53854106 1 # Si | ||
3074 | 224 | -8.17530342 10.89255734 -8.17530342 1 # Si | ||
3075 | 225 | -6.84800235 12.30649445 -6.84800235 1 # Si | ||
3076 | 226 | -10.90291341 10.90291341 -5.43284542 1 # Si | ||
3077 | 227 | -8.34100436 13.62454044 -5.61139268 1 # Si | ||
3078 | 228 | -8.19260795 10.93410102 -2.74437054 1 # Si | ||
3079 | 229 | -9.54137501 12.28371979 -4.12509126 1 # Si | ||
3080 | 230 | -6.82966552 12.27960089 -1.35920843 1 # Si | ||
3081 | 231 | -10.90149235 10.90149235 0.01304838 1 # Si | ||
3082 | 232 | -8.18242131 13.61801556 0.02610591 1 # Si | ||
3083 | 233 | -8.18958251 10.91859845 2.73303284 1 # Si | ||
3084 | 234 | -9.54338724 12.25680064 1.35303719 1 # Si | ||
3085 | 235 | -6.81988895 15.00302593 1.33325565 1 # Si | ||
3086 | 236 | -6.80192861 12.27486761 4.06859976 1 # Si | ||
3087 | 237 | -1.35303719 -12.25680064 -9.54338724 1 # Si | ||
3088 | 238 | -1.33325565 -15.00302593 -6.81988895 1 # Si | ||
3089 | 239 | -4.06859976 -12.27486761 -6.80192861 1 # Si | ||
3090 | 240 | -2.72110232 -13.66848041 -5.45900176 1 # Si | ||
3091 | 241 | -2.73136988 -16.37023166 -2.73136988 1 # Si | ||
3092 | 242 | -5.45900176 -13.66848041 -2.72110232 1 # Si | ||
3093 | 243 | -4.07390228 -15.01032944 -4.07390228 1 # Si | ||
3094 | 244 | -1.35797308 -12.30121531 -4.09496434 1 # Si | ||
3095 | 245 | -1.36373167 -15.04397328 -1.36373167 1 # Si | ||
3096 | 246 | -4.09496434 -12.30121531 -1.35797308 1 # Si | ||
3097 | 247 | -5.63195305 -16.34134070 0.16771494 1 # Si | ||
3098 | 248 | -2.73058729 -13.68153993 0.00300340 1 # Si | ||
3099 | 249 | -2.90187977 -16.34634363 2.90187977 1 # Si | ||
3100 | 250 | -5.42510828 -13.61156377 2.69385812 1 # Si | ||
3101 | 251 | -4.10489826 -15.03413728 1.37590571 1 # Si | ||
3102 | 252 | -1.37011664 -12.30671934 1.37011664 1 # Si | ||
3103 | 253 | -1.37590571 -15.03413728 4.10489826 1 # Si | ||
3104 | 254 | -4.09402380 -12.27225867 4.09402380 1 # Si | ||
3105 | 255 | -2.69385812 -13.61156377 5.42510828 1 # Si | ||
3106 | 256 | -5.61139268 -13.62454044 8.34100436 1 # Si | ||
3107 | 257 | -1.35920843 -12.27960089 6.82966552 1 # Si | ||
3108 | 258 | -4.12509126 -12.28371979 9.54137501 1 # Si | ||
3109 | 259 | -1.33325565 -6.81988895 -15.00302593 1 # Si | ||
3110 | 260 | -1.35303719 -9.54338724 -12.25680064 1 # Si | ||
3111 | 261 | -4.06859976 -6.80192861 -12.27486761 1 # Si | ||
3112 | 262 | -2.73303284 -8.18958251 -10.91859845 1 # Si | ||
3113 | 263 | -2.73303284 -10.91859845 -8.18958251 1 # Si | ||
3114 | 264 | -5.46061302 -8.18684496 -8.18684496 1 # Si | ||
3115 | 265 | -4.08178398 -9.53373688 -9.53373688 1 # Si | ||
3116 | 266 | -1.36492084 -6.82852418 -9.55456223 1 # Si | ||
3117 | 267 | -1.36492084 -9.55456223 -6.82852418 1 # Si | ||
3118 | 268 | -4.09496380 -6.82463094 -6.82463094 1 # Si | ||
3119 | 269 | -5.45537137 -10.92814020 -5.45537137 1 # Si | ||
3120 | 270 | -2.72890018 -8.19145655 -5.45886981 1 # Si | ||
3121 | 271 | -2.72665137 -10.93548204 -2.72665137 1 # Si | ||
3122 | 272 | -5.45886981 -8.19145655 -2.72890018 1 # Si | ||
3123 | 273 | -4.09195916 -9.56309566 -4.09195916 1 # Si | ||
3124 | 274 | -1.36387577 -6.82665093 -4.09489509 1 # Si | ||
3125 | 275 | -1.36256401 -9.56805296 -1.36256401 1 # Si | ||
3126 | 276 | -4.09489509 -6.82665093 -1.36387577 1 # Si | ||
3127 | 277 | -5.46070202 -10.91922202 -0.00117430 1 # Si | ||
3128 | 278 | -2.72767707 -8.19459074 -0.00218763 1 # Si | ||
3129 | 279 | -2.72813440 -10.91829649 2.72813440 1 # Si | ||
3130 | 280 | -5.46221414 -8.19802839 2.73481248 1 # Si | ||
3131 | 281 | -4.09408870 -9.55550648 1.36300571 1 # Si | ||
3132 | 282 | -1.36467215 -6.82823155 1.36467215 1 # Si | ||
3133 | 283 | -1.36300571 -9.55550648 4.09408870 1 # Si | ||
3134 | 284 | -4.09758805 -6.82965269 4.09758805 1 # Si | ||
3135 | 285 | -5.47569502 -10.94234231 5.47569502 1 # Si | ||
3136 | 286 | -2.73481248 -8.19802839 5.46221414 1 # Si | ||
3137 | 287 | -2.74437054 -10.93410102 8.19260795 1 # Si | ||
3138 | 288 | -5.46312108 -8.19345007 8.19345007 1 # Si | ||
3139 | 289 | -4.10298675 -9.56489675 6.82705083 1 # Si | ||
3140 | 290 | -1.37205363 -6.82894278 6.82894278 1 # Si | ||
3141 | 291 | -1.38318968 -9.56265344 9.56265344 1 # Si | ||
3142 | 292 | -4.10298675 -6.82705083 9.56489675 1 # Si | ||
3143 | 293 | -5.43284542 -10.90291341 10.90291341 1 # Si | ||
3144 | 294 | -2.74437054 -8.19260795 10.93410102 1 # Si | ||
3145 | 295 | -5.61139268 -8.34100436 13.62454044 1 # Si | ||
3146 | 296 | -4.12509126 -9.54137501 12.28371979 1 # Si | ||
3147 | 297 | -1.35920843 -6.82966552 12.27960089 1 # Si | ||
3148 | 298 | -2.73136988 -2.73136988 -16.37023166 1 # Si | ||
3149 | 299 | -2.72110232 -5.45900176 -13.66848041 1 # Si | ||
3150 | 300 | -5.45900176 -2.72110232 -13.66848041 1 # Si | ||
3151 | 301 | -4.07390228 -4.07390228 -15.01032944 1 # Si | ||
3152 | 302 | -1.36373167 -1.36373167 -15.04397328 1 # Si | ||
3153 | 303 | -1.35797308 -4.09496434 -12.30121531 1 # Si | ||
3154 | 304 | -4.09496434 -1.35797308 -12.30121531 1 # Si | ||
3155 | 305 | -5.45537137 -5.45537137 -10.92814020 1 # Si | ||
3156 | 306 | -2.72665137 -2.72665137 -10.93548204 1 # Si | ||
3157 | 307 | -2.72890018 -5.45886981 -8.19145655 1 # Si | ||
3158 | 308 | -5.45886981 -2.72890018 -8.19145655 1 # Si | ||
3159 | 309 | -4.09195916 -4.09195916 -9.56309566 1 # Si | ||
3160 | 310 | -1.36256401 -1.36256401 -9.56805296 1 # Si | ||
3161 | 311 | -1.36387577 -4.09489509 -6.82665093 1 # Si | ||
3162 | 312 | -4.09489509 -1.36387577 -6.82665093 1 # Si | ||
3163 | 313 | -5.45846237 -5.45846237 -5.45846237 1 # Si | ||
3164 | 314 | -2.72992539 -2.72992539 -5.46104379 1 # Si | ||
3165 | 315 | -2.72992539 -5.46104379 -2.72992539 1 # Si | ||
3166 | 316 | -5.46104379 -2.72992539 -2.72992539 1 # Si | ||
3167 | 317 | -4.09449230 -4.09449230 -4.09449230 1 # Si | ||
3168 | 318 | -1.36499559 -1.36499559 -4.09571959 1 # Si | ||
3169 | 319 | -1.36499559 -4.09571959 -1.36499559 1 # Si | ||
3170 | 320 | -4.09571959 -1.36499559 -1.36499559 1 # Si | ||
3171 | 321 | -5.46373779 -5.46373779 0.00319897 1 # Si | ||
3172 | 322 | -2.73149619 -2.73149619 0.00070150 1 # Si | ||
3173 | 323 | -2.73166810 -5.46412728 2.73166810 1 # Si | ||
3174 | 324 | -5.46412728 -2.73166810 2.73166810 1 # Si | ||
3175 | 325 | -4.09725659 -4.09725659 1.36658639 1 # Si | ||
3176 | 326 | -1.36585704 -1.36585704 1.36585704 1 # Si | ||
3177 | 327 | -1.36658639 -4.09725659 4.09725659 1 # Si | ||
3178 | 328 | -4.09725659 -1.36658639 4.09725659 1 # Si | ||
3179 | 329 | -5.46236779 -5.46236779 5.46236779 1 # Si | ||
3180 | 330 | -2.73166810 -2.73166810 5.46412728 1 # Si | ||
3181 | 331 | -2.73481248 -5.46221414 8.19802839 1 # Si | ||
3182 | 332 | -5.46221414 -2.73481248 8.19802839 1 # Si | ||
3183 | 333 | -4.09758805 -4.09758805 6.82965269 1 # Si | ||
3184 | 334 | -1.36467215 -1.36467215 6.82823155 1 # Si | ||
3185 | 335 | -1.36300571 -4.09408870 9.55550648 1 # Si | ||
3186 | 336 | -4.09408870 -1.36300571 9.55550648 1 # Si | ||
3187 | 337 | -5.47569502 -5.47569502 10.94234231 1 # Si | ||
3188 | 338 | -2.72813440 -2.72813440 10.91829649 1 # Si | ||
3189 | 339 | -2.69385812 -5.42510828 13.61156377 1 # Si | ||
3190 | 340 | -5.42510828 -2.69385812 13.61156377 1 # Si | ||
3191 | 341 | -4.09402380 -4.09402380 12.27225867 1 # Si | ||
3192 | 342 | -1.37011664 -1.37011664 12.30671934 1 # Si | ||
3193 | 343 | -1.37590571 -4.10489826 15.03413728 1 # Si | ||
3194 | 344 | -4.10489826 -1.37590571 15.03413728 1 # Si | ||
3195 | 345 | -2.90187977 -2.90187977 16.34634363 1 # Si | ||
3196 | 346 | -5.63195305 0.16771494 -16.34134070 1 # Si | ||
3197 | 347 | -2.90187977 2.90187977 -16.34634363 1 # Si | ||
3198 | 348 | -2.73058729 0.00300340 -13.68153993 1 # Si | ||
3199 | 349 | -5.42510828 2.69385812 -13.61156377 1 # Si | ||
3200 | 350 | -4.10489826 1.37590571 -15.03413728 1 # Si | ||
3201 | 351 | -1.37590571 4.10489826 -15.03413728 1 # Si | ||
3202 | 352 | -1.37011664 1.37011664 -12.30671934 1 # Si | ||
3203 | 353 | -4.09402380 4.09402380 -12.27225867 1 # Si | ||
3204 | 354 | -5.46070202 -0.00117430 -10.91922202 1 # Si | ||
3205 | 355 | -2.72813440 2.72813440 -10.91829649 1 # Si | ||
3206 | 356 | -2.72767707 -0.00218763 -8.19459074 1 # Si | ||
3207 | 357 | -5.46221414 2.73481248 -8.19802839 1 # Si | ||
3208 | 358 | -4.09408870 1.36300571 -9.55550648 1 # Si | ||
3209 | 359 | -1.36300571 4.09408870 -9.55550648 1 # Si | ||
3210 | 360 | -1.36467215 1.36467215 -6.82823155 1 # Si | ||
3211 | 361 | -4.09758805 4.09758805 -6.82965269 1 # Si | ||
3212 | 362 | -5.46373779 0.00319897 -5.46373779 1 # Si | ||
3213 | 363 | -2.73166810 2.73166810 -5.46412728 1 # Si | ||
3214 | 364 | -2.73149619 0.00070150 -2.73149619 1 # Si | ||
3215 | 365 | -5.46412728 2.73166810 -2.73166810 1 # Si | ||
3216 | 366 | -4.09725659 1.36658639 -4.09725659 1 # Si | ||
3217 | 367 | -1.36658639 4.09725659 -4.09725659 1 # Si | ||
3218 | 368 | -1.36585704 1.36585704 -1.36585704 1 # Si | ||
3219 | 369 | -4.09725659 4.09725659 -1.36658639 1 # Si | ||
3220 | 370 | -5.46151579 -0.00000000 0.00000000 1 # Si | ||
3221 | 371 | -2.73149619 2.73149619 -0.00070150 1 # Si | ||
3222 | 372 | -2.73149619 -0.00070150 2.73149619 1 # Si | ||
3223 | 373 | -5.46104379 2.72992539 2.72992539 1 # Si | ||
3224 | 374 | -4.09571959 1.36499559 1.36499559 1 # Si | ||
3225 | 375 | -1.36499559 4.09571959 1.36499559 1 # Si | ||
3226 | 376 | -1.36499559 1.36499559 4.09571959 1 # Si | ||
3227 | 377 | -4.09449230 4.09449230 4.09449230 1 # Si | ||
3228 | 378 | -5.46373779 -0.00319897 5.46373779 1 # Si | ||
3229 | 379 | -2.72992539 2.72992539 5.46104379 1 # Si | ||
3230 | 380 | -2.72767707 0.00218763 8.19459074 1 # Si | ||
3231 | 381 | -5.45886981 2.72890018 8.19145655 1 # Si | ||
3232 | 382 | -4.09489509 1.36387577 6.82665093 1 # Si | ||
3233 | 383 | -1.36387577 4.09489509 6.82665093 1 # Si | ||
3234 | 384 | -1.36256401 1.36256401 9.56805296 1 # Si | ||
3235 | 385 | -4.09195916 4.09195916 9.56309566 1 # Si | ||
3236 | 386 | -5.46070202 0.00117430 10.91922202 1 # Si | ||
3237 | 387 | -2.72665137 2.72665137 10.93548204 1 # Si | ||
3238 | 388 | -2.73058729 -0.00300340 13.68153993 1 # Si | ||
3239 | 389 | -5.45900176 2.72110232 13.66848041 1 # Si | ||
3240 | 390 | -4.09496434 1.35797308 12.30121531 1 # Si | ||
3241 | 391 | -1.35797308 4.09496434 12.30121531 1 # Si | ||
3242 | 392 | -1.36373167 1.36373167 15.04397328 1 # Si | ||
3243 | 393 | -4.07390228 4.07390228 15.01032944 1 # Si | ||
3244 | 394 | -5.63195305 -0.16771494 16.34134070 1 # Si | ||
3245 | 395 | -2.73136988 2.73136988 16.37023166 1 # Si | ||
3246 | 396 | -2.69385812 5.42510828 -13.61156377 1 # Si | ||
3247 | 397 | -5.61139268 8.34100436 -13.62454044 1 # Si | ||
3248 | 398 | -1.35920843 6.82966552 -12.27960089 1 # Si | ||
3249 | 399 | -4.12509126 9.54137501 -12.28371979 1 # Si | ||
3250 | 400 | -5.47569502 5.47569502 -10.94234231 1 # Si | ||
3251 | 401 | -2.74437054 8.19260795 -10.93410102 1 # Si | ||
3252 | 402 | -2.73481248 5.46221414 -8.19802839 1 # Si | ||
3253 | 403 | -5.46312108 8.19345007 -8.19345007 1 # Si | ||
3254 | 404 | -4.10298675 6.82705083 -9.56489675 1 # Si | ||
3255 | 405 | -1.38318968 9.56265344 -9.56265344 1 # Si | ||
3256 | 406 | -1.37205363 6.82894278 -6.82894278 1 # Si | ||
3257 | 407 | -4.10298675 9.56489675 -6.82705083 1 # Si | ||
3258 | 408 | -5.46236779 5.46236779 -5.46236779 1 # Si | ||
3259 | 409 | -2.73481248 8.19802839 -5.46221414 1 # Si | ||
3260 | 410 | -2.73166810 5.46412728 -2.73166810 1 # Si | ||
3261 | 411 | -5.46221414 8.19802839 -2.73481248 1 # Si | ||
3262 | 412 | -4.09758805 6.82965269 -4.09758805 1 # Si | ||
3263 | 413 | -1.36300571 9.55550648 -4.09408870 1 # Si | ||
3264 | 414 | -1.36467215 6.82823155 -1.36467215 1 # Si | ||
3265 | 415 | -4.09408870 9.55550648 -1.36300571 1 # Si | ||
3266 | 416 | -5.46373779 5.46373779 -0.00319897 1 # Si | ||
3267 | 417 | -2.72767707 8.19459074 0.00218763 1 # Si | ||
3268 | 418 | -2.72992539 5.46104379 2.72992539 1 # Si | ||
3269 | 419 | -5.45886981 8.19145655 2.72890018 1 # Si | ||
3270 | 420 | -4.09489509 6.82665093 1.36387577 1 # Si | ||
3271 | 421 | -1.36256401 9.56805296 1.36256401 1 # Si | ||
3272 | 422 | -1.36387577 6.82665093 4.09489509 1 # Si | ||
3273 | 423 | -4.09195916 9.56309566 4.09195916 1 # Si | ||
3274 | 424 | -5.45846237 5.45846237 5.45846237 1 # Si | ||
3275 | 425 | -2.72890018 8.19145655 5.45886981 1 # Si | ||
3276 | 426 | -2.72890018 5.45886981 8.19145655 1 # Si | ||
3277 | 427 | -5.46061302 8.18684496 8.18684496 1 # Si | ||
3278 | 428 | -4.09496380 6.82463094 6.82463094 1 # Si | ||
3279 | 429 | -1.36492084 9.55456223 6.82852418 1 # Si | ||
3280 | 430 | -1.36492084 6.82852418 9.55456223 1 # Si | ||
3281 | 431 | -4.08178398 9.53373688 9.53373688 1 # Si | ||
3282 | 432 | -5.45537137 5.45537137 10.92814020 1 # Si | ||
3283 | 433 | -2.73303284 8.18958251 10.91859845 1 # Si | ||
3284 | 434 | -2.72110232 5.45900176 13.66848041 1 # Si | ||
3285 | 435 | -4.06859976 6.80192861 12.27486761 1 # Si | ||
3286 | 436 | -1.35303719 9.54338724 12.25680064 1 # Si | ||
3287 | 437 | -1.33325565 6.81988895 15.00302593 1 # Si | ||
3288 | 438 | -5.43284542 10.90291341 -10.90291341 1 # Si | ||
3289 | 439 | -2.74437054 10.93410102 -8.19260795 1 # Si | ||
3290 | 440 | -5.61139268 13.62454044 -8.34100436 1 # Si | ||
3291 | 441 | -4.12509126 12.28371979 -9.54137501 1 # Si | ||
3292 | 442 | -1.35920843 12.27960089 -6.82966552 1 # Si | ||
3293 | 443 | -5.47569502 10.94234231 -5.47569502 1 # Si | ||
3294 | 444 | -2.69385812 13.61156377 -5.42510828 1 # Si | ||
3295 | 445 | -2.72813440 10.91829649 -2.72813440 1 # Si | ||
3296 | 446 | -5.42510828 13.61156377 -2.69385812 1 # Si | ||
3297 | 447 | -4.09402380 12.27225867 -4.09402380 1 # Si | ||
3298 | 448 | -1.37590571 15.03413728 -4.10489826 1 # Si | ||
3299 | 449 | -1.37011664 12.30671934 -1.37011664 1 # Si | ||
3300 | 450 | -4.10489826 15.03413728 -1.37590571 1 # Si | ||
3301 | 451 | -5.46070202 10.91922202 0.00117430 1 # Si | ||
3302 | 452 | -2.73058729 13.68153993 -0.00300340 1 # Si | ||
3303 | 453 | -2.72665137 10.93548204 2.72665137 1 # Si | ||
3304 | 454 | -5.45900176 13.66848041 2.72110232 1 # Si | ||
3305 | 455 | -4.09496434 12.30121531 1.35797308 1 # Si | ||
3306 | 456 | -1.36373167 15.04397328 1.36373167 1 # Si | ||
3307 | 457 | -1.35797308 12.30121531 4.09496434 1 # Si | ||
3308 | 458 | -4.07390228 15.01032944 4.07390228 1 # Si | ||
3309 | 459 | -5.45537137 10.92814020 5.45537137 1 # Si | ||
3310 | 460 | -2.72110232 13.66848041 5.45900176 1 # Si | ||
3311 | 461 | -2.73303284 10.91859845 8.18958251 1 # Si | ||
3312 | 462 | -4.06859976 12.27486761 6.80192861 1 # Si | ||
3313 | 463 | -1.33325565 15.00302593 6.81988895 1 # Si | ||
3314 | 464 | -1.35303719 12.25680064 9.54338724 1 # Si | ||
3315 | 465 | -2.90187977 16.34634363 -2.90187977 1 # Si | ||
3316 | 466 | -5.63195305 16.34134070 -0.16771494 1 # Si | ||
3317 | 467 | -2.73136988 16.37023166 2.73136988 1 # Si | ||
3318 | 468 | -0.02610591 -13.61801556 -8.18242131 1 # Si | ||
3319 | 469 | 4.12509126 -12.28371979 -9.54137501 1 # Si | ||
3320 | 470 | 1.35920843 -12.27960089 -6.82966552 1 # Si | ||
3321 | 471 | 0.16771494 -16.34134070 -5.63195305 1 # Si | ||
3322 | 472 | 2.69385812 -13.61156377 -5.42510828 1 # Si | ||
3323 | 473 | 2.90187977 -16.34634363 -2.90187977 1 # Si | ||
3324 | 474 | 0.00300340 -13.68153993 -2.73058729 1 # Si | ||
3325 | 475 | 1.37590571 -15.03413728 -4.10489826 1 # Si | ||
3326 | 476 | 4.09402380 -12.27225867 -4.09402380 1 # Si | ||
3327 | 477 | 4.10489826 -15.03413728 -1.37590571 1 # Si | ||
3328 | 478 | 1.37011664 -12.30671934 -1.37011664 1 # Si | ||
3329 | 479 | -0.00000000 -16.37821316 -0.00000000 1 # Si | ||
3330 | 480 | 2.73058729 -13.68153993 -0.00300340 1 # Si | ||
3331 | 481 | 2.73136988 -16.37023166 2.73136988 1 # Si | ||
3332 | 482 | -0.00300340 -13.68153993 2.73058729 1 # Si | ||
3333 | 483 | 1.36373167 -15.04397328 1.36373167 1 # Si | ||
3334 | 484 | 4.09496434 -12.30121531 1.35797308 1 # Si | ||
3335 | 485 | 4.07390228 -15.01032944 4.07390228 1 # Si | ||
3336 | 486 | 1.35797308 -12.30121531 4.09496434 1 # Si | ||
3337 | 487 | -0.16771494 -16.34134070 5.63195305 1 # Si | ||
3338 | 488 | 2.72110232 -13.66848041 5.45900176 1 # Si | ||
3339 | 489 | 0.02610591 -13.61801556 8.18242131 1 # Si | ||
3340 | 490 | 1.33325565 -15.00302593 6.81988895 1 # Si | ||
3341 | 491 | 4.06859976 -12.27486761 6.80192861 1 # Si | ||
3342 | 492 | 1.35303719 -12.25680064 9.54338724 1 # Si | ||
3343 | 493 | -0.02610591 -8.18242131 -13.61801556 1 # Si | ||
3344 | 494 | 4.12509126 -9.54137501 -12.28371979 1 # Si | ||
3345 | 495 | 1.35920843 -6.82966552 -12.27960089 1 # Si | ||
3346 | 496 | -0.01304838 -10.90149235 -10.90149235 1 # Si | ||
3347 | 497 | 2.74437054 -8.19260795 -10.93410102 1 # Si | ||
3348 | 498 | 2.74437054 -10.93410102 -8.19260795 1 # Si | ||
3349 | 499 | 0.01202455 -8.19611273 -8.19611273 1 # Si | ||
3350 | 500 | 1.38318968 -9.56265344 -9.56265344 1 # Si | ||
3351 | 501 | 4.10298675 -6.82705083 -9.56489675 1 # Si | ||
3352 | 502 | 4.10298675 -9.56489675 -6.82705083 1 # Si | ||
3353 | 503 | 1.37205363 -6.82894278 -6.82894278 1 # Si | ||
3354 | 504 | -0.00117430 -10.91922202 -5.46070202 1 # Si | ||
3355 | 505 | 2.73481248 -8.19802839 -5.46221414 1 # Si | ||
3356 | 506 | 2.72813440 -10.91829649 -2.72813440 1 # Si | ||
3357 | 507 | -0.00218763 -8.19459074 -2.72767707 1 # Si | ||
3358 | 508 | 1.36300571 -9.55550648 -4.09408870 1 # Si | ||
3359 | 509 | 4.09758805 -6.82965269 -4.09758805 1 # Si | ||
3360 | 510 | 4.09408870 -9.55550648 -1.36300571 1 # Si | ||
3361 | 511 | 1.36467215 -6.82823155 -1.36467215 1 # Si | ||
3362 | 512 | 0.00000000 -10.94349563 0.00000000 1 # Si | ||
3363 | 513 | 2.72767707 -8.19459074 0.00218763 1 # Si | ||
3364 | 514 | 2.72665137 -10.93548204 2.72665137 1 # Si | ||
3365 | 515 | 0.00218763 -8.19459074 2.72767707 1 # Si | ||
3366 | 516 | 1.36256401 -9.56805296 1.36256401 1 # Si | ||
3367 | 517 | 4.09489509 -6.82665093 1.36387577 1 # Si | ||
3368 | 518 | 4.09195916 -9.56309566 4.09195916 1 # Si | ||
3369 | 519 | 1.36387577 -6.82665093 4.09489509 1 # Si | ||
3370 | 520 | 0.00117430 -10.91922202 5.46070202 1 # Si | ||
3371 | 521 | 2.72890018 -8.19145655 5.45886981 1 # Si | ||
3372 | 522 | 2.73303284 -10.91859845 8.18958251 1 # Si | ||
3373 | 523 | -0.01202455 -8.19611273 8.19611273 1 # Si | ||
3374 | 524 | 1.36492084 -9.55456223 6.82852418 1 # Si | ||
3375 | 525 | 4.09496380 -6.82463094 6.82463094 1 # Si | ||
3376 | 526 | 4.08178398 -9.53373688 9.53373688 1 # Si | ||
3377 | 527 | 1.36492084 -6.82852418 9.55456223 1 # Si | ||
3378 | 528 | 0.01304838 -10.90149235 10.90149235 1 # Si | ||
3379 | 529 | 2.73303284 -8.18958251 10.91859845 1 # Si | ||
3380 | 530 | 0.02610591 -8.18242131 13.61801556 1 # Si | ||
3381 | 531 | 1.35303719 -9.54338724 12.25680064 1 # Si | ||
3382 | 532 | 4.06859976 -6.80192861 12.27486761 1 # Si | ||
3383 | 533 | 1.33325565 -6.81988895 15.00302593 1 # Si | ||
3384 | 534 | 0.16771494 -5.63195305 -16.34134070 1 # Si | ||
3385 | 535 | 2.90187977 -2.90187977 -16.34634363 1 # Si | ||
3386 | 536 | 2.69385812 -5.42510828 -13.61156377 1 # Si | ||
3387 | 537 | 0.00300340 -2.73058729 -13.68153993 1 # Si | ||
3388 | 538 | 1.37590571 -4.10489826 -15.03413728 1 # Si | ||
3389 | 539 | 4.10489826 -1.37590571 -15.03413728 1 # Si | ||
3390 | 540 | 4.09402380 -4.09402380 -12.27225867 1 # Si | ||
3391 | 541 | 1.37011664 -1.37011664 -12.30671934 1 # Si | ||
3392 | 542 | -0.00117430 -5.46070202 -10.91922202 1 # Si | ||
3393 | 543 | 2.72813440 -2.72813440 -10.91829649 1 # Si | ||
3394 | 544 | 2.73481248 -5.46221414 -8.19802839 1 # Si | ||
3395 | 545 | -0.00218763 -2.72767707 -8.19459074 1 # Si | ||
3396 | 546 | 1.36300571 -4.09408870 -9.55550648 1 # Si | ||
3397 | 547 | 4.09408870 -1.36300571 -9.55550648 1 # Si | ||
3398 | 548 | 4.09758805 -4.09758805 -6.82965269 1 # Si | ||
3399 | 549 | 1.36467215 -1.36467215 -6.82823155 1 # Si | ||
3400 | 550 | 0.00319897 -5.46373779 -5.46373779 1 # Si | ||
3401 | 551 | 2.73166810 -2.73166810 -5.46412728 1 # Si | ||
3402 | 552 | 2.73166810 -5.46412728 -2.73166810 1 # Si | ||
3403 | 553 | 0.00070150 -2.73149619 -2.73149619 1 # Si | ||
3404 | 554 | 1.36658639 -4.09725659 -4.09725659 1 # Si | ||
3405 | 555 | 4.09725659 -1.36658639 -4.09725659 1 # Si | ||
3406 | 556 | 4.09725659 -4.09725659 -1.36658639 1 # Si | ||
3407 | 557 | 1.36585704 -1.36585704 -1.36585704 1 # Si | ||
3408 | 558 | -0.00000000 -5.46151579 0.00000000 1 # Si | ||
3409 | 559 | 2.73149619 -2.73149619 -0.00070150 1 # Si | ||
3410 | 560 | 2.72992539 -5.46104379 2.72992539 1 # Si | ||
3411 | 561 | -0.00070150 -2.73149619 2.73149619 1 # Si | ||
3412 | 562 | 1.36499559 -4.09571959 1.36499559 1 # Si | ||
3413 | 563 | 4.09571959 -1.36499559 1.36499559 1 # Si | ||
3414 | 564 | 4.09449230 -4.09449230 4.09449230 1 # Si | ||
3415 | 565 | 1.36499559 -1.36499559 4.09571959 1 # Si | ||
3416 | 566 | -0.00319897 -5.46373779 5.46373779 1 # Si | ||
3417 | 567 | 2.72992539 -2.72992539 5.46104379 1 # Si | ||
3418 | 568 | 2.72890018 -5.45886981 8.19145655 1 # Si | ||
3419 | 569 | 0.00218763 -2.72767707 8.19459074 1 # Si | ||
3420 | 570 | 1.36387577 -4.09489509 6.82665093 1 # Si | ||
3421 | 571 | 4.09489509 -1.36387577 6.82665093 1 # Si | ||
3422 | 572 | 4.09195916 -4.09195916 9.56309566 1 # Si | ||
3423 | 573 | 1.36256401 -1.36256401 9.56805296 1 # Si | ||
3424 | 574 | 0.00117430 -5.46070202 10.91922202 1 # Si | ||
3425 | 575 | 2.72665137 -2.72665137 10.93548204 1 # Si | ||
3426 | 576 | 2.72110232 -5.45900176 13.66848041 1 # Si | ||
3427 | 577 | -0.00300340 -2.73058729 13.68153993 1 # Si | ||
3428 | 578 | 1.35797308 -4.09496434 12.30121531 1 # Si | ||
3429 | 579 | 4.09496434 -1.35797308 12.30121531 1 # Si | ||
3430 | 580 | 4.07390228 -4.07390228 15.01032944 1 # Si | ||
3431 | 581 | 1.36373167 -1.36373167 15.04397328 1 # Si | ||
3432 | 582 | -0.16771494 -5.63195305 16.34134070 1 # Si | ||
3433 | 583 | 2.73136988 -2.73136988 16.37023166 1 # Si | ||
3434 | 584 | -0.00000000 -0.00000000 -16.37821316 1 # Si | ||
3435 | 585 | 2.73136988 2.73136988 -16.37023166 1 # Si | ||
3436 | 586 | 2.73058729 -0.00300340 -13.68153993 1 # Si | ||
3437 | 587 | -0.00300340 2.73058729 -13.68153993 1 # Si | ||
3438 | 588 | 1.36373167 1.36373167 -15.04397328 1 # Si | ||
3439 | 589 | 4.07390228 4.07390228 -15.01032944 1 # Si | ||
3440 | 590 | 4.09496434 1.35797308 -12.30121531 1 # Si | ||
3441 | 591 | 1.35797308 4.09496434 -12.30121531 1 # Si | ||
3442 | 592 | 0.00000000 0.00000000 -10.94349563 1 # Si | ||
3443 | 593 | 2.72665137 2.72665137 -10.93548204 1 # Si | ||
3444 | 594 | 2.72767707 0.00218763 -8.19459074 1 # Si | ||
3445 | 595 | 0.00218763 2.72767707 -8.19459074 1 # Si | ||
3446 | 596 | 1.36256401 1.36256401 -9.56805296 1 # Si | ||
3447 | 597 | 4.09195916 4.09195916 -9.56309566 1 # Si | ||
3448 | 598 | 4.09489509 1.36387577 -6.82665093 1 # Si | ||
3449 | 599 | 1.36387577 4.09489509 -6.82665093 1 # Si | ||
3450 | 600 | -0.00000000 0.00000000 -5.46151579 1 # Si | ||
3451 | 601 | 2.72992539 2.72992539 -5.46104379 1 # Si | ||
3452 | 602 | 2.73149619 -0.00070150 -2.73149619 1 # Si | ||
3453 | 603 | -0.00070150 2.73149619 -2.73149619 1 # Si | ||
3454 | 604 | 1.36499559 1.36499559 -4.09571959 1 # Si | ||
3455 | 605 | 4.09449230 4.09449230 -4.09449230 1 # Si | ||
3456 | 606 | 4.09571959 1.36499559 -1.36499559 1 # Si | ||
3457 | 607 | 1.36499559 4.09571959 -1.36499559 1 # Si | ||
3458 | 608 | -0.00000000 0.00000000 -0.00000000 1 # Si | ||
3459 | 609 | 2.73149619 2.73149619 0.00070150 1 # Si | ||
3460 | 610 | 2.73149619 0.00070150 2.73149619 1 # Si | ||
3461 | 611 | 0.00070150 2.73149619 2.73149619 1 # Si | ||
3462 | 612 | 1.36585704 1.36585704 1.36585704 1 # Si | ||
3463 | 613 | 4.09725659 4.09725659 1.36658639 1 # Si | ||
3464 | 614 | 4.09725659 1.36658639 4.09725659 1 # Si | ||
3465 | 615 | 1.36658639 4.09725659 4.09725659 1 # Si | ||
3466 | 616 | -0.00000000 -0.00000000 5.46151579 1 # Si | ||
3467 | 617 | 2.73166810 2.73166810 5.46412728 1 # Si | ||
3468 | 618 | 2.72767707 -0.00218763 8.19459074 1 # Si | ||
3469 | 619 | -0.00218763 2.72767707 8.19459074 1 # Si | ||
3470 | 620 | 1.36467215 1.36467215 6.82823155 1 # Si | ||
3471 | 621 | 4.09758805 4.09758805 6.82965269 1 # Si | ||
3472 | 622 | 4.09408870 1.36300571 9.55550648 1 # Si | ||
3473 | 623 | 1.36300571 4.09408870 9.55550648 1 # Si | ||
3474 | 624 | -0.00000000 -0.00000000 10.94349563 1 # Si | ||
3475 | 625 | 2.72813440 2.72813440 10.91829649 1 # Si | ||
3476 | 626 | 2.73058729 0.00300340 13.68153993 1 # Si | ||
3477 | 627 | 0.00300340 2.73058729 13.68153993 1 # Si | ||
3478 | 628 | 1.37011664 1.37011664 12.30671934 1 # Si | ||
3479 | 629 | 4.09402380 4.09402380 12.27225867 1 # Si | ||
3480 | 630 | 4.10489826 1.37590571 15.03413728 1 # Si | ||
3481 | 631 | 1.37590571 4.10489826 15.03413728 1 # Si | ||
3482 | 632 | -0.00000000 -0.00000000 16.37821316 1 # Si | ||
3483 | 633 | 2.90187977 2.90187977 16.34634363 1 # Si | ||
3484 | 634 | -0.16771494 5.63195305 -16.34134070 1 # Si | ||
3485 | 635 | 2.72110232 5.45900176 -13.66848041 1 # Si | ||
3486 | 636 | 0.02610591 8.18242131 -13.61801556 1 # Si | ||
3487 | 637 | 1.33325565 6.81988895 -15.00302593 1 # Si | ||
3488 | 638 | 4.06859976 6.80192861 -12.27486761 1 # Si | ||
3489 | 639 | 1.35303719 9.54338724 -12.25680064 1 # Si | ||
3490 | 640 | 0.00117430 5.46070202 -10.91922202 1 # Si | ||
3491 | 641 | 2.73303284 8.18958251 -10.91859845 1 # Si | ||
3492 | 642 | 2.72890018 5.45886981 -8.19145655 1 # Si | ||
3493 | 643 | -0.01202455 8.19611273 -8.19611273 1 # Si | ||
3494 | 644 | 1.36492084 6.82852418 -9.55456223 1 # Si | ||
3495 | 645 | 4.08178398 9.53373688 -9.53373688 1 # Si | ||
3496 | 646 | 4.09496380 6.82463094 -6.82463094 1 # Si | ||
3497 | 647 | 1.36492084 9.55456223 -6.82852418 1 # Si | ||
3498 | 648 | -0.00319897 5.46373779 -5.46373779 1 # Si | ||
3499 | 649 | 2.72890018 8.19145655 -5.45886981 1 # Si | ||
3500 | 650 | 2.72992539 5.46104379 -2.72992539 1 # Si | ||
3501 | 651 | 0.00218763 8.19459074 -2.72767707 1 # Si | ||
3502 | 652 | 1.36387577 6.82665093 -4.09489509 1 # Si | ||
3503 | 653 | 4.09195916 9.56309566 -4.09195916 1 # Si | ||
3504 | 654 | 4.09489509 6.82665093 -1.36387577 1 # Si | ||
3505 | 655 | 1.36256401 9.56805296 -1.36256401 1 # Si | ||
3506 | 656 | -0.00000000 5.46151579 0.00000000 1 # Si | ||
3507 | 657 | 2.72767707 8.19459074 -0.00218763 1 # Si | ||
3508 | 658 | 2.73166810 5.46412728 2.73166810 1 # Si | ||
3509 | 659 | -0.00218763 8.19459074 2.72767707 1 # Si | ||
3510 | 660 | 1.36467215 6.82823155 1.36467215 1 # Si | ||
3511 | 661 | 4.09408870 9.55550648 1.36300571 1 # Si | ||
3512 | 662 | 4.09758805 6.82965269 4.09758805 1 # Si | ||
3513 | 663 | 1.36300571 9.55550648 4.09408870 1 # Si | ||
3514 | 664 | 0.00319897 5.46373779 5.46373779 1 # Si | ||
3515 | 665 | 2.73481248 8.19802839 5.46221414 1 # Si | ||
3516 | 666 | 2.73481248 5.46221414 8.19802839 1 # Si | ||
3517 | 667 | 0.01202455 8.19611273 8.19611273 1 # Si | ||
3518 | 668 | 1.37205363 6.82894278 6.82894278 1 # Si | ||
3519 | 669 | 4.10298675 9.56489675 6.82705083 1 # Si | ||
3520 | 670 | 4.10298675 6.82705083 9.56489675 1 # Si | ||
3521 | 671 | 1.38318968 9.56265344 9.56265344 1 # Si | ||
3522 | 672 | -0.00117430 5.46070202 10.91922202 1 # Si | ||
3523 | 673 | 2.74437054 8.19260795 10.93410102 1 # Si | ||
3524 | 674 | 2.69385812 5.42510828 13.61156377 1 # Si | ||
3525 | 675 | -0.02610591 8.18242131 13.61801556 1 # Si | ||
3526 | 676 | 1.35920843 6.82966552 12.27960089 1 # Si | ||
3527 | 677 | 4.12509126 9.54137501 12.28371979 1 # Si | ||
3528 | 678 | 0.16771494 5.63195305 16.34134070 1 # Si | ||
3529 | 679 | 0.01304838 10.90149235 -10.90149235 1 # Si | ||
3530 | 680 | 2.73303284 10.91859845 -8.18958251 1 # Si | ||
3531 | 681 | 0.02610591 13.61801556 -8.18242131 1 # Si | ||
3532 | 682 | 1.35303719 12.25680064 -9.54338724 1 # Si | ||
3533 | 683 | 4.06859976 12.27486761 -6.80192861 1 # Si | ||
3534 | 684 | 1.33325565 15.00302593 -6.81988895 1 # Si | ||
3535 | 685 | 0.00117430 10.91922202 -5.46070202 1 # Si | ||
3536 | 686 | 2.72110232 13.66848041 -5.45900176 1 # Si | ||
3537 | 687 | 2.72665137 10.93548204 -2.72665137 1 # Si | ||
3538 | 688 | -0.00300340 13.68153993 -2.73058729 1 # Si | ||
3539 | 689 | 1.35797308 12.30121531 -4.09496434 1 # Si | ||
3540 | 690 | 4.07390228 15.01032944 -4.07390228 1 # Si | ||
3541 | 691 | 4.09496434 12.30121531 -1.35797308 1 # Si | ||
3542 | 692 | 1.36373167 15.04397328 -1.36373167 1 # Si | ||
3543 | 693 | -0.00000000 10.94349563 0.00000000 1 # Si | ||
3544 | 694 | 2.73058729 13.68153993 0.00300340 1 # Si | ||
3545 | 695 | 2.72813440 10.91829649 2.72813440 1 # Si | ||
3546 | 696 | 0.00300340 13.68153993 2.73058729 1 # Si | ||
3547 | 697 | 1.37011664 12.30671934 1.37011664 1 # Si | ||
3548 | 698 | 4.10489826 15.03413728 1.37590571 1 # Si | ||
3549 | 699 | 4.09402380 12.27225867 4.09402380 1 # Si | ||
3550 | 700 | 1.37590571 15.03413728 4.10489826 1 # Si | ||
3551 | 701 | -0.00117430 10.91922202 5.46070202 1 # Si | ||
3552 | 702 | 2.69385812 13.61156377 5.42510828 1 # Si | ||
3553 | 703 | 2.74437054 10.93410102 8.19260795 1 # Si | ||
3554 | 704 | -0.02610591 13.61801556 8.18242131 1 # Si | ||
3555 | 705 | 1.35920843 12.27960089 6.82966552 1 # Si | ||
3556 | 706 | 4.12509126 12.28371979 9.54137501 1 # Si | ||
3557 | 707 | -0.01304838 10.90149235 10.90149235 1 # Si | ||
3558 | 708 | -0.16771494 16.34134070 -5.63195305 1 # Si | ||
3559 | 709 | 2.73136988 16.37023166 -2.73136988 1 # Si | ||
3560 | 710 | 0.00000000 16.37821316 -0.00000000 1 # Si | ||
3561 | 711 | 2.90187977 16.34634363 2.90187977 1 # Si | ||
3562 | 712 | 0.16771494 16.34134070 5.63195305 1 # Si | ||
3563 | 713 | 5.61139268 -13.62454044 -8.34100436 1 # Si | ||
3564 | 714 | 6.84800235 -12.30649445 -6.84800235 1 # Si | ||
3565 | 715 | 8.34100436 -13.62454044 -5.61139268 1 # Si | ||
3566 | 716 | 5.42510828 -13.61156377 -2.69385812 1 # Si | ||
3567 | 717 | 9.54137501 -12.28371979 -4.12509126 1 # Si | ||
3568 | 718 | 6.82966552 -12.27960089 -1.35920843 1 # Si | ||
3569 | 719 | 5.63195305 -16.34134070 -0.16771494 1 # Si | ||
3570 | 720 | 8.18242131 -13.61801556 0.02610591 1 # Si | ||
3571 | 721 | 5.45900176 -13.66848041 2.72110232 1 # Si | ||
3572 | 722 | 6.81988895 -15.00302593 1.33325565 1 # Si | ||
3573 | 723 | 9.54338724 -12.25680064 1.35303719 1 # Si | ||
3574 | 724 | 6.80192861 -12.27486761 4.06859976 1 # Si | ||
3575 | 725 | 5.61139268 -8.34100436 -13.62454044 1 # Si | ||
3576 | 726 | 6.84800235 -6.84800235 -12.30649445 1 # Si | ||
3577 | 727 | 5.43284542 -10.90291341 -10.90291341 1 # Si | ||
3578 | 728 | 8.17530342 -8.17530342 -10.89255734 1 # Si | ||
3579 | 729 | 8.17530342 -10.89255734 -8.17530342 1 # Si | ||
3580 | 730 | 5.46312108 -8.19345007 -8.19345007 1 # Si | ||
3581 | 731 | 6.82271744 -9.55790920 -9.55790920 1 # Si | ||
3582 | 732 | 9.55790920 -6.82271744 -9.55790920 1 # Si | ||
3583 | 733 | 9.55790920 -9.55790920 -6.82271744 1 # Si | ||
3584 | 734 | 6.82700831 -6.82700831 -6.82700831 1 # Si | ||
3585 | 735 | 5.47569502 -10.94234231 -5.47569502 1 # Si | ||
3586 | 736 | 8.19345007 -8.19345007 -5.46312108 1 # Si | ||
3587 | 737 | 8.19260795 -10.93410102 -2.74437054 1 # Si | ||
3588 | 738 | 5.46221414 -8.19802839 -2.73481248 1 # Si | ||
3589 | 739 | 6.82705083 -9.56489675 -4.10298675 1 # Si | ||
3590 | 740 | 9.56489675 -6.82705083 -4.10298675 1 # Si | ||
3591 | 741 | 9.56265344 -9.56265344 -1.38318968 1 # Si | ||
3592 | 742 | 6.82894278 -6.82894278 -1.37205363 1 # Si | ||
3593 | 743 | 5.46070202 -10.91922202 0.00117430 1 # Si | ||
3594 | 744 | 8.19611273 -8.19611273 -0.01202455 1 # Si | ||
3595 | 745 | 8.18958251 -10.91859845 2.73303284 1 # Si | ||
3596 | 746 | 5.45886981 -8.19145655 2.72890018 1 # Si | ||
3597 | 747 | 6.82852418 -9.55456223 1.36492084 1 # Si | ||
3598 | 748 | 9.55456223 -6.82852418 1.36492084 1 # Si | ||
3599 | 749 | 9.53373688 -9.53373688 4.08178398 1 # Si | ||
3600 | 750 | 6.82463094 -6.82463094 4.09496380 1 # Si | ||
3601 | 751 | 5.45537137 -10.92814020 5.45537137 1 # Si | ||
3602 | 752 | 8.18684496 -8.18684496 5.46061302 1 # Si | ||
3603 | 753 | 5.46061302 -8.18684496 8.18684496 1 # Si | ||
3604 | 754 | 6.80203106 -9.53854106 6.80203106 1 # Si | ||
3605 | 755 | 9.53854106 -6.80203106 6.80203106 1 # Si | ||
3606 | 756 | 6.80203106 -6.80203106 9.53854106 1 # Si | ||
3607 | 757 | 8.34100436 -5.61139268 -13.62454044 1 # Si | ||
3608 | 758 | 5.42510828 -2.69385812 -13.61156377 1 # Si | ||
3609 | 759 | 9.54137501 -4.12509126 -12.28371979 1 # Si | ||
3610 | 760 | 6.82966552 -1.35920843 -12.27960089 1 # Si | ||
3611 | 761 | 5.47569502 -5.47569502 -10.94234231 1 # Si | ||
3612 | 762 | 8.19260795 -2.74437054 -10.93410102 1 # Si | ||
3613 | 763 | 8.19345007 -5.46312108 -8.19345007 1 # Si | ||
3614 | 764 | 5.46221414 -2.73481248 -8.19802839 1 # Si | ||
3615 | 765 | 6.82705083 -4.10298675 -9.56489675 1 # Si | ||
3616 | 766 | 9.56265344 -1.38318968 -9.56265344 1 # Si | ||
3617 | 767 | 9.56489675 -4.10298675 -6.82705083 1 # Si | ||
3618 | 768 | 6.82894278 -1.37205363 -6.82894278 1 # Si | ||
3619 | 769 | 5.46236779 -5.46236779 -5.46236779 1 # Si | ||
3620 | 770 | 8.19802839 -2.73481248 -5.46221414 1 # Si | ||
3621 | 771 | 8.19802839 -5.46221414 -2.73481248 1 # Si | ||
3622 | 772 | 5.46412728 -2.73166810 -2.73166810 1 # Si | ||
3623 | 773 | 6.82965269 -4.09758805 -4.09758805 1 # Si | ||
3624 | 774 | 9.55550648 -1.36300571 -4.09408870 1 # Si | ||
3625 | 775 | 9.55550648 -4.09408870 -1.36300571 1 # Si | ||
3626 | 776 | 6.82823155 -1.36467215 -1.36467215 1 # Si | ||
3627 | 777 | 5.46373779 -5.46373779 -0.00319897 1 # Si | ||
3628 | 778 | 8.19459074 -2.72767707 0.00218763 1 # Si | ||
3629 | 779 | 8.19145655 -5.45886981 2.72890018 1 # Si | ||
3630 | 780 | 5.46104379 -2.72992539 2.72992539 1 # Si | ||
3631 | 781 | 6.82665093 -4.09489509 1.36387577 1 # Si | ||
3632 | 782 | 9.56805296 -1.36256401 1.36256401 1 # Si | ||
3633 | 783 | 9.56309566 -4.09195916 4.09195916 1 # Si | ||
3634 | 784 | 6.82665093 -1.36387577 4.09489509 1 # Si | ||
3635 | 785 | 5.45846237 -5.45846237 5.45846237 1 # Si | ||
3636 | 786 | 8.19145655 -2.72890018 5.45886981 1 # Si | ||
3637 | 787 | 8.18684496 -5.46061302 8.18684496 1 # Si | ||
3638 | 788 | 5.45886981 -2.72890018 8.19145655 1 # Si | ||
3639 | 789 | 6.82463094 -4.09496380 6.82463094 1 # Si | ||
3640 | 790 | 9.55456223 -1.36492084 6.82852418 1 # Si | ||
3641 | 791 | 9.53373688 -4.08178398 9.53373688 1 # Si | ||
3642 | 792 | 6.82852418 -1.36492084 9.55456223 1 # Si | ||
3643 | 793 | 5.45537137 -5.45537137 10.92814020 1 # Si | ||
3644 | 794 | 8.18958251 -2.73303284 10.91859845 1 # Si | ||
3645 | 795 | 5.45900176 -2.72110232 13.66848041 1 # Si | ||
3646 | 796 | 6.80192861 -4.06859976 12.27486761 1 # Si | ||
3647 | 797 | 9.54338724 -1.35303719 12.25680064 1 # Si | ||
3648 | 798 | 6.81988895 -1.33325565 15.00302593 1 # Si | ||
3649 | 799 | 5.63195305 -0.16771494 -16.34134070 1 # Si | ||
3650 | 800 | 8.18242131 0.02610591 -13.61801556 1 # Si | ||
3651 | 801 | 5.45900176 2.72110232 -13.66848041 1 # Si | ||
3652 | 802 | 6.81988895 1.33325565 -15.00302593 1 # Si | ||
3653 | 803 | 9.54338724 1.35303719 -12.25680064 1 # Si | ||
3654 | 804 | 6.80192861 4.06859976 -12.27486761 1 # Si | ||
3655 | 805 | 5.46070202 0.00117430 -10.91922202 1 # Si | ||
3656 | 806 | 8.18958251 2.73303284 -10.91859845 1 # Si | ||
3657 | 807 | 8.19611273 -0.01202455 -8.19611273 1 # Si | ||
3658 | 808 | 5.45886981 2.72890018 -8.19145655 1 # Si | ||
3659 | 809 | 6.82852418 1.36492084 -9.55456223 1 # Si | ||
3660 | 810 | 9.53373688 4.08178398 -9.53373688 1 # Si | ||
3661 | 811 | 9.55456223 1.36492084 -6.82852418 1 # Si | ||
3662 | 812 | 6.82463094 4.09496380 -6.82463094 1 # Si | ||
3663 | 813 | 5.46373779 -0.00319897 -5.46373779 1 # Si | ||
3664 | 814 | 8.19145655 2.72890018 -5.45886981 1 # Si | ||
3665 | 815 | 8.19459074 0.00218763 -2.72767707 1 # Si | ||
3666 | 816 | 5.46104379 2.72992539 -2.72992539 1 # Si | ||
3667 | 817 | 6.82665093 1.36387577 -4.09489509 1 # Si | ||
3668 | 818 | 9.56309566 4.09195916 -4.09195916 1 # Si | ||
3669 | 819 | 9.56805296 1.36256401 -1.36256401 1 # Si | ||
3670 | 820 | 6.82665093 4.09489509 -1.36387577 1 # Si | ||
3671 | 821 | 5.46151579 -0.00000000 0.00000000 1 # Si | ||
3672 | 822 | 8.19459074 2.72767707 -0.00218763 1 # Si | ||
3673 | 823 | 8.19459074 -0.00218763 2.72767707 1 # Si | ||
3674 | 824 | 5.46412728 2.73166810 2.73166810 1 # Si | ||
3675 | 825 | 6.82823155 1.36467215 1.36467215 1 # Si | ||
3676 | 826 | 9.55550648 4.09408870 1.36300571 1 # Si | ||
3677 | 827 | 9.55550648 1.36300571 4.09408870 1 # Si | ||
3678 | 828 | 6.82965269 4.09758805 4.09758805 1 # Si | ||
3679 | 829 | 5.46373779 0.00319897 5.46373779 1 # Si | ||
3680 | 830 | 8.19802839 2.73481248 5.46221414 1 # Si | ||
3681 | 831 | 8.19611273 0.01202455 8.19611273 1 # Si | ||
3682 | 832 | 5.46221414 2.73481248 8.19802839 1 # Si | ||
3683 | 833 | 6.82894278 1.37205363 6.82894278 1 # Si | ||
3684 | 834 | 9.56489675 4.10298675 6.82705083 1 # Si | ||
3685 | 835 | 9.56265344 1.38318968 9.56265344 1 # Si | ||
3686 | 836 | 6.82705083 4.10298675 9.56489675 1 # Si | ||
3687 | 837 | 5.46070202 -0.00117430 10.91922202 1 # Si | ||
3688 | 838 | 8.19260795 2.74437054 10.93410102 1 # Si | ||
3689 | 839 | 8.18242131 -0.02610591 13.61801556 1 # Si | ||
3690 | 840 | 5.42510828 2.69385812 13.61156377 1 # Si | ||
3691 | 841 | 6.82966552 1.35920843 12.27960089 1 # Si | ||
3692 | 842 | 9.54137501 4.12509126 12.28371979 1 # Si | ||
3693 | 843 | 5.63195305 0.16771494 16.34134070 1 # Si | ||
3694 | 844 | 5.45537137 5.45537137 -10.92814020 1 # Si | ||
3695 | 845 | 8.18684496 5.46061302 -8.18684496 1 # Si | ||
3696 | 846 | 5.46061302 8.18684496 -8.18684496 1 # Si | ||
3697 | 847 | 6.80203106 6.80203106 -9.53854106 1 # Si | ||
3698 | 848 | 9.53854106 6.80203106 -6.80203106 1 # Si | ||
3699 | 849 | 6.80203106 9.53854106 -6.80203106 1 # Si | ||
3700 | 850 | 5.45846237 5.45846237 -5.45846237 1 # Si | ||
3701 | 851 | 8.18684496 8.18684496 -5.46061302 1 # Si | ||
3702 | 852 | 8.19145655 5.45886981 -2.72890018 1 # Si | ||
3703 | 853 | 5.45886981 8.19145655 -2.72890018 1 # Si | ||
3704 | 854 | 6.82463094 6.82463094 -4.09496380 1 # Si | ||
3705 | 855 | 9.53373688 9.53373688 -4.08178398 1 # Si | ||
3706 | 856 | 9.55456223 6.82852418 -1.36492084 1 # Si | ||
3707 | 857 | 6.82852418 9.55456223 -1.36492084 1 # Si | ||
3708 | 858 | 5.46373779 5.46373779 0.00319897 1 # Si | ||
3709 | 859 | 8.19611273 8.19611273 0.01202455 1 # Si | ||
3710 | 860 | 8.19802839 5.46221414 2.73481248 1 # Si | ||
3711 | 861 | 5.46221414 8.19802839 2.73481248 1 # Si | ||
3712 | 862 | 6.82894278 6.82894278 1.37205363 1 # Si | ||
3713 | 863 | 9.56265344 9.56265344 1.38318968 1 # Si | ||
3714 | 864 | 9.56489675 6.82705083 4.10298675 1 # Si | ||
3715 | 865 | 6.82705083 9.56489675 4.10298675 1 # Si | ||
3716 | 866 | 5.46236779 5.46236779 5.46236779 1 # Si | ||
3717 | 867 | 8.19345007 8.19345007 5.46312108 1 # Si | ||
3718 | 868 | 8.19345007 5.46312108 8.19345007 1 # Si | ||
3719 | 869 | 5.46312108 8.19345007 8.19345007 1 # Si | ||
3720 | 870 | 6.82700831 6.82700831 6.82700831 1 # Si | ||
3721 | 871 | 9.55790920 9.55790920 6.82271744 1 # Si | ||
3722 | 872 | 9.55790920 6.82271744 9.55790920 1 # Si | ||
3723 | 873 | 6.82271744 9.55790920 9.55790920 1 # Si | ||
3724 | 874 | 5.47569502 5.47569502 10.94234231 1 # Si | ||
3725 | 875 | 8.17530342 8.17530342 10.89255734 1 # Si | ||
3726 | 876 | 8.34100436 5.61139268 13.62454044 1 # Si | ||
3727 | 877 | 5.61139268 8.34100436 13.62454044 1 # Si | ||
3728 | 878 | 6.84800235 6.84800235 12.30649445 1 # Si | ||
3729 | 879 | 5.45537137 10.92814020 -5.45537137 1 # Si | ||
3730 | 880 | 8.18958251 10.91859845 -2.73303284 1 # Si | ||
3731 | 881 | 5.45900176 13.66848041 -2.72110232 1 # Si | ||
3732 | 882 | 6.80192861 12.27486761 -4.06859976 1 # Si | ||
3733 | 883 | 9.54338724 12.25680064 -1.35303719 1 # Si | ||
3734 | 884 | 6.81988895 15.00302593 -1.33325565 1 # Si | ||
3735 | 885 | 5.46070202 10.91922202 -0.00117430 1 # Si | ||
3736 | 886 | 8.18242131 13.61801556 -0.02610591 1 # Si | ||
3737 | 887 | 8.19260795 10.93410102 2.74437054 1 # Si | ||
3738 | 888 | 5.42510828 13.61156377 2.69385812 1 # Si | ||
3739 | 889 | 6.82966552 12.27960089 1.35920843 1 # Si | ||
3740 | 890 | 9.54137501 12.28371979 4.12509126 1 # Si | ||
3741 | 891 | 5.47569502 10.94234231 5.47569502 1 # Si | ||
3742 | 892 | 8.34100436 13.62454044 5.61139268 1 # Si | ||
3743 | 893 | 8.17530342 10.89255734 8.17530342 1 # Si | ||
3744 | 894 | 5.61139268 13.62454044 8.34100436 1 # Si | ||
3745 | 895 | 6.84800235 12.30649445 6.84800235 1 # Si | ||
3746 | 896 | 5.43284542 10.90291341 10.90291341 1 # Si | ||
3747 | 897 | 5.63195305 16.34134070 0.16771494 1 # Si | ||
3748 | 898 | 10.89255734 -8.17530342 -8.17530342 1 # Si | ||
3749 | 899 | 12.30649445 -6.84800235 -6.84800235 1 # Si | ||
3750 | 900 | 10.90291341 -10.90291341 -5.43284542 1 # Si | ||
3751 | 901 | 13.62454044 -8.34100436 -5.61139268 1 # Si | ||
3752 | 902 | 10.93410102 -8.19260795 -2.74437054 1 # Si | ||
3753 | 903 | 12.28371979 -9.54137501 -4.12509126 1 # Si | ||
3754 | 904 | 12.27960089 -6.82966552 -1.35920843 1 # Si | ||
3755 | 905 | 10.90149235 -10.90149235 0.01304838 1 # Si | ||
3756 | 906 | 13.61801556 -8.18242131 0.02610591 1 # Si | ||
3757 | 907 | 10.91859845 -8.18958251 2.73303284 1 # Si | ||
3758 | 908 | 12.25680064 -9.54338724 1.35303719 1 # Si | ||
3759 | 909 | 15.00302593 -6.81988895 1.33325565 1 # Si | ||
3760 | 910 | 12.27486761 -6.80192861 4.06859976 1 # Si | ||
3761 | 911 | 10.90291341 -5.43284542 -10.90291341 1 # Si | ||
3762 | 912 | 13.62454044 -5.61139268 -8.34100436 1 # Si | ||
3763 | 913 | 10.93410102 -2.74437054 -8.19260795 1 # Si | ||
3764 | 914 | 12.28371979 -4.12509126 -9.54137501 1 # Si | ||
3765 | 915 | 12.27960089 -1.35920843 -6.82966552 1 # Si | ||
3766 | 916 | 10.94234231 -5.47569502 -5.47569502 1 # Si | ||
3767 | 917 | 13.61156377 -2.69385812 -5.42510828 1 # Si | ||
3768 | 918 | 13.61156377 -5.42510828 -2.69385812 1 # Si | ||
3769 | 919 | 10.91829649 -2.72813440 -2.72813440 1 # Si | ||
3770 | 920 | 12.27225867 -4.09402380 -4.09402380 1 # Si | ||
3771 | 921 | 15.03413728 -1.37590571 -4.10489826 1 # Si | ||
3772 | 922 | 15.03413728 -4.10489826 -1.37590571 1 # Si | ||
3773 | 923 | 12.30671934 -1.37011664 -1.37011664 1 # Si | ||
3774 | 924 | 10.91922202 -5.46070202 0.00117430 1 # Si | ||
3775 | 925 | 13.68153993 -2.73058729 -0.00300340 1 # Si | ||
3776 | 926 | 13.66848041 -5.45900176 2.72110232 1 # Si | ||
3777 | 927 | 10.93548204 -2.72665137 2.72665137 1 # Si | ||
3778 | 928 | 12.30121531 -4.09496434 1.35797308 1 # Si | ||
3779 | 929 | 15.04397328 -1.36373167 1.36373167 1 # Si | ||
3780 | 930 | 15.01032944 -4.07390228 4.07390228 1 # Si | ||
3781 | 931 | 12.30121531 -1.35797308 4.09496434 1 # Si | ||
3782 | 932 | 10.92814020 -5.45537137 5.45537137 1 # Si | ||
3783 | 933 | 13.66848041 -2.72110232 5.45900176 1 # Si | ||
3784 | 934 | 10.91859845 -2.73303284 8.18958251 1 # Si | ||
3785 | 935 | 12.27486761 -4.06859976 6.80192861 1 # Si | ||
3786 | 936 | 15.00302593 -1.33325565 6.81988895 1 # Si | ||
3787 | 937 | 12.25680064 -1.35303719 9.54338724 1 # Si | ||
3788 | 938 | 10.90149235 0.01304838 -10.90149235 1 # Si | ||
3789 | 939 | 13.61801556 0.02610591 -8.18242131 1 # Si | ||
3790 | 940 | 10.91859845 2.73303284 -8.18958251 1 # Si | ||
3791 | 941 | 12.25680064 1.35303719 -9.54338724 1 # Si | ||
3792 | 942 | 15.00302593 1.33325565 -6.81988895 1 # Si | ||
3793 | 943 | 12.27486761 4.06859976 -6.80192861 1 # Si | ||
3794 | 944 | 10.91922202 0.00117430 -5.46070202 1 # Si | ||
3795 | 945 | 13.66848041 2.72110232 -5.45900176 1 # Si | ||
3796 | 946 | 13.68153993 -0.00300340 -2.73058729 1 # Si | ||
3797 | 947 | 10.93548204 2.72665137 -2.72665137 1 # Si | ||
3798 | 948 | 12.30121531 1.35797308 -4.09496434 1 # Si | ||
3799 | 949 | 15.01032944 4.07390228 -4.07390228 1 # Si | ||
3800 | 950 | 15.04397328 1.36373167 -1.36373167 1 # Si | ||
3801 | 951 | 12.30121531 4.09496434 -1.35797308 1 # Si | ||
3802 | 952 | 10.94349563 0.00000000 -0.00000000 1 # Si | ||
3803 | 953 | 13.68153993 2.73058729 0.00300340 1 # Si | ||
3804 | 954 | 13.68153993 0.00300340 2.73058729 1 # Si | ||
3805 | 955 | 10.91829649 2.72813440 2.72813440 1 # Si | ||
3806 | 956 | 12.30671934 1.37011664 1.37011664 1 # Si | ||
3807 | 957 | 15.03413728 4.10489826 1.37590571 1 # Si | ||
3808 | 958 | 15.03413728 1.37590571 4.10489826 1 # Si | ||
3809 | 959 | 12.27225867 4.09402380 4.09402380 1 # Si | ||
3810 | 960 | 10.91922202 -0.00117430 5.46070202 1 # Si | ||
3811 | 961 | 13.61156377 2.69385812 5.42510828 1 # Si | ||
3812 | 962 | 13.61801556 -0.02610591 8.18242131 1 # Si | ||
3813 | 963 | 10.93410102 2.74437054 8.19260795 1 # Si | ||
3814 | 964 | 12.27960089 1.35920843 6.82966552 1 # Si | ||
3815 | 965 | 12.28371979 4.12509126 9.54137501 1 # Si | ||
3816 | 966 | 10.90149235 -0.01304838 10.90149235 1 # Si | ||
3817 | 967 | 10.92814020 5.45537137 -5.45537137 1 # Si | ||
3818 | 968 | 13.66848041 5.45900176 -2.72110232 1 # Si | ||
3819 | 969 | 10.91859845 8.18958251 -2.73303284 1 # Si | ||
3820 | 970 | 12.27486761 6.80192861 -4.06859976 1 # Si | ||
3821 | 971 | 15.00302593 6.81988895 -1.33325565 1 # Si | ||
3822 | 972 | 12.25680064 9.54338724 -1.35303719 1 # Si | ||
3823 | 973 | 10.91922202 5.46070202 -0.00117430 1 # Si | ||
3824 | 974 | 13.61801556 8.18242131 -0.02610591 1 # Si | ||
3825 | 975 | 13.61156377 5.42510828 2.69385812 1 # Si | ||
3826 | 976 | 10.93410102 8.19260795 2.74437054 1 # Si | ||
3827 | 977 | 12.27960089 6.82966552 1.35920843 1 # Si | ||
3828 | 978 | 12.28371979 9.54137501 4.12509126 1 # Si | ||
3829 | 979 | 10.94234231 5.47569502 5.47569502 1 # Si | ||
3830 | 980 | 13.62454044 8.34100436 5.61139268 1 # Si | ||
3831 | 981 | 13.62454044 5.61139268 8.34100436 1 # Si | ||
3832 | 982 | 10.89255734 8.17530342 8.17530342 1 # Si | ||
3833 | 983 | 12.30649445 6.84800235 6.84800235 1 # Si | ||
3834 | 984 | 10.90291341 5.43284542 10.90291341 1 # Si | ||
3835 | 985 | 10.90149235 10.90149235 -0.01304838 1 # Si | ||
3836 | 986 | 10.90291341 10.90291341 5.43284542 1 # Si | ||
3837 | 987 | 16.34634363 -2.90187977 -2.90187977 1 # Si | ||
3838 | 988 | 16.34134070 -5.63195305 -0.16771494 1 # Si | ||
3839 | 989 | 16.37023166 -2.73136988 2.73136988 1 # Si | ||
3840 | 990 | 16.34134070 -0.16771494 -5.63195305 1 # Si | ||
3841 | 991 | 16.37023166 2.73136988 -2.73136988 1 # Si | ||
3842 | 992 | 16.37821316 -0.00000000 -0.00000000 1 # Si | ||
3843 | 993 | 16.34634363 2.90187977 2.90187977 1 # Si | ||
3844 | 994 | 16.34134070 0.16771494 5.63195305 1 # Si | ||
3845 | 995 | 16.34134070 5.63195305 0.16771494 1 # Si | ||
3846 | 996 | -13.14107205 -7.67106057 -4.93773883 2 # H | ||
3847 | 997 | -13.12200813 -10.41265519 -2.22197561 2 # H | ||
3848 | 998 | -15.87081431 -7.68828624 -2.20095245 2 # H | ||
3849 | 999 | -14.47909953 -9.05114009 0.84828128 2 # H | ||
3850 | 1000 | -13.14542628 -10.40942624 3.25101117 2 # H | ||
3851 | 1001 | -13.12200813 -2.22197561 -10.41265519 2 # H | ||
3852 | 1002 | -13.14107205 -4.93773883 -7.67106057 2 # H | ||
3853 | 1003 | -15.87081431 -2.20095245 -7.68828624 2 # H | ||
3854 | 1004 | -15.87684776 -4.94293745 -4.94293745 2 # H | ||
3855 | 1005 | -14.48904263 -6.28831840 3.55914512 2 # H | ||
3856 | 1006 | -14.48904263 -3.55914512 6.28831840 2 # H | ||
3857 | 1007 | -13.14542628 -3.25101117 10.40942624 2 # H | ||
3858 | 1008 | -14.47909953 0.84828128 -9.05114009 2 # H | ||
3859 | 1009 | -13.14542628 3.25101117 -10.40942624 2 # H | ||
3860 | 1010 | -14.48904263 3.55914512 -6.28831840 2 # H | ||
3861 | 1011 | -15.87684776 4.94293745 4.94293745 2 # H | ||
3862 | 1012 | -14.47909953 -0.84828128 9.05114009 2 # H | ||
3863 | 1013 | -15.87081431 2.20095245 7.68828624 2 # H | ||
3864 | 1014 | -13.14107205 4.93773883 7.67106057 2 # H | ||
3865 | 1015 | -13.12200813 2.22197561 10.41265519 2 # H | ||
3866 | 1016 | -14.48904263 6.28831840 -3.55914512 2 # H | ||
3867 | 1017 | -13.14542628 10.40942624 -3.25101117 2 # H | ||
3868 | 1018 | -14.47909953 9.05114009 -0.84828128 2 # H | ||
3869 | 1019 | -15.87081431 7.68828624 2.20095245 2 # H | ||
3870 | 1020 | -13.12200813 10.41265519 2.22197561 2 # H | ||
3871 | 1021 | -13.14107205 7.67106057 4.93773883 2 # H | ||
3872 | 1022 | -7.67106057 -13.14107205 -4.93773883 2 # H | ||
3873 | 1023 | -7.68828624 -15.87081431 -2.20095245 2 # H | ||
3874 | 1024 | -10.41265519 -13.12200813 -2.22197561 2 # H | ||
3875 | 1025 | -9.05114009 -14.47909953 0.84828128 2 # H | ||
3876 | 1026 | -10.40942624 -13.14542628 3.25101117 2 # H | ||
3877 | 1027 | -7.67101940 -7.67101940 -10.40498818 2 # H | ||
3878 | 1028 | -7.67101940 -10.40498818 -7.67101940 2 # H | ||
3879 | 1029 | -10.40498818 -7.67101940 -7.67101940 2 # H | ||
3880 | 1030 | -10.40134885 -10.40134885 -4.95086615 2 # H | ||
3881 | 1031 | -11.77396546 -11.77396546 0.84562385 2 # H | ||
3882 | 1032 | -11.76622906 -11.76622906 6.31060507 2 # H | ||
3883 | 1033 | -9.04902753 -11.74957272 9.04902753 2 # H | ||
3884 | 1034 | -11.74957272 -9.04902753 9.04902753 2 # H | ||
3885 | 1035 | -9.04902753 -9.04902753 11.74957272 2 # H | ||
3886 | 1036 | -7.68828624 -2.20095245 -15.87081431 2 # H | ||
3887 | 1037 | -7.67106057 -4.93773883 -13.14107205 2 # H | ||
3888 | 1038 | -10.41265519 -2.22197561 -13.12200813 2 # H | ||
3889 | 1039 | -10.40134885 -4.95086615 -10.40134885 2 # H | ||
3890 | 1040 | -11.76622906 -6.31060507 11.76622906 2 # H | ||
3891 | 1041 | -10.40942624 -3.25101117 13.14542628 2 # H | ||
3892 | 1042 | -9.05114009 0.84828128 -14.47909953 2 # H | ||
3893 | 1043 | -10.40942624 3.25101117 -13.14542628 2 # H | ||
3894 | 1044 | -11.77396546 0.84562385 -11.77396546 2 # H | ||
3895 | 1045 | -10.40134885 4.95086615 10.40134885 2 # H | ||
3896 | 1046 | -11.77396546 -0.84562385 11.77396546 2 # H | ||
3897 | 1047 | -9.05114009 -0.84828128 14.47909953 2 # H | ||
3898 | 1048 | -10.41265519 2.22197561 13.12200813 2 # H | ||
3899 | 1049 | -7.67106057 4.93773883 13.14107205 2 # H | ||
3900 | 1050 | -7.68828624 2.20095245 15.87081431 2 # H | ||
3901 | 1051 | -11.76622906 6.31060507 -11.76622906 2 # H | ||
3902 | 1052 | -9.04902753 9.04902753 -11.74957272 2 # H | ||
3903 | 1053 | -11.74957272 9.04902753 -9.04902753 2 # H | ||
3904 | 1054 | -10.40134885 10.40134885 4.95086615 2 # H | ||
3905 | 1055 | -10.40498818 7.67101940 7.67101940 2 # H | ||
3906 | 1056 | -7.67101940 10.40498818 7.67101940 2 # H | ||
3907 | 1057 | -7.67101940 7.67101940 10.40498818 2 # H | ||
3908 | 1058 | -9.04902753 11.74957272 -9.04902753 2 # H | ||
3909 | 1059 | -11.76622906 11.76622906 -6.31060507 2 # H | ||
3910 | 1060 | -10.40942624 13.14542628 -3.25101117 2 # H | ||
3911 | 1061 | -11.77396546 11.77396546 -0.84562385 2 # H | ||
3912 | 1062 | -9.05114009 14.47909953 -0.84828128 2 # H | ||
3913 | 1063 | -10.41265519 13.12200813 2.22197561 2 # H | ||
3914 | 1064 | -7.68828624 15.87081431 2.20095245 2 # H | ||
3915 | 1065 | -7.67106057 13.14107205 4.93773883 2 # H | ||
3916 | 1066 | -2.22197561 -13.12200813 -10.41265519 2 # H | ||
3917 | 1067 | -2.20095245 -15.87081431 -7.68828624 2 # H | ||
3918 | 1068 | -4.93773883 -13.14107205 -7.67106057 2 # H | ||
3919 | 1069 | -4.94293745 -15.87684776 -4.94293745 2 # H | ||
3920 | 1070 | -6.28831840 -14.48904263 3.55914512 2 # H | ||
3921 | 1071 | -3.55914512 -14.48904263 6.28831840 2 # H | ||
3922 | 1072 | -3.25101117 -13.14542628 10.40942624 2 # H | ||
3923 | 1073 | -2.20095245 -7.68828624 -15.87081431 2 # H | ||
3924 | 1074 | -2.22197561 -10.41265519 -13.12200813 2 # H | ||
3925 | 1075 | -4.93773883 -7.67106057 -13.14107205 2 # H | ||
3926 | 1076 | -4.95086615 -10.40134885 -10.40134885 2 # H | ||
3927 | 1077 | -6.31060507 -11.76622906 11.76622906 2 # H | ||
3928 | 1078 | -3.25101117 -10.40942624 13.14542628 2 # H | ||
3929 | 1079 | -4.94293745 -4.94293745 -15.87684776 2 # H | ||
3930 | 1080 | -3.55914512 -6.28831840 14.48904263 2 # H | ||
3931 | 1081 | -6.28831840 -3.55914512 14.48904263 2 # H | ||
3932 | 1082 | -6.28831840 3.55914512 -14.48904263 2 # H | ||
3933 | 1083 | -4.94293745 4.94293745 15.87684776 2 # H | ||
3934 | 1084 | -3.55914512 6.28831840 -14.48904263 2 # H | ||
3935 | 1085 | -3.25101117 10.40942624 -13.14542628 2 # H | ||
3936 | 1086 | -4.95086615 10.40134885 10.40134885 2 # H | ||
3937 | 1087 | -4.93773883 7.67106057 13.14107205 2 # H | ||
3938 | 1088 | -2.22197561 10.41265519 13.12200813 2 # H | ||
3939 | 1089 | -2.20095245 7.68828624 15.87081431 2 # H | ||
3940 | 1090 | -6.31060507 11.76622906 -11.76622906 2 # H | ||
3941 | 1091 | -3.25101117 13.14542628 -10.40942624 2 # H | ||
3942 | 1092 | -3.55914512 14.48904263 -6.28831840 2 # H | ||
3943 | 1093 | -6.28831840 14.48904263 -3.55914512 2 # H | ||
3944 | 1094 | -4.94293745 15.87684776 4.94293745 2 # H | ||
3945 | 1095 | -4.93773883 13.14107205 7.67106057 2 # H | ||
3946 | 1096 | -2.20095245 15.87081431 7.68828624 2 # H | ||
3947 | 1097 | -2.22197561 13.12200813 10.41265519 2 # H | ||
3948 | 1098 | 0.84828128 -14.47909953 -9.05114009 2 # H | ||
3949 | 1099 | 3.25101117 -13.14542628 -10.40942624 2 # H | ||
3950 | 1100 | 3.55914512 -14.48904263 -6.28831840 2 # H | ||
3951 | 1101 | 4.94293745 -15.87684776 4.94293745 2 # H | ||
3952 | 1102 | -0.84828128 -14.47909953 9.05114009 2 # H | ||
3953 | 1103 | 2.20095245 -15.87081431 7.68828624 2 # H | ||
3954 | 1104 | 4.93773883 -13.14107205 7.67106057 2 # H | ||
3955 | 1105 | 2.22197561 -13.12200813 10.41265519 2 # H | ||
3956 | 1106 | 0.84828128 -9.05114009 -14.47909953 2 # H | ||
3957 | 1107 | 3.25101117 -10.40942624 -13.14542628 2 # H | ||
3958 | 1108 | 0.84562385 -11.77396546 -11.77396546 2 # H | ||
3959 | 1109 | 4.95086615 -10.40134885 10.40134885 2 # H | ||
3960 | 1110 | -0.84562385 -11.77396546 11.77396546 2 # H | ||
3961 | 1111 | -0.84828128 -9.05114009 14.47909953 2 # H | ||
3962 | 1112 | 2.22197561 -10.41265519 13.12200813 2 # H | ||
3963 | 1113 | 4.93773883 -7.67106057 13.14107205 2 # H | ||
3964 | 1114 | 2.20095245 -7.68828624 15.87081431 2 # H | ||
3965 | 1115 | 3.55914512 -6.28831840 -14.48904263 2 # H | ||
3966 | 1116 | 4.94293745 -4.94293745 15.87684776 2 # H | ||
3967 | 1117 | 4.94293745 4.94293745 -15.87684776 2 # H | ||
3968 | 1118 | -0.84828128 9.05114009 -14.47909953 2 # H | ||
3969 | 1119 | 2.20095245 7.68828624 -15.87081431 2 # H | ||
3970 | 1120 | 4.93773883 7.67106057 -13.14107205 2 # H | ||
3971 | 1121 | 2.22197561 10.41265519 -13.12200813 2 # H | ||
3972 | 1122 | 4.95086615 10.40134885 -10.40134885 2 # H | ||
3973 | 1123 | 3.55914512 6.28831840 14.48904263 2 # H | ||
3974 | 1124 | 0.84828128 9.05114009 14.47909953 2 # H | ||
3975 | 1125 | 3.25101117 10.40942624 13.14542628 2 # H | ||
3976 | 1126 | -0.84562385 11.77396546 -11.77396546 2 # H | ||
3977 | 1127 | -0.84828128 14.47909953 -9.05114009 2 # H | ||
3978 | 1128 | 2.22197561 13.12200813 -10.41265519 2 # H | ||
3979 | 1129 | 4.93773883 13.14107205 -7.67106057 2 # H | ||
3980 | 1130 | 2.20095245 15.87081431 -7.68828624 2 # H | ||
3981 | 1131 | 4.94293745 15.87684776 -4.94293745 2 # H | ||
3982 | 1132 | 3.55914512 14.48904263 6.28831840 2 # H | ||
3983 | 1133 | 0.84828128 14.47909953 9.05114009 2 # H | ||
3984 | 1134 | 3.25101117 13.14542628 10.40942624 2 # H | ||
3985 | 1135 | 0.84562385 11.77396546 11.77396546 2 # H | ||
3986 | 1136 | 6.28831840 -14.48904263 -3.55914512 2 # H | ||
3987 | 1137 | 10.40942624 -13.14542628 -3.25101117 2 # H | ||
3988 | 1138 | 9.05114009 -14.47909953 -0.84828128 2 # H | ||
3989 | 1139 | 7.68828624 -15.87081431 2.20095245 2 # H | ||
3990 | 1140 | 10.41265519 -13.12200813 2.22197561 2 # H | ||
3991 | 1141 | 7.67106057 -13.14107205 4.93773883 2 # H | ||
3992 | 1142 | 6.31060507 -11.76622906 -11.76622906 2 # H | ||
3993 | 1143 | 9.04902753 -9.04902753 -11.74957272 2 # H | ||
3994 | 1144 | 9.04902753 -11.74957272 -9.04902753 2 # H | ||
3995 | 1145 | 10.40134885 -10.40134885 4.95086615 2 # H | ||
3996 | 1146 | 7.67101940 -10.40498818 7.67101940 2 # H | ||
3997 | 1147 | 10.40498818 -7.67101940 7.67101940 2 # H | ||
3998 | 1148 | 7.67101940 -7.67101940 10.40498818 2 # H | ||
3999 | 1149 | 6.28831840 -3.55914512 -14.48904263 2 # H | ||
4000 | 1150 | 10.40942624 -3.25101117 -13.14542628 2 # H | ||
4001 | 1151 | 10.40134885 -4.95086615 10.40134885 2 # H | ||
4002 | 1152 | 7.67106057 -4.93773883 13.14107205 2 # H | ||
4003 | 1153 | 10.41265519 -2.22197561 13.12200813 2 # H | ||
4004 | 1154 | 7.68828624 -2.20095245 15.87081431 2 # H | ||
4005 | 1155 | 9.05114009 -0.84828128 -14.47909953 2 # H | ||
4006 | 1156 | 7.68828624 2.20095245 -15.87081431 2 # H | ||
4007 | 1157 | 10.41265519 2.22197561 -13.12200813 2 # H | ||
4008 | 1158 | 7.67106057 4.93773883 -13.14107205 2 # H | ||
4009 | 1159 | 10.40134885 4.95086615 -10.40134885 2 # H | ||
4010 | 1160 | 9.05114009 0.84828128 14.47909953 2 # H | ||
4011 | 1161 | 6.28831840 3.55914512 14.48904263 2 # H | ||
4012 | 1162 | 10.40942624 3.25101117 13.14542628 2 # H | ||
4013 | 1163 | 7.67101940 7.67101940 -10.40498818 2 # H | ||
4014 | 1164 | 10.40498818 7.67101940 -7.67101940 2 # H | ||
4015 | 1165 | 7.67101940 10.40498818 -7.67101940 2 # H | ||
4016 | 1166 | 10.40134885 10.40134885 -4.95086615 2 # H | ||
4017 | 1167 | 9.04902753 9.04902753 11.74957272 2 # H | ||
4018 | 1168 | 7.67106057 13.14107205 -4.93773883 2 # H | ||
4019 | 1169 | 10.41265519 13.12200813 -2.22197561 2 # H | ||
4020 | 1170 | 7.68828624 15.87081431 -2.20095245 2 # H | ||
4021 | 1171 | 9.05114009 14.47909953 0.84828128 2 # H | ||
4022 | 1172 | 6.28831840 14.48904263 3.55914512 2 # H | ||
4023 | 1173 | 10.40942624 13.14542628 3.25101117 2 # H | ||
4024 | 1174 | 9.04902753 11.74957272 9.04902753 2 # H | ||
4025 | 1175 | 6.31060507 11.76622906 11.76622906 2 # H | ||
4026 | 1176 | 11.74957272 -9.04902753 -9.04902753 2 # H | ||
4027 | 1177 | 11.76622906 -11.76622906 -6.31060507 2 # H | ||
4028 | 1178 | 13.14542628 -10.40942624 -3.25101117 2 # H | ||
4029 | 1179 | 11.77396546 -11.77396546 -0.84562385 2 # H | ||
4030 | 1180 | 14.47909953 -9.05114009 -0.84828128 2 # H | ||
4031 | 1181 | 13.12200813 -10.41265519 2.22197561 2 # H | ||
4032 | 1182 | 15.87081431 -7.68828624 2.20095245 2 # H | ||
4033 | 1183 | 13.14107205 -7.67106057 4.93773883 2 # H | ||
4034 | 1184 | 11.76622906 -6.31060507 -11.76622906 2 # H | ||
4035 | 1185 | 13.14542628 -3.25101117 -10.40942624 2 # H | ||
4036 | 1186 | 14.48904263 -3.55914512 -6.28831840 2 # H | ||
4037 | 1187 | 14.48904263 -6.28831840 -3.55914512 2 # H | ||
4038 | 1188 | 15.87684776 -4.94293745 4.94293745 2 # H | ||
4039 | 1189 | 13.14107205 -4.93773883 7.67106057 2 # H | ||
4040 | 1190 | 15.87081431 -2.20095245 7.68828624 2 # H | ||
4041 | 1191 | 13.12200813 -2.22197561 10.41265519 2 # H | ||
4042 | 1192 | 11.77396546 -0.84562385 -11.77396546 2 # H | ||
4043 | 1193 | 14.47909953 -0.84828128 -9.05114009 2 # H | ||
4044 | 1194 | 13.12200813 2.22197561 -10.41265519 2 # H | ||
4045 | 1195 | 15.87081431 2.20095245 -7.68828624 2 # H | ||
4046 | 1196 | 13.14107205 4.93773883 -7.67106057 2 # H | ||
4047 | 1197 | 15.87684776 4.94293745 -4.94293745 2 # H | ||
4048 | 1198 | 14.48904263 3.55914512 6.28831840 2 # H | ||
4049 | 1199 | 14.47909953 0.84828128 9.05114009 2 # H | ||
4050 | 1200 | 13.14542628 3.25101117 10.40942624 2 # H | ||
4051 | 1201 | 11.77396546 0.84562385 11.77396546 2 # H | ||
4052 | 1202 | 13.14107205 7.67106057 -4.93773883 2 # H | ||
4053 | 1203 | 15.87081431 7.68828624 -2.20095245 2 # H | ||
4054 | 1204 | 13.12200813 10.41265519 -2.22197561 2 # H | ||
4055 | 1205 | 14.47909953 9.05114009 0.84828128 2 # H | ||
4056 | 1206 | 14.48904263 6.28831840 3.55914512 2 # H | ||
4057 | 1207 | 13.14542628 10.40942624 3.25101117 2 # H | ||
4058 | 1208 | 11.74957272 9.04902753 9.04902753 2 # H | ||
4059 | 1209 | 11.76622906 6.31060507 11.76622906 2 # H | ||
4060 | 1210 | 11.77396546 11.77396546 0.84562385 2 # H | ||
4061 | 1211 | 11.76622906 11.76622906 6.31060507 2 # H | ||
4062 | 1212 | -14.25049869 -9.30903112 6.56976732 2 # H | ||
4063 | 1213 | -14.73854562 -7.62887682 4.90661761 2 # H | ||
4064 | 1214 | -17.26005319 -3.58592496 -1.88119305 2 # H | ||
4065 | 1215 | -17.26005319 -1.88119305 -3.58592496 2 # H | ||
4066 | 1216 | -16.92458989 -6.60756054 1.14534264 2 # H | ||
4067 | 1217 | -17.48851584 -4.95538862 -0.51858345 2 # H | ||
4068 | 1218 | -16.92565018 -3.87958702 3.87958702 2 # H | ||
4069 | 1219 | -17.49703350 -2.22300603 2.22300603 2 # H | ||
4070 | 1220 | -14.25049869 -6.56976732 9.30903112 2 # H | ||
4071 | 1221 | -14.73854562 -4.90661761 7.62887682 2 # H | ||
4072 | 1222 | -17.48851584 -0.51858345 -4.95538862 2 # H | ||
4073 | 1223 | -16.92458989 1.14534264 -6.60756054 2 # H | ||
4074 | 1224 | -17.49703350 2.22300603 -2.22300603 2 # H | ||
4075 | 1225 | -16.92565018 3.87958702 -3.87958702 2 # H | ||
4076 | 1226 | -17.26821617 -0.85235208 0.85235208 2 # H | ||
4077 | 1227 | -17.26821617 0.85235208 -0.85235208 2 # H | ||
4078 | 1228 | -17.26005319 1.88119305 3.58592496 2 # H | ||
4079 | 1229 | -17.26005319 3.58592496 1.88119305 2 # H | ||
4080 | 1230 | -16.92458989 -1.14534264 6.60756054 2 # H | ||
4081 | 1231 | -17.48851584 0.51858345 4.95538862 2 # H | ||
4082 | 1232 | -14.73854562 4.90661761 -7.62887682 2 # H | ||
4083 | 1233 | -14.25049869 6.56976732 -9.30903112 2 # H | ||
4084 | 1234 | -14.73854562 7.62887682 -4.90661761 2 # H | ||
4085 | 1235 | -14.25049869 9.30903112 -6.56976732 2 # H | ||
4086 | 1236 | -17.48851584 4.95538862 0.51858345 2 # H | ||
4087 | 1237 | -16.92458989 6.60756054 -1.14534264 2 # H | ||
4088 | 1238 | -7.62887682 -14.73854562 4.90661761 2 # H | ||
4089 | 1239 | -9.30903112 -14.25049869 6.56976732 2 # H | ||
4090 | 1240 | -7.62887682 -4.90661761 14.73854562 2 # H | ||
4091 | 1241 | -9.30903112 -6.56976732 14.25049869 2 # H | ||
4092 | 1242 | -9.30903112 6.56976732 -14.25049869 2 # H | ||
4093 | 1243 | -7.62887682 4.90661761 -14.73854562 2 # H | ||
4094 | 1244 | -9.30903112 14.25049869 -6.56976732 2 # H | ||
4095 | 1245 | -7.62887682 14.73854562 -4.90661761 2 # H | ||
4096 | 1246 | -1.88119305 -17.26005319 -3.58592496 2 # H | ||
4097 | 1247 | -3.58592496 -17.26005319 -1.88119305 2 # H | ||
4098 | 1248 | -4.95538862 -17.48851584 -0.51858345 2 # H | ||
4099 | 1249 | -6.60756054 -16.92458989 1.14534264 2 # H | ||
4100 | 1250 | -2.22300603 -17.49703350 2.22300603 2 # H | ||
4101 | 1251 | -3.87958702 -16.92565018 3.87958702 2 # H | ||
4102 | 1252 | -4.90661761 -14.73854562 7.62887682 2 # H | ||
4103 | 1253 | -6.56976732 -14.25049869 9.30903112 2 # H | ||
4104 | 1254 | -6.56976732 -9.30903112 14.25049869 2 # H | ||
4105 | 1255 | -4.90661761 -7.62887682 14.73854562 2 # H | ||
4106 | 1256 | -3.58592496 -1.88119305 -17.26005319 2 # H | ||
4107 | 1257 | -1.88119305 -3.58592496 -17.26005319 2 # H | ||
4108 | 1258 | -2.22300603 -2.22300603 17.49703350 2 # H | ||
4109 | 1259 | -3.87958702 -3.87958702 16.92565018 2 # H | ||
4110 | 1260 | -6.60756054 1.14534264 -16.92458989 2 # H | ||
4111 | 1261 | -4.95538862 -0.51858345 -17.48851584 2 # H | ||
4112 | 1262 | -3.87958702 3.87958702 -16.92565018 2 # H | ||
4113 | 1263 | -2.22300603 2.22300603 -17.49703350 2 # H | ||
4114 | 1264 | -6.60756054 -1.14534264 16.92458989 2 # H | ||
4115 | 1265 | -4.95538862 0.51858345 17.48851584 2 # H | ||
4116 | 1266 | -1.88119305 3.58592496 17.26005319 2 # H | ||
4117 | 1267 | -3.58592496 1.88119305 17.26005319 2 # H | ||
4118 | 1268 | -6.56976732 9.30903112 -14.25049869 2 # H | ||
4119 | 1269 | -4.90661761 7.62887682 -14.73854562 2 # H | ||
4120 | 1270 | -4.90661761 14.73854562 -7.62887682 2 # H | ||
4121 | 1271 | -6.56976732 14.25049869 -9.30903112 2 # H | ||
4122 | 1272 | -3.87958702 16.92565018 -3.87958702 2 # H | ||
4123 | 1273 | -2.22300603 17.49703350 -2.22300603 2 # H | ||
4124 | 1274 | -4.95538862 17.48851584 0.51858345 2 # H | ||
4125 | 1275 | -6.60756054 16.92458989 -1.14534264 2 # H | ||
4126 | 1276 | -3.58592496 17.26005319 1.88119305 2 # H | ||
4127 | 1277 | -1.88119305 17.26005319 3.58592496 2 # H | ||
4128 | 1278 | 1.14534264 -16.92458989 -6.60756054 2 # H | ||
4129 | 1279 | -0.51858345 -17.48851584 -4.95538862 2 # H | ||
4130 | 1280 | 3.87958702 -16.92565018 -3.87958702 2 # H | ||
4131 | 1281 | 2.22300603 -17.49703350 -2.22300603 2 # H | ||
4132 | 1282 | 0.85235208 -17.26821617 -0.85235208 2 # H | ||
4133 | 1283 | -0.85235208 -17.26821617 0.85235208 2 # H | ||
4134 | 1284 | 3.58592496 -17.26005319 1.88119305 2 # H | ||
4135 | 1285 | 1.88119305 -17.26005319 3.58592496 2 # H | ||
4136 | 1286 | 0.51858345 -17.48851584 4.95538862 2 # H | ||
4137 | 1287 | -1.14534264 -16.92458989 6.60756054 2 # H | ||
4138 | 1288 | -0.51858345 -4.95538862 -17.48851584 2 # H | ||
4139 | 1289 | 1.14534264 -6.60756054 -16.92458989 2 # H | ||
4140 | 1290 | 2.22300603 -2.22300603 -17.49703350 2 # H | ||
4141 | 1291 | 3.87958702 -3.87958702 -16.92565018 2 # H | ||
4142 | 1292 | -1.14534264 -6.60756054 16.92458989 2 # H | ||
4143 | 1293 | 0.51858345 -4.95538862 17.48851584 2 # H | ||
4144 | 1294 | 3.58592496 -1.88119305 17.26005319 2 # H | ||
4145 | 1295 | 1.88119305 -3.58592496 17.26005319 2 # H | ||
4146 | 1296 | -0.85235208 0.85235208 -17.26821617 2 # H | ||
4147 | 1297 | 0.85235208 -0.85235208 -17.26821617 2 # H | ||
4148 | 1298 | 1.88119305 3.58592496 -17.26005319 2 # H | ||
4149 | 1299 | 3.58592496 1.88119305 -17.26005319 2 # H | ||
4150 | 1300 | -0.85235208 -0.85235208 17.26821617 2 # H | ||
4151 | 1301 | 0.85235208 0.85235208 17.26821617 2 # H | ||
4152 | 1302 | 3.87958702 3.87958702 16.92565018 2 # H | ||
4153 | 1303 | 2.22300603 2.22300603 17.49703350 2 # H | ||
4154 | 1304 | -1.14534264 6.60756054 -16.92458989 2 # H | ||
4155 | 1305 | 0.51858345 4.95538862 -17.48851584 2 # H | ||
4156 | 1306 | -0.51858345 4.95538862 17.48851584 2 # H | ||
4157 | 1307 | 1.14534264 6.60756054 16.92458989 2 # H | ||
4158 | 1308 | 0.51858345 17.48851584 -4.95538862 2 # H | ||
4159 | 1309 | -1.14534264 16.92458989 -6.60756054 2 # H | ||
4160 | 1310 | 1.88119305 17.26005319 -3.58592496 2 # H | ||
4161 | 1311 | 3.58592496 17.26005319 -1.88119305 2 # H | ||
4162 | 1312 | 0.85235208 17.26821617 0.85235208 2 # H | ||
4163 | 1313 | -0.85235208 17.26821617 -0.85235208 2 # H | ||
4164 | 1314 | 2.22300603 17.49703350 2.22300603 2 # H | ||
4165 | 1315 | 3.87958702 16.92565018 3.87958702 2 # H | ||
4166 | 1316 | 1.14534264 16.92458989 6.60756054 2 # H | ||
4167 | 1317 | -0.51858345 17.48851584 4.95538862 2 # H | ||
4168 | 1318 | 6.56976732 -14.25049869 -9.30903112 2 # H | ||
4169 | 1319 | 4.90661761 -14.73854562 -7.62887682 2 # H | ||
4170 | 1320 | 9.30903112 -14.25049869 -6.56976732 2 # H | ||
4171 | 1321 | 7.62887682 -14.73854562 -4.90661761 2 # H | ||
4172 | 1322 | 6.60756054 -16.92458989 -1.14534264 2 # H | ||
4173 | 1323 | 4.95538862 -17.48851584 0.51858345 2 # H | ||
4174 | 1324 | 4.90661761 -7.62887682 -14.73854562 2 # H | ||
4175 | 1325 | 6.56976732 -9.30903112 -14.25049869 2 # H | ||
4176 | 1326 | 7.62887682 -4.90661761 -14.73854562 2 # H | ||
4177 | 1327 | 9.30903112 -6.56976732 -14.25049869 2 # H | ||
4178 | 1328 | 4.95538862 0.51858345 -17.48851584 2 # H | ||
4179 | 1329 | 6.60756054 -1.14534264 -16.92458989 2 # H | ||
4180 | 1330 | 4.95538862 -0.51858345 17.48851584 2 # H | ||
4181 | 1331 | 6.60756054 1.14534264 16.92458989 2 # H | ||
4182 | 1332 | 9.30903112 6.56976732 14.25049869 2 # H | ||
4183 | 1333 | 7.62887682 4.90661761 14.73854562 2 # H | ||
4184 | 1334 | 4.90661761 7.62887682 14.73854562 2 # H | ||
4185 | 1335 | 6.56976732 9.30903112 14.25049869 2 # H | ||
4186 | 1336 | 7.62887682 14.73854562 4.90661761 2 # H | ||
4187 | 1337 | 9.30903112 14.25049869 6.56976732 2 # H | ||
4188 | 1338 | 6.56976732 14.25049869 9.30903112 2 # H | ||
4189 | 1339 | 4.90661761 14.73854562 7.62887682 2 # H | ||
4190 | 1340 | 6.60756054 16.92458989 1.14534264 2 # H | ||
4191 | 1341 | 4.95538862 17.48851584 -0.51858345 2 # H | ||
4192 | 1342 | 14.73854562 -7.62887682 -4.90661761 2 # H | ||
4193 | 1343 | 14.25049869 -9.30903112 -6.56976732 2 # H | ||
4194 | 1344 | 14.25049869 -6.56976732 -9.30903112 2 # H | ||
4195 | 1345 | 14.73854562 -4.90661761 -7.62887682 2 # H | ||
4196 | 1346 | 14.25049869 9.30903112 6.56976732 2 # H | ||
4197 | 1347 | 14.73854562 7.62887682 4.90661761 2 # H | ||
4198 | 1348 | 14.73854562 4.90661761 7.62887682 2 # H | ||
4199 | 1349 | 14.25049869 6.56976732 9.30903112 2 # H | ||
4200 | 1350 | 17.49703350 -2.22300603 -2.22300603 2 # H | ||
4201 | 1351 | 16.92565018 -3.87958702 -3.87958702 2 # H | ||
4202 | 1352 | 16.92458989 -6.60756054 -1.14534264 2 # H | ||
4203 | 1353 | 17.48851584 -4.95538862 0.51858345 2 # H | ||
4204 | 1354 | 17.26005319 -1.88119305 3.58592496 2 # H | ||
4205 | 1355 | 17.26005319 -3.58592496 1.88119305 2 # H | ||
4206 | 1356 | 16.92458989 -1.14534264 -6.60756054 2 # H | ||
4207 | 1357 | 17.48851584 0.51858345 -4.95538862 2 # H | ||
4208 | 1358 | 17.26005319 3.58592496 -1.88119305 2 # H | ||
4209 | 1359 | 17.26005319 1.88119305 -3.58592496 2 # H | ||
4210 | 1360 | 17.26821617 -0.85235208 -0.85235208 2 # H | ||
4211 | 1361 | 17.26821617 0.85235208 0.85235208 2 # H | ||
4212 | 1362 | 16.92565018 3.87958702 3.87958702 2 # H | ||
4213 | 1363 | 17.49703350 2.22300603 2.22300603 2 # H | ||
4214 | 1364 | 17.48851584 -0.51858345 4.95538862 2 # H | ||
4215 | 1365 | 16.92458989 1.14534264 6.60756054 2 # H | ||
4216 | 1366 | 17.48851584 4.95538862 -0.51858345 2 # H | ||
4217 | 1367 | 16.92458989 6.60756054 1.14534264 2 # H | ||
4218 | 1368 | %endblock atomic-coordinates-and-atomic-species | ||
4219 | 0 | 1369 | ||
4220 | === added file 'Tests/si-quantum-dot/makefile' | |||
4221 | --- Tests/si-quantum-dot/makefile 1970-01-01 00:00:00 +0000 | |||
4222 | +++ Tests/si-quantum-dot/makefile 2019-01-16 11:00:58 +0000 | |||
4223 | @@ -0,0 +1,7 @@ | |||
4224 | 1 | # | ||
4225 | 2 | # Single-test makefile | ||
4226 | 3 | # | ||
4227 | 4 | name=si-quantum-dot | ||
4228 | 5 | EXTRAFILES=coords.Si987H372.fdf | ||
4229 | 6 | # | ||
4230 | 7 | include ../test.mk | ||
4231 | 0 | 8 | ||
4232 | === added file 'Tests/si-quantum-dot/si-quantum-dot.fdf' | |||
4233 | --- Tests/si-quantum-dot/si-quantum-dot.fdf 1970-01-01 00:00:00 +0000 | |||
4234 | +++ Tests/si-quantum-dot/si-quantum-dot.fdf 2019-01-16 11:00:58 +0000 | |||
4235 | @@ -0,0 +1,39 @@ | |||
4236 | 1 | use-tree-timer T | ||
4237 | 2 | SolutionMethod ELSI | ||
4238 | 3 | elsi-solver elpa | ||
4239 | 4 | |||
4240 | 5 | WriteDMHS.NetCDF F | ||
4241 | 6 | WriteDM.NetCDF F | ||
4242 | 7 | WriteDM T | ||
4243 | 8 | |||
4244 | 9 | SystemName Si Quantum Dot | ||
4245 | 10 | SystemLabel si-quantum-dot | ||
4246 | 11 | |||
4247 | 12 | %block ChemicalSpeciesLabel | ||
4248 | 13 | 1 14 Si | ||
4249 | 14 | 2 1 H | ||
4250 | 15 | %endblock ChemicalSpeciesLabel | ||
4251 | 16 | |||
4252 | 17 | # CSIRO quantum dot | ||
4253 | 18 | %include coords.Si987H372.fdf | ||
4254 | 19 | |||
4255 | 20 | PAO.BasisSize SZ | ||
4256 | 21 | PAO.EnergyShift 300 meV | ||
4257 | 22 | |||
4258 | 23 | # | ||
4259 | 24 | LatticeConstant 45.0 Ang | ||
4260 | 25 | %block LatticeVectors | ||
4261 | 26 | 1.000 0.000 0.000 | ||
4262 | 27 | 0.000 1.000 0.000 | ||
4263 | 28 | 0.000 0.000 1.000 | ||
4264 | 29 | %endblock LatticeVectors | ||
4265 | 30 | |||
4266 | 31 | MeshCutoff 150.0 Ry | ||
4267 | 32 | |||
4268 | 33 | MaxSCFIterations 40 | ||
4269 | 34 | DM.MixingWeight 0.3 | ||
4270 | 35 | DM.NumberPulay 4 | ||
4271 | 36 | DM.Tolerance 1.d-3 | ||
4272 | 37 | DM.UseSaveDM | ||
4273 | 38 | |||
4274 | 39 | ElectronicTemperature 25 meV | ||
4275 | 0 | 40 | ||
4276 | === added file 'Tests/si-quantum-dot/si-quantum-dot.pseudos' | |||
4277 | --- Tests/si-quantum-dot/si-quantum-dot.pseudos 1970-01-01 00:00:00 +0000 | |||
4278 | +++ Tests/si-quantum-dot/si-quantum-dot.pseudos 2019-01-16 11:00:58 +0000 | |||
4279 | @@ -0,0 +1,1 @@ | |||
4280 | 1 | Si H | ||
4281 | 0 | 2 | ||
4282 | === added directory 'Tests/sih-elsi' | |||
4283 | === added file 'Tests/sih-elsi/makefile' | |||
4284 | --- Tests/sih-elsi/makefile 1970-01-01 00:00:00 +0000 | |||
4285 | +++ Tests/sih-elsi/makefile 2019-01-16 11:00:58 +0000 | |||
4286 | @@ -0,0 +1,6 @@ | |||
4287 | 1 | # | ||
4288 | 2 | # Single-test makefile | ||
4289 | 3 | # | ||
4290 | 4 | name=sih-elsi | ||
4291 | 5 | # | ||
4292 | 6 | include ../test.mk | ||
4293 | 0 | 7 | ||
4294 | === added file 'Tests/sih-elsi/sih-elsi.fdf' | |||
4295 | --- Tests/sih-elsi/sih-elsi.fdf 1970-01-01 00:00:00 +0000 | |||
4296 | +++ Tests/sih-elsi/sih-elsi.fdf 2019-01-16 11:00:58 +0000 | |||
4297 | @@ -0,0 +1,121 @@ | |||
4298 | 1 | # ----------------------------------------------------------------------------- | ||
4299 | 2 | # FDF for interstitial H in a cubic c-Si supercell with 64 atoms | ||
4300 | 3 | # | ||
4301 | 4 | # E. Artacho, April 1999 | ||
4302 | 5 | # ----------------------------------------------------------------------------- | ||
4303 | 6 | |||
4304 | 7 | #------- | ||
4305 | 8 | ## compute-forces F | ||
4306 | 9 | SolutionMethod ELSI | ||
4307 | 10 | #MPI.Nprocs.SIESTA 1 | ||
4308 | 11 | |||
4309 | 12 | WriteDMHS.NetCDF F | ||
4310 | 13 | WriteDM.NetCDF F | ||
4311 | 14 | WriteDM T | ||
4312 | 15 | |||
4313 | 16 | SystemName H in 64-atom silicon - ELSI solver | ||
4314 | 17 | SystemLabel sih-elsi | ||
4315 | 18 | |||
4316 | 19 | NumberOfAtoms 65 | ||
4317 | 20 | NumberOfSpecies 2 | ||
4318 | 21 | |||
4319 | 22 | %block ChemicalSpeciesLabel | ||
4320 | 23 | 1 14 Si | ||
4321 | 24 | 2 1 H | ||
4322 | 25 | %endblock ChemicalSpeciesLabel | ||
4323 | 26 | |||
4324 | 27 | PAO.BasisSize DZP | ||
4325 | 28 | PAO.EnergyShift 300 meV | ||
4326 | 29 | |||
4327 | 30 | %block PAO.Basis | ||
4328 | 31 | H 1 | ||
4329 | 32 | 0 1 | ||
4330 | 33 | 0. | ||
4331 | 34 | 0.8 | ||
4332 | 35 | %endblock PAO.Basis | ||
4333 | 36 | |||
4334 | 37 | LatticeConstant 5.430 Ang | ||
4335 | 38 | %block LatticeVectors | ||
4336 | 39 | 2.000 0.000 0.000 | ||
4337 | 40 | 0.000 2.000 0.000 | ||
4338 | 41 | 0.000 0.000 2.000 | ||
4339 | 42 | %endblock LatticeVectors | ||
4340 | 43 | |||
4341 | 44 | MeshCutoff 100.0 Ry | ||
4342 | 45 | |||
4343 | 46 | MaxSCFIterations 20 | ||
4344 | 47 | DM.MixingWeight 0.3 | ||
4345 | 48 | DM.NumberPulay 4 | ||
4346 | 49 | DM.Tolerance 1.d-3 | ||
4347 | 50 | DM.UseSaveDM | ||
4348 | 51 | |||
4349 | 52 | ElectronicTemperature 25 meV | ||
4350 | 53 | |||
4351 | 54 | AtomicCoordinatesFormat ScaledCartesian | ||
4352 | 55 | %block AtomicCoordinatesAndAtomicSpecies | ||
4353 | 56 | 0.000 0.000 0.000 1 # Si 1 | ||
4354 | 57 | 0.250 0.250 0.250 1 # Si 2 | ||
4355 | 58 | 0.000 0.500 0.500 1 # Si 3 | ||
4356 | 59 | 0.250 0.750 0.750 1 # Si 4 | ||
4357 | 60 | 0.500 0.000 0.500 1 # Si 5 | ||
4358 | 61 | 0.750 0.250 0.750 1 # Si 6 | ||
4359 | 62 | 0.500 0.500 0.000 1 # Si 7 | ||
4360 | 63 | 0.750 0.750 0.250 1 # Si 8 | ||
4361 | 64 | 1.000 0.000 0.000 1 # Si 9 | ||
4362 | 65 | 1.250 0.250 0.250 1 # Si 10 | ||
4363 | 66 | 1.000 0.500 0.500 1 # Si 11 | ||
4364 | 67 | 1.250 0.750 0.750 1 # Si 12 | ||
4365 | 68 | 1.500 0.000 0.500 1 # Si 13 | ||
4366 | 69 | 1.750 0.250 0.750 1 # Si 14 | ||
4367 | 70 | 1.500 0.500 0.000 1 # Si 15 | ||
4368 | 71 | 1.750 0.750 0.250 1 # Si 16 | ||
4369 | 72 | 0.000 1.000 0.000 1 # Si 17 | ||
4370 | 73 | 0.250 1.250 0.250 1 # Si 18 | ||
4371 | 74 | 0.000 1.500 0.500 1 # Si 19 | ||
4372 | 75 | 0.250 1.750 0.750 1 # Si 20 | ||
4373 | 76 | 0.500 1.000 0.500 1 # Si 21 | ||
4374 | 77 | 0.750 1.250 0.750 1 # Si 22 | ||
4375 | 78 | 0.500 1.500 0.000 1 # Si 23 | ||
4376 | 79 | 0.750 1.750 0.250 1 # Si 24 | ||
4377 | 80 | 0.000 0.000 1.000 1 # Si 25 | ||
4378 | 81 | 0.250 0.250 1.250 1 # Si 26 | ||
4379 | 82 | 0.000 0.500 1.500 1 # Si 27 | ||
4380 | 83 | 0.250 0.750 1.750 1 # Si 28 | ||
4381 | 84 | 0.500 0.000 1.500 1 # Si 29 | ||
4382 | 85 | 0.750 0.250 1.750 1 # Si 30 | ||
4383 | 86 | 0.500 0.500 1.000 1 # Si 31 | ||
4384 | 87 | 0.750 0.750 1.250 1 # Si 32 | ||
4385 | 88 | 1.000 1.000 0.000 1 # Si 33 | ||
4386 | 89 | 1.250 1.250 0.250 1 # Si 34 | ||
4387 | 90 | 1.000 1.500 0.500 1 # Si 35 | ||
4388 | 91 | 1.250 1.750 0.750 1 # Si 36 | ||
4389 | 92 | 1.500 1.000 0.500 1 # Si 37 | ||
4390 | 93 | 1.750 1.250 0.750 1 # Si 38 | ||
4391 | 94 | 1.500 1.500 0.000 1 # Si 39 | ||
4392 | 95 | 1.750 1.750 0.250 1 # Si 40 | ||
4393 | 96 | 1.000 0.000 1.000 1 # Si 41 | ||
4394 | 97 | 1.250 0.250 1.250 1 # Si 42 | ||
4395 | 98 | 1.000 0.500 1.500 1 # Si 43 | ||
4396 | 99 | 1.250 0.750 1.750 1 # Si 44 | ||
4397 | 100 | 1.500 0.000 1.500 1 # Si 45 | ||
4398 | 101 | 1.750 0.250 1.750 1 # Si 46 | ||
4399 | 102 | 1.500 0.500 1.000 1 # Si 47 | ||
4400 | 103 | 1.750 0.750 1.250 1 # Si 48 | ||
4401 | 104 | 0.000 1.000 1.000 1 # Si 49 | ||
4402 | 105 | 0.250 1.250 1.250 1 # Si 50 | ||
4403 | 106 | 0.000 1.500 1.500 1 # Si 51 | ||
4404 | 107 | 0.250 1.750 1.750 1 # Si 52 | ||
4405 | 108 | 0.500 1.000 1.500 1 # Si 53 | ||
4406 | 109 | 0.750 1.250 1.750 1 # Si 54 | ||
4407 | 110 | 0.500 1.500 1.000 1 # Si 55 | ||
4408 | 111 | 0.750 1.750 1.250 1 # Si 56 | ||
4409 | 112 | 1.000 1.000 1.000 1 # Si 57 | ||
4410 | 113 | 1.250 1.250 1.250 1 # Si 58 | ||
4411 | 114 | 1.000 1.500 1.500 1 # Si 59 | ||
4412 | 115 | 1.250 1.750 1.750 1 # Si 60 | ||
4413 | 116 | 1.500 1.000 1.500 1 # Si 61 | ||
4414 | 117 | 1.750 1.250 1.750 1 # Si 62 | ||
4415 | 118 | 1.500 1.500 1.000 1 # Si 63 | ||
4416 | 119 | 1.750 1.750 1.250 1 # Si 64 | ||
4417 | 120 | 1.125 1.125 1.125 2 # H 65 | ||
4418 | 121 | %endblock AtomicCoordinatesAndAtomicSpecies | ||
4419 | 0 | 122 | ||
4420 | === added file 'Tests/sih-elsi/sih-elsi.pseudos' | |||
4421 | --- Tests/sih-elsi/sih-elsi.pseudos 1970-01-01 00:00:00 +0000 | |||
4422 | +++ Tests/sih-elsi/sih-elsi.pseudos 2019-01-16 11:00:58 +0000 | |||
4423 | @@ -0,0 +1,1 @@ | |||
4424 | 1 | Si H | ||
4425 | 0 | 2 | ||
4426 | === modified file 'version.info' | |||
4427 | --- version.info 2019-01-12 22:35:38 +0000 | |||
4428 | +++ version.info 2019-01-16 11:00:58 +0000 | |||
4429 | @@ -1,2 +1,7 @@ | |||
4430 | 1 | <<<<<<< TREE | ||
4431 | 1 | trunk-755 | 2 | trunk-755 |
4432 | 2 | 3 | ||
4433 | 4 | ======= | ||
4434 | 5 | trunk-710--elsi-dm-695 | ||
4435 | 6 | |||
4436 | 7 | >>>>>>> MERGE-SOURCE |
Victor: As a test of the MR process it is fine, but you should specify the target branch as siesta/ trunk-elsi- dm
~albertog/