Merge lp:~albertog/siesta/4.1-superc-gamma into lp:siesta/4.1
- 4.1-superc-gamma
- Merge into rel-4.1
Proposed by
Alberto Garcia
Status: | Merged |
---|---|
Merged at revision: | 934 |
Proposed branch: | lp:~albertog/siesta/4.1-superc-gamma |
Merge into: | lp:siesta/4.1 |
Diff against target: |
3918 lines (+766/-858) 42 files modified
Src/Makefile (+45/-44) Src/bands.F (+2/-3) Src/compute_dm.F (+19/-10) Src/compute_rhog.F (+0/-1) Src/diag2g.F (+26/-20) Src/diag3g.F (+26/-25) Src/diagg.F (+5/-1) Src/diagon.F (+9/-43) Src/final_H_f_stress.F (+9/-5) Src/intrinsic_missing.F90 (+1/-6) Src/local_DOS.F (+1/-2) Src/m_gamma.F90 (+0/-18) Src/m_hsx.F (+8/-11) Src/m_ncdf_siesta.F90 (+0/-1) Src/m_transiesta.F90 (+3/-3) Src/pdos.F (+3/-5) Src/pdos2g.F (+23/-21) Src/pdos3g.F (+25/-23) Src/post_scf_work.F (+5/-8) Src/projected_DOS.F (+3/-3) Src/setup_hamiltonian.F (+1/-2) Src/siesta_analysis.F (+3/-5) Src/siesta_init.F (+8/-9) Src/state_init.F (+13/-14) Src/writewave.F (+15/-65) Util/COOP/Makefile (+45/-45) Util/COOP/dm_creator.F90 (+2/-3) Util/COOP/fat.f90 (+2/-3) Util/COOP/io_hs.f90 (+11/-4) Util/COOP/main_vars.f90 (+0/-1) Util/COOP/mprop.f90 (+2/-3) Util/Denchar/Src/Makefile (+45/-45) Util/Gen-basis/Makefile (+45/-45) Util/Grimme/Makefile (+45/-45) Util/Helpers/Makefile (+45/-45) Util/STM/ol-stm/Src/Makefile (+45/-45) Util/SpPivot/Makefile (+45/-45) Util/TS/TBtrans/Makefile (+45/-45) Util/TS/ts2ts/Makefile (+45/-45) Util/TS/tshs2tshs/Makefile (+45/-45) Util/VCA/Makefile (+45/-45) version.info (+1/-1) |
To merge this branch: | bzr merge lp:~albertog/siesta/4.1-superc-gamma |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Nick Papior | Pending | ||
Review via email: mp+348268@code.launchpad.net |
Commit message
Description of the change
Removed m_gamma module.
Clarified the relationship (or lack thereof) between 'gamma' in k-point sampling and 'gamma' meaning absence of auxiliary supercell.
HSX files always contain now indxuo information, even if it is trivial.
Note that for medium-sized borderline systems (say, the si64 box), using an auxiliary supercell
increases significantly the time spent in dfscf and rhoofd.
To post a comment you must log in.
- 932. By Alberto Garcia
-
Re-instatiate gamma arguments. Update modp. Update TS interfaces
(Thanks to Nick Papior)
The flow of 'gamma' (meaning Gamma-point sampling only) is now more
clear.The new MODP1 now replaces the former MODP.
TranSiesta routines avoid the use of 'not_using_
auxcell' .
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'Src/Makefile' |
2 | --- Src/Makefile 2018-06-08 09:23:57 +0000 |
3 | +++ Src/Makefile 2018-06-26 07:59:48 +0000 |
4 | @@ -132,7 +132,7 @@ |
5 | molecularmechanics.o zm_broyden_optim.o \ |
6 | cell_broyden_optim.o remove_intramol_pressure.o \ |
7 | m_ntm.o m_dipol.o m_kinetic.o m_rmaxh.o \ |
8 | - m_forces.o m_stress.o m_eo.o m_spin.o m_gamma.o m_hsx.o m_fire.o setup_H0.o \ |
9 | + m_forces.o m_stress.o m_eo.o m_spin.o m_hsx.o m_fire.o setup_H0.o \ |
10 | get_kpoints_scale.o get_target_stress.o fire_optim.o zm_fire_optim.o \ |
11 | cell_fire_optim.o m_fire_para.o m_fire_mixing.o write_raw_efs.o \ |
12 | pdos2g.o pdos2k.o pdos3g.o pdos3k.o spinorbit.o moments.o \ |
13 | @@ -549,8 +549,8 @@ |
14 | atomlwf.o: alloc.o atmfuncs.o mneighb.o onmod.o precision.o spatial.o sys.o |
15 | automatic_cell.o: atm_types.o atmfuncs.o parallel.o precision.o units.o |
16 | bands.o: alloc.o atmfuncs.o atomlist.o densematrix.o diag.o diag_option.o |
17 | -bands.o: files.o get_kpoints_scale.o m_gamma.o m_spin.o parallel.o |
18 | -bands.o: parallelsubs.o precision.o siesta_geom.o sys.o writewave.o |
19 | +bands.o: files.o get_kpoints_scale.o m_spin.o parallel.o parallelsubs.o |
20 | +bands.o: precision.o siesta_geom.o sys.o writewave.o |
21 | basis_enthalpy.o: atmfuncs.o atomlist.o precision.o siesta_geom.o units.o |
22 | basis_io.o: atm_types.o atmparams.o atom_options.o basis_types.o chemical.o |
23 | basis_io.o: precision.o pseudopotential.o radial.o sys.o xml.o |
24 | @@ -631,7 +631,7 @@ |
25 | coceri.o: files.o periodic_table.o precision.o units.o |
26 | compute_dm.o: atomlist.o class_SpData1D.o compute_ebs_shift.o diagon.o |
27 | compute_dm.o: iodmhs_netcdf.o kpoint_grid.o m_dminim.o m_energies.o m_eo.o |
28 | -compute_dm.o: m_gamma.o m_hsx.o m_pexsi_driver.o m_rmaxh.o m_spin.o m_steps.o |
29 | +compute_dm.o: m_hsx.o m_pexsi_driver.o m_rmaxh.o m_spin.o m_steps.o |
30 | compute_dm.o: m_transiesta.o m_ts_global_vars.o m_zminim.o normalize_dm.o |
31 | compute_dm.o: ordern.o parallel.o precision.o siesta_geom.o siesta_options.o |
32 | compute_dm.o: sparse_matrices.o sys.o units.o |
33 | @@ -646,8 +646,8 @@ |
34 | compute_pw_matrix.o: parallel.o precision.o siesta2wannier90.o |
35 | compute_pw_matrix.o: sparse_matrices.o |
36 | compute_rhog.o: alloc.o atomlist.o dhscf.o files.o m_dipol.o m_energies.o |
37 | -compute_rhog.o: m_gamma.o m_ntm.o m_spin.o m_stress.o siesta_geom.o |
38 | -compute_rhog.o: siesta_options.o sparse_matrices.o |
39 | +compute_rhog.o: m_ntm.o m_spin.o m_stress.o siesta_geom.o siesta_options.o |
40 | +compute_rhog.o: sparse_matrices.o |
41 | conjgr.o: precision.o |
42 | conjgr_old.o: precision.o |
43 | coor.o: alloc.o parallel.o precision.o siesta_geom.o sys.o units.o zmatrix.o |
44 | @@ -673,13 +673,15 @@ |
45 | dhscf.o: meshdscf.o meshsubs.o moremeshsubs.o parallel.o parsing.o precision.o |
46 | dhscf.o: rhofft.o rhoofd.o siesta_options.o sys.o units.o vmat.o |
47 | diag.o: alloc.o diag_option.o parallel.o precision.o sys.o |
48 | -diag2g.o: fermid.o parallel.o parallelsubs.o precision.o sys.o |
49 | +diag2g.o: fermid.o intrinsic_missing.o parallel.o parallelsubs.o precision.o |
50 | +diag2g.o: sys.o |
51 | diag2k.o: fermid.o parallel.o parallelsubs.o precision.o sys.o |
52 | -diag3g.o: fermid.o parallel.o parallelsubs.o precision.o sys.o |
53 | +diag3g.o: fermid.o intrinsic_missing.o parallel.o parallelsubs.o precision.o |
54 | +diag3g.o: sys.o |
55 | diag3k.o: fermid.o parallel.o parallelsubs.o precision.o sys.o |
56 | diag_option.o: parallel.o precision.o |
57 | -diagg.o: alloc.o fermid.o m_spin.o parallel.o parallelsubs.o precision.o sys.o |
58 | -diagg.o: writewave.o |
59 | +diagg.o: alloc.o fermid.o intrinsic_missing.o m_spin.o parallel.o |
60 | +diagg.o: parallelsubs.o precision.o sys.o writewave.o |
61 | diagk.o: compute_norm.o fermid.o m_spin.o parallel.o parallelsubs.o precision.o |
62 | diagk.o: sys.o writewave.o |
63 | diagk_file.o: fermid.o iowfs_netcdf.o parallel.o parallelsubs.o precision.o |
64 | @@ -721,9 +723,9 @@ |
65 | fft1d.o: parallel.o precision.o sys.o |
66 | final_H_f_stress.o: alloc.o atomlist.o class_SpData2D.o compute_max_diff.o |
67 | final_H_f_stress.o: dnaefs.o files.o grdsam.o kinefsm.o ldau.o ldau_specs.o |
68 | -final_H_f_stress.o: m_dipol.o m_energies.o m_forces.o m_gamma.o m_hsx.o |
69 | -final_H_f_stress.o: m_mpi_utils.o m_ncdf_siesta.o m_ntm.o m_spin.o m_stress.o |
70 | -final_H_f_stress.o: m_ts_io.o m_ts_kpoints.o m_ts_options.o metaforce.o |
71 | +final_H_f_stress.o: m_dipol.o m_energies.o m_forces.o m_hsx.o m_mpi_utils.o |
72 | +final_H_f_stress.o: m_ncdf_siesta.o m_ntm.o m_spin.o m_stress.o m_ts_io.o |
73 | +final_H_f_stress.o: m_ts_kpoints.o m_ts_options.o metaforce.o |
74 | final_H_f_stress.o: molecularmechanics.o naefs.o nlefsm.o overfsm.o parallel.o |
75 | final_H_f_stress.o: siesta_geom.o siesta_options.o sparse_matrices.o |
76 | final_H_f_stress.o: spinorbit.o sys.o units.o |
77 | @@ -790,8 +792,8 @@ |
78 | ldau_specs.o: precision.o pseudopotential.o radial.o sys.o units.o |
79 | listsc.o: alloc.o |
80 | local_DOS.o: atomlist.o dhscf.o diagon.o files.o kpoint_grid.o m_energies.o |
81 | -local_DOS.o: m_eo.o m_forces.o m_gamma.o m_ntm.o m_spin.o parallel.o |
82 | -local_DOS.o: siesta_geom.o siesta_options.o sparse_matrices.o sys.o |
83 | +local_DOS.o: m_eo.o m_forces.o m_ntm.o m_spin.o parallel.o siesta_geom.o |
84 | +local_DOS.o: siesta_options.o sparse_matrices.o sys.o |
85 | m_broyddj.o: alloc.o m_mpi_utils.o parallel.o precision.o sys.o |
86 | m_broyddj_nocomm.o: alloc.o parallel.o precision.o sys.o |
87 | m_broyden_mixing.o: alloc.o m_broyddj.o m_mpi_utils.o parallel.o precision.o |
88 | @@ -859,10 +861,10 @@ |
89 | m_ncdf_io.o: class_OrbitalDistribution.o class_SpData1D.o class_SpData2D.o |
90 | m_ncdf_io.o: class_Sparsity.o m_io_s.o parallel.o precision.o |
91 | m_ncdf_siesta.o: atm_types.o atmparams.o atomlist.o class_Sparsity.o files.o |
92 | -m_ncdf_siesta.o: kpoint_grid.o m_energies.o m_forces.o m_gamma.o m_kinetic.o |
93 | -m_ncdf_siesta.o: m_ncdf_io.o m_ntm.o m_spin.o m_stress.o m_ts_electype.o |
94 | -m_ncdf_siesta.o: m_ts_kpoints.o m_ts_options.o parallel.o precision.o radial.o |
95 | -m_ncdf_siesta.o: siesta_geom.o siesta_options.o sparse_matrices.o timestamp.o |
96 | +m_ncdf_siesta.o: kpoint_grid.o m_energies.o m_forces.o m_kinetic.o m_ncdf_io.o |
97 | +m_ncdf_siesta.o: m_ntm.o m_spin.o m_stress.o m_ts_electype.o m_ts_kpoints.o |
98 | +m_ncdf_siesta.o: m_ts_options.o parallel.o precision.o radial.o siesta_geom.o |
99 | +m_ncdf_siesta.o: siesta_options.o sparse_matrices.o timestamp.o |
100 | m_new_dm.o: alloc.o atomlist.o class_Data2D.o class_Fstack_Data1D.o |
101 | m_new_dm.o: class_Fstack_Pair_Geometry_SpData2D.o class_Geometry.o |
102 | m_new_dm.o: class_OrbitalDistribution.o class_Pair_Geometry_SpData2D.o |
103 | @@ -965,7 +967,7 @@ |
104 | m_ts_electrode.o: precision.o sys.o units.o |
105 | m_ts_electype.o: class_OrbitalDistribution.o class_SpData1D.o class_SpData2D.o |
106 | m_ts_electype.o: class_Sparsity.o create_Sparsity_SC.o geom_helper.o |
107 | -m_ts_electype.o: intrinsic_missing.o m_geom_box.o m_geom_plane.o |
108 | +m_ts_electype.o: intrinsic_missing.o m_char.o m_geom_box.o m_geom_plane.o |
109 | m_ts_electype.o: m_handle_sparse.o m_iodm.o m_os.o m_region.o m_ts_chem_pot.o |
110 | m_ts_electype.o: m_ts_io.o m_ts_io_ctype.o m_ts_iodm.o parallel.o precision.o |
111 | m_ts_electype.o: units.o |
112 | @@ -1157,15 +1159,14 @@ |
113 | post_scf_work.o: atomlist.o class_Fstack_Pair_Geometry_SpData2D.o |
114 | post_scf_work.o: class_Geometry.o class_Pair_Geometry_SpData2D.o compute_dm.o |
115 | post_scf_work.o: diagon.o final_H_f_stress.o kpoint_grid.o m_dminim.o |
116 | -post_scf_work.o: m_energies.o m_eo.o m_gamma.o m_spin.o m_steps.o m_zminim.o |
117 | -post_scf_work.o: mneighb.o parallel.o siesta_geom.o siesta_options.o |
118 | -post_scf_work.o: sparse_matrices.o |
119 | +post_scf_work.o: m_energies.o m_eo.o m_spin.o m_steps.o m_zminim.o mneighb.o |
120 | +post_scf_work.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
121 | print_spin.o: atomlist.o m_mpi_utils.o m_spin.o parallel.o precision.o |
122 | print_spin.o: siesta_cml.o sparse_matrices.o |
123 | printmatrix.o: alloc.o |
124 | -projected_DOS.o: alloc.o atomlist.o kpoint_grid.o kpoint_pdos.o m_eo.o |
125 | -projected_DOS.o: m_gamma.o m_spin.o parallel.o precision.o siesta_geom.o |
126 | -projected_DOS.o: siesta_options.o sparse_matrices.o sys.o units.o |
127 | +projected_DOS.o: alloc.o atomlist.o kpoint_grid.o kpoint_pdos.o m_eo.o m_spin.o |
128 | +projected_DOS.o: parallel.o precision.o siesta_geom.o siesta_options.o |
129 | +projected_DOS.o: sparse_matrices.o sys.o units.o |
130 | propor.o: precision.o sys.o |
131 | proximity_check.o: chemical.o m_ts_global_vars.o mneighb.o parallel.o |
132 | proximity_check.o: precision.o siesta_geom.o siesta_options.o units.o |
133 | @@ -1212,10 +1213,10 @@ |
134 | setup_H0.o: siesta_geom.o siesta_options.o sparse_matrices.o spinorbit.o |
135 | setup_hamiltonian.o: alloc.o atmfuncs.o atomlist.o class_SpData1D.o |
136 | setup_hamiltonian.o: class_SpData2D.o dhscf.o files.o ldau.o ldau_specs.o |
137 | -setup_hamiltonian.o: m_dipol.o m_energies.o m_gamma.o m_hsx.o m_mpi_utils.o |
138 | -setup_hamiltonian.o: m_ntm.o m_partial_charges.o m_rhog.o m_spin.o m_steps.o |
139 | -setup_hamiltonian.o: m_stress.o metaforce.o molecularmechanics.o parallel.o |
140 | -setup_hamiltonian.o: siesta_geom.o siesta_options.o sparse_matrices.o sys.o |
141 | +setup_hamiltonian.o: m_dipol.o m_energies.o m_hsx.o m_mpi_utils.o m_ntm.o |
142 | +setup_hamiltonian.o: m_partial_charges.o m_rhog.o m_spin.o m_steps.o m_stress.o |
143 | +setup_hamiltonian.o: metaforce.o molecularmechanics.o parallel.o siesta_geom.o |
144 | +setup_hamiltonian.o: siesta_options.o sparse_matrices.o sys.o |
145 | setup_ordern_indexes.o: alloc.o domain_decom.o parallel.o spatial.o |
146 | shaper.o: atmfuncs.o mneighb.o precision.o |
147 | show_distribution.o: atomlist.o parallel.o parallelsubs.o siesta_geom.o sys.o |
148 | @@ -1226,10 +1227,10 @@ |
149 | siesta2wannier90.o: parallel.o precision.o siesta_options.o sys.o |
150 | siesta_analysis.o: alloc.o atomlist.o bands.o basis_enthalpy.o dhscf.o files.o |
151 | siesta_analysis.o: flook_siesta.o kpoint_grid.o ksv.o ksvinit.o local_DOS.o |
152 | -siesta_analysis.o: m_dipol.o m_energies.o m_eo.o m_forces.o m_gamma.o |
153 | -siesta_analysis.o: m_iodm_old.o m_mpi_utils.o m_ntm.o m_partial_charges.o |
154 | -siesta_analysis.o: m_pexsi_dos.o m_pexsi_local_dos.o m_spin.o m_steps.o |
155 | -siesta_analysis.o: parallel.o projected_DOS.o siesta2wannier90.o siesta_cml.o |
156 | +siesta_analysis.o: m_dipol.o m_energies.o m_eo.o m_forces.o m_iodm_old.o |
157 | +siesta_analysis.o: m_mpi_utils.o m_ntm.o m_partial_charges.o m_pexsi_dos.o |
158 | +siesta_analysis.o: m_pexsi_local_dos.o m_spin.o m_steps.o parallel.o |
159 | +siesta_analysis.o: projected_DOS.o siesta2wannier90.o siesta_cml.o |
160 | siesta_analysis.o: siesta_geom.o siesta_options.o sparse_matrices.o units.o |
161 | siesta_analysis.o: write_subs.o writewave.o zmatrix.o |
162 | siesta_cmlsubs.o: files.o m_uuid.o parallel.o siesta_cml.o timestamp.o |
163 | @@ -1261,7 +1262,7 @@ |
164 | siesta_init.o: class_Fstack_Pair_Geometry_SpData2D.o densematrix.o |
165 | siesta_init.o: diag_option.o files.o flook_siesta.o ioxv.o kpoint_grid.o |
166 | siesta_init.o: kpoint_pdos.o ksvinit.o m_check_walltime.o m_cite.o m_energies.o |
167 | -siesta_init.o: m_eo.o m_fixed.o m_forces.o m_gamma.o m_iostruct.o m_mpi_utils.o |
168 | +siesta_init.o: m_eo.o m_fixed.o m_forces.o m_iostruct.o m_mpi_utils.o |
169 | siesta_init.o: m_new_dm.o m_rmaxh.o m_spin.o m_steps.o m_supercell.o m_timer.o |
170 | siesta_init.o: m_wallclock.o metaforce.o molecularmechanics.o object_debug.o |
171 | siesta_init.o: parallel.o parallelsubs.o projected_DOS.o siesta_cmlsubs.o |
172 | @@ -1291,15 +1292,15 @@ |
173 | state_init.o: alloc.o atomlist.o class_Data2D.o class_SpData1D.o |
174 | state_init.o: class_SpData2D.o class_Sparsity.o create_Sparsity_SC.o |
175 | state_init.o: domain_decom.o files.o hsparse.o iodm_netcdf.o iodmhs_netcdf.o |
176 | -state_init.o: ioxv.o kpoint_grid.o ldau_specs.o m_energies.o m_eo.o m_gamma.o |
177 | -state_init.o: m_mixing.o m_mixing_scf.o m_mpi_utils.o m_new_dm.o m_os.o |
178 | -state_init.o: m_pivot_methods.o m_rmaxh.o m_sparse.o m_sparsity_handling.o |
179 | -state_init.o: m_spin.o m_steps.o m_supercell.o m_test_io.o m_ts_charge.o |
180 | -state_init.o: m_ts_electype.o m_ts_global_vars.o m_ts_io.o m_ts_kpoints.o |
181 | -state_init.o: m_ts_options.o m_ts_sparse.o m_ts_tri_init.o normalize_dm.o |
182 | -state_init.o: overlap.o parallel.o proximity_check.o siesta_cml.o |
183 | -state_init.o: siesta_dicts.o siesta_geom.o siesta_options.o sparse_matrices.o |
184 | -state_init.o: sys.o units.o write_subs.o zmatrix.o |
185 | +state_init.o: ioxv.o kpoint_grid.o ldau_specs.o m_energies.o m_eo.o m_mixing.o |
186 | +state_init.o: m_mixing_scf.o m_mpi_utils.o m_new_dm.o m_os.o m_pivot_methods.o |
187 | +state_init.o: m_rmaxh.o m_sparse.o m_sparsity_handling.o m_spin.o m_steps.o |
188 | +state_init.o: m_supercell.o m_test_io.o m_ts_charge.o m_ts_electype.o |
189 | +state_init.o: m_ts_global_vars.o m_ts_io.o m_ts_kpoints.o m_ts_options.o |
190 | +state_init.o: m_ts_sparse.o m_ts_tri_init.o normalize_dm.o overlap.o parallel.o |
191 | +state_init.o: proximity_check.o siesta_cml.o siesta_dicts.o siesta_geom.o |
192 | +state_init.o: siesta_options.o sparse_matrices.o sys.o units.o write_subs.o |
193 | +state_init.o: zmatrix.o |
194 | struct_init.o: alloc.o atmfuncs.o atomlist.o files.o ioxv.o m_exp_coord.o |
195 | struct_init.o: m_iostruct.o m_mpi_utils.o m_steps.o parallel.o periodic_table.o |
196 | struct_init.o: siesta_cml.o siesta_geom.o siesta_master.o siesta_options.o |
197 | |
198 | === modified file 'Src/bands.F' |
199 | --- Src/bands.F 2018-04-25 11:33:32 +0000 |
200 | +++ Src/bands.F 2018-06-26 07:59:48 +0000 |
201 | @@ -360,7 +360,6 @@ |
202 | use densematrix, only : Haux, Saux, psi |
203 | use alloc, only : re_alloc, de_alloc |
204 | use files, only : slabel, label_length |
205 | - use m_gamma, only : gamma |
206 | use atomlist, only : iaorb, iphorb |
207 | use siesta_geom, only : isa |
208 | use atmfuncs, only : symfio, cnfigfio, labelfis, nofis |
209 | @@ -396,7 +395,7 @@ |
210 | integer :: ik, il, io, ispin, iu, iu_wfs, iuo, naux, nhs, j |
211 | |
212 | logical :: SaveParallelOverK |
213 | - |
214 | + |
215 | real(dp) |
216 | . Dnew, qs(2), e1, e2, efs(2), emax, emin, Enew, eV, qk, qtot, |
217 | . path, temp, wk, Entropy |
218 | @@ -448,7 +447,7 @@ |
219 | |
220 | rewind (iu_wfs) |
221 | |
222 | - write(iu_wfs) nk, gamma |
223 | + write(iu_wfs) nk, .false. ! nk, Gamma, same file-format in WFS as for Gamma-point |
224 | write(iu_wfs) nspin |
225 | write(iu_wfs) no_u |
226 | write(iu_wfs) (iaorb(j),labelfis(isa(iaorb(j))), |
227 | |
228 | === modified file 'Src/compute_dm.F' |
229 | --- Src/compute_dm.F 2018-04-11 12:04:08 +0000 |
230 | +++ Src/compute_dm.F 2018-06-26 07:59:48 +0000 |
231 | @@ -30,7 +30,6 @@ |
232 | use m_eo |
233 | use m_spin, only: spin |
234 | use m_diagon, only: diagon |
235 | - use m_gamma |
236 | use parallel, only: IONode |
237 | use parallel, only: SIESTA_worker |
238 | use m_compute_ebs_shift, only: compute_ebs_shift |
239 | @@ -67,10 +66,6 @@ |
240 | real(dp) :: buffer1 |
241 | integer :: mpierr |
242 | |
243 | -! character(15) :: filename, indexstr |
244 | -! character(15), parameter :: fnameform = '(A,A,A)' |
245 | - |
246 | - |
247 | !-------------------------------------------------------------------- BEGIN |
248 | |
249 | if (SIESTA_worker) call timer( 'compute_dm', 1 ) |
250 | @@ -125,6 +120,12 @@ |
251 | $ "The PEXSI solver does not implement "// |
252 | $ "non-coll spins or Spin-orbit yet") |
253 | endif |
254 | + if (ionode) then |
255 | + ! This should never happen for large-scale calculations... |
256 | + if (no_s /= no_u) call die( |
257 | + $ "The PEXSI solver cannot work " // |
258 | + $ "with an auxiliary supercell") |
259 | + endif |
260 | call pexsi_solver(iscf, no_u, no_l, spin%spinor, |
261 | $ maxnh, numh, listhptr, listh, |
262 | $ H, S, qtot, Dscf, Escf, |
263 | @@ -173,13 +174,13 @@ |
264 | & no_l, maxnh, maxnh, no_u, |
265 | & numh, listhptr, listh, numh, listhptr, listh, |
266 | & H, S, qtot, fixspin, qtots, temp, e1, e2, |
267 | - & gamma, xijo, indxuo, nkpnt, kpoint, kweight, |
268 | + $ xijo, indxuo, gamma_SCF, nkpnt, kpoint, kweight, |
269 | & eo, qo, Dscf, Escf, ef, efs, Entropy, no_u, |
270 | & occtol, iscf, neigwanted) |
271 | Ecorrec = 0.0_dp |
272 | PreviousCallDiagon=.true. |
273 | elseif (isolve .eq. SOLVE_ORDERN) then |
274 | - if (.not. gamma) call die("Cannot do O(N) with k-points.") |
275 | + if ( .not. gamma_SCF ) call die("Cannot do O(N) with k-points.") |
276 | if ( spin%NCol .or. spin%SO ) |
277 | . call die("Cannot do O(N) with non-coll spins or Spin-orbit") |
278 | call ordern(usesavelwf, ioptlwf, na_u, no_u, no_l, lasto, |
279 | @@ -193,11 +194,18 @@ |
280 | & call die('ERROR: Non-collinear spin calculations |
281 | & not yet implemented with OMM!') |
282 | H_kin => val(H_kin_1D) |
283 | - if (gamma) then |
284 | + |
285 | + ! Decide which version of OMM to use. |
286 | + ! Test based on use of auxiliary supercell |
287 | + ! It might still be possible to avoid the complex version |
288 | + |
289 | + if ( no_u == no_s ) then ! Not using an auxiliary supercell |
290 | call dminim(.false., PreviousCallDiagon, iscf, istp, no_l, |
291 | & spin%H, no_u, maxnh, numh, listhptr, listh, Dscf, |
292 | & eta, qtots, H, S, H_kin) |
293 | else |
294 | + ! When using an auxiliary supercell |
295 | + ! (even for gamma point; not optimized yet) |
296 | call zminim(.false., PreviousCallDiagon, iscf, istp, no_l, |
297 | & spin%H, no_u, maxnh, numh, listhptr, listh, Dscf, |
298 | & eta, qtots, no_s, xijo, indxuo, nkpnt, kpoint, |
299 | @@ -211,7 +219,7 @@ |
300 | & no_l, maxnh, maxnh, no_u, |
301 | & numh, listhptr, listh, numh, listhptr, listh, |
302 | & H, S, qtot, fixspin, qtots, temp, e1, e2, |
303 | - & gamma, xijo, indxuo, nkpnt, kpoint, kweight, |
304 | + $ xijo, indxuo, gamma_SCF, nkpnt, kpoint, kweight, |
305 | & eo, qo, Dscf, Escf, ef, efs, Entropy, no_u, |
306 | & occtol, iscf, neigwanted) |
307 | |
308 | @@ -220,7 +228,8 @@ |
309 | else if (TSrun) then |
310 | |
311 | call transiesta(iscf,spin%H, block_dist, sparse_pattern, |
312 | - & Gamma, ucell, nsc, isc_off, no_u, na_u, lasto, xa, maxnh, |
313 | + & no_u == no_s, ucell, nsc, isc_off, no_u, na_u, |
314 | + & lasto, xa, maxnh, |
315 | & H, S, Dscf, Escf, Ef, Qtot, .false., DE_NEGF ) |
316 | |
317 | Ecorrec = 0._dp |
318 | |
319 | === modified file 'Src/compute_rhog.F' |
320 | --- Src/compute_rhog.F 2016-03-21 22:47:29 +0000 |
321 | +++ Src/compute_rhog.F 2018-06-26 07:59:48 +0000 |
322 | @@ -28,7 +28,6 @@ |
323 | use m_spin, only: nspin, h_spin_dim |
324 | use m_dipol |
325 | use alloc, only: re_alloc, de_alloc |
326 | - use m_gamma |
327 | use files, only : filesOut_t ! derived type for output file names |
328 | |
329 | implicit none |
330 | |
331 | === modified file 'Src/diag2g.F' |
332 | --- Src/diag2g.F 2018-04-14 23:14:53 +0000 |
333 | +++ Src/diag2g.F 2018-06-26 07:59:48 +0000 |
334 | @@ -20,6 +20,8 @@ |
335 | use parallel, only : Node, Nodes, BlockSize |
336 | use parallelsubs, only : LocalToGlobalOrb,GlobalToLocalOrb |
337 | use m_fermid, only : fermid, stepf |
338 | + use intrinsic_missing, only: MODP |
339 | + |
340 | #ifdef MPI |
341 | use mpi_siesta |
342 | #endif |
343 | @@ -155,18 +157,19 @@ |
344 | ! needed |
345 | ! in those cases. |
346 | |
347 | - Saux = dcmplx(0.0_dp, 0.0_dp) |
348 | - Haux = dcmplx(0.0_dp, 0.0_dp) |
349 | do io = 1,nuo |
350 | + Saux(:,:,:,io) = 0._dp |
351 | + Haux(:,:,:,io) = 0._dp |
352 | do j = 1,numh(io) |
353 | ind = listhptr(io) + j |
354 | jo = listh(ind) |
355 | - Saux(1,jo,1,io) = dcmplx( S(ind), 0.0_dp) |
356 | - Saux(2,jo,2,io) = dcmplx( S(ind), 0.0_dp) |
357 | - Haux(1,jo,1,io) = dcmplx(H(ind,1), 0.0_dp) |
358 | - Haux(2,jo,2,io) = dcmplx(H(ind,2), 0.0_dp) |
359 | - Haux(2,jo,1,io) = dcmplx(H(ind,3), H(ind,4)) |
360 | - Haux(1,jo,2,io) = dcmplx(H(ind,3),-H(ind,4)) |
361 | + jo = MODP(jo,nuotot) ! To allow auxiliary supercells |
362 | + Saux(1,jo,1,io) = Saux(1,jo,1,io) + dcmplx( S(ind), 0.0_dp) |
363 | + Saux(2,jo,2,io) = Saux(2,jo,2,io) + dcmplx( S(ind), 0.0_dp) |
364 | + Haux(1,jo,1,io) = Haux(1,jo,1,io) + dcmplx(H(ind,1), 0.0_dp) |
365 | + Haux(2,jo,2,io) = Haux(2,jo,2,io) + dcmplx(H(ind,2), 0.0_dp) |
366 | + Haux(2,jo,1,io) = Haux(2,jo,1,io) + dcmplx(H(ind,3), H(ind,4)) |
367 | + Haux(1,jo,2,io) = Haux(1,jo,2,io) + dcmplx(H(ind,3),-H(ind,4)) |
368 | enddo |
369 | enddo |
370 | |
371 | @@ -178,20 +181,22 @@ |
372 | if (ierror.gt.0) then |
373 | call die('Terminating due to failed diagonalisation') |
374 | elseif (ierror.lt.0) then |
375 | -! Repeat diagonalisation with increased memory to handle clustering |
376 | - Saux = dcmplx(0.0_dp, 0.0_dp) |
377 | - Haux = dcmplx(0.0_dp, 0.0_dp) |
378 | +! Repeat diagonalisation with increased memory to handle clustering |
379 | + |
380 | do io = 1,nuo |
381 | + Saux(:,:,:,io) = 0._dp |
382 | + Haux(:,:,:,io) = 0._dp |
383 | do j = 1,numh(io) |
384 | - ind = listhptr(io) + j |
385 | - jo = listh(ind) |
386 | - Saux(1,jo,1,io) = dcmplx( S(ind), 0.0_dp) |
387 | - Saux(2,jo,2,io) = dcmplx( S(ind), 0.0_dp) |
388 | - Haux(1,jo,1,io) = dcmplx(H(ind,1), 0.0_dp) |
389 | - Haux(2,jo,2,io) = dcmplx(H(ind,2), 0.0_dp) |
390 | - Haux(2,jo,1,io) = dcmplx(H(ind,3), H(ind,4)) |
391 | - Haux(1,jo,2,io) = dcmplx(H(ind,3),-H(ind,4)) |
392 | - enddo |
393 | + ind = listhptr(io) + j |
394 | + jo = listh(ind) |
395 | + jo = MODP(jo,nuotot) ! To allow auxiliary supercells |
396 | + Saux(1,jo,1,io) = Saux(1,jo,1,io) +dcmplx( S(ind), 0.0_dp) |
397 | + Saux(2,jo,2,io) = Saux(2,jo,2,io) +dcmplx( S(ind), 0.0_dp) |
398 | + Haux(1,jo,1,io) = Haux(1,jo,1,io) +dcmplx(H(ind,1), 0.0_dp) |
399 | + Haux(2,jo,2,io) = Haux(2,jo,2,io) +dcmplx(H(ind,2), 0.0_dp) |
400 | + Haux(2,jo,1,io) = Haux(2,jo,1,io) +dcmplx(H(ind,3), H(ind,4)) |
401 | + Haux(1,jo,2,io) = Haux(1,jo,2,io) +dcmplx(H(ind,3),-H(ind,4)) |
402 | + enddo |
403 | enddo |
404 | call cdiag(Haux,Saux,2*nuotot,2*nuo,2*nuotot,eo,psi, |
405 | . 2*neigwanted,iscf,ierror, 2*BlockSize) |
406 | @@ -264,6 +269,7 @@ |
407 | do j = 1,numd(io) |
408 | ind = listdptr(io) + j |
409 | jo = listd(ind) |
410 | + jo = MODP(jo,nuotot) ! To allow auxiliary supercells |
411 | |
412 | ! | ------- 1,1 ------- ------- 2,1 ------- | |
413 | ! | c_{j,up}^* c_{i,up} c_{j,dn}^* c_{i,up) | |
414 | |
415 | === modified file 'Src/diag3g.F' |
416 | --- Src/diag3g.F 2017-08-06 11:17:47 +0000 |
417 | +++ Src/diag3g.F 2018-06-26 07:59:48 +0000 |
418 | @@ -17,6 +17,7 @@ |
419 | use parallel, only : Node, Nodes, BlockSize |
420 | use parallelsubs, only : LocalToGlobalOrb,GlobalToLocalOrb |
421 | use m_fermid, only : fermid, stepf |
422 | + use intrinsic_missing, only: MODP |
423 | #ifdef MPI |
424 | use mpi_siesta |
425 | #endif |
426 | @@ -148,22 +149,19 @@ |
427 | ! D_{i,j}(1,2) = 0.5 ( D_{i,j}(1,2) + D_{i,j}(2,1)^* ) |
428 | ! can not be enforced here. |
429 | |
430 | - Saux = dcmplx(0.0_dp, 0.0_dp) |
431 | - Haux = dcmplx(0.0_dp, 0.0_dp) |
432 | do io = 1,nuo |
433 | + Saux(:,:,:,io) = 0._dp |
434 | + Haux(:,:,:,io) = 0._dp |
435 | do j = 1,numh(io) |
436 | ind = listhptr(io) + j |
437 | jo = listh(ind) |
438 | - Saux(1,jo,1,io) = dcmplx( S(ind), 0.0_dp) |
439 | - Saux(2,jo,2,io) = dcmplx( S(ind), 0.0_dp) |
440 | - Haux(1,jo,1,io) = dcmplx(H(ind,1), H(ind,5)) |
441 | - Haux(2,jo,2,io) = dcmplx(H(ind,2), H(ind,6)) |
442 | - Haux(1,jo,2,io) = dcmplx(H(ind,3),-H(ind,4)) |
443 | - Haux(2,jo,1,io) = dcmplx(H(ind,7), H(ind,8)) |
444 | - |
445 | -c write(6,'(a,3i5,8f12.6)') 'io/jo/ind/H(ind,1:8) = ', |
446 | -c . io, jo, ind, H(ind,1:8) |
447 | - |
448 | + jo = MODP(jo,nuotot) ! To allow auxiliary supercells |
449 | + Saux(1,jo,1,io) = Saux(1,jo,1,io) + dcmplx( S(ind), 0.0_dp) |
450 | + Saux(2,jo,2,io) = Saux(2,jo,2,io) + dcmplx( S(ind), 0.0_dp) |
451 | + Haux(1,jo,1,io) = Haux(1,jo,1,io) + dcmplx(H(ind,1), H(ind,5)) |
452 | + Haux(2,jo,2,io) = Haux(2,jo,2,io) + dcmplx(H(ind,2), H(ind,6)) |
453 | + Haux(1,jo,2,io) = Haux(1,jo,2,io) + dcmplx(H(ind,3),-H(ind,4)) |
454 | + Haux(2,jo,1,io) = Haux(2,jo,1,io) + dcmplx(H(ind,7), H(ind,8)) |
455 | enddo |
456 | enddo |
457 | |
458 | @@ -176,20 +174,22 @@ |
459 | call die('Terminating due to failed diagonalisation') |
460 | elseif (ierror.lt.0) then |
461 | ! Repeat diagonalisation with increased memory to handle clustering |
462 | - Saux = dcmplx(0.0_dp, 0.0_dp) |
463 | - Haux = dcmplx(0.0_dp, 0.0_dp) |
464 | - do io = 1,nuo |
465 | - do j = 1,numh(io) |
466 | - ind = listhptr(io) + j |
467 | - jo = listh(ind) |
468 | - Saux(1,jo,1,io) = dcmplx( S(ind), 0.0_dp) |
469 | - Saux(2,jo,2,io) = dcmplx( S(ind), 0.0_dp) |
470 | - Haux(1,jo,1,io) = dcmplx(H(ind,1), H(ind,5)) |
471 | - Haux(2,jo,2,io) = dcmplx(H(ind,2), H(ind,6)) |
472 | - Haux(1,jo,2,io) = dcmplx(H(ind,3),-H(ind,4)) |
473 | - Haux(2,jo,1,io) = dcmplx(H(ind,7), H(ind,8)) |
474 | - enddo |
475 | + do io = 1,nuo |
476 | + Saux(:,:,:,io) = 0._dp |
477 | + Haux(:,:,:,io) = 0._dp |
478 | + do j = 1,numh(io) |
479 | + ind = listhptr(io) + j |
480 | + jo = listh(ind) |
481 | + jo = MODP(jo,nuotot) ! To allow auxiliary supercells |
482 | + Saux(1,jo,1,io) = Saux(1,jo,1,io) + dcmplx( S(ind), 0.0_dp) |
483 | + Saux(2,jo,2,io) = Saux(2,jo,2,io) + dcmplx( S(ind), 0.0_dp) |
484 | + Haux(1,jo,1,io) = Haux(1,jo,1,io) + dcmplx(H(ind,1), H(ind,5)) |
485 | + Haux(2,jo,2,io) = Haux(2,jo,2,io) + dcmplx(H(ind,2), H(ind,6)) |
486 | + Haux(1,jo,2,io) = Haux(1,jo,2,io) + dcmplx(H(ind,3),-H(ind,4)) |
487 | + Haux(2,jo,1,io) = Haux(2,jo,1,io) + dcmplx(H(ind,7), H(ind,8)) |
488 | enddo |
489 | + enddo |
490 | + |
491 | call cdiag(Haux,Saux,2*nuotot,2*nuo,2*nuotot,eo,psi, |
492 | . 2*neigwanted,iscf,ierror,2*BlockSize) |
493 | endif |
494 | @@ -264,6 +264,7 @@ |
495 | do j = 1,numd(io) |
496 | ind = listdptr(io) + j |
497 | jo = listd(ind) |
498 | + jo = MODP(jo,nuotot) ! To allow auxiliary supercells |
499 | !------- 1,1 ----------------------------------------------------------- |
500 | D11 = caux(1,iio) * dconjg(caux(1,jo)) |
501 | !------- 2,2 ----------------------------------------------------------- |
502 | |
503 | === modified file 'Src/diagg.F' |
504 | --- Src/diagg.F 2017-08-06 09:35:09 +0000 |
505 | +++ Src/diagg.F 2018-06-26 07:59:48 +0000 |
506 | @@ -90,6 +90,7 @@ |
507 | use m_fermid, only : fermid, fermispin, stepf |
508 | use m_spin, only : spinor_dim, e_spin_dim |
509 | use alloc |
510 | + use intrinsic_missing, only: MODP |
511 | |
512 | #ifdef MPI |
513 | use mpi_siesta |
514 | @@ -148,7 +149,7 @@ |
515 | |
516 | do ispin = 1,spinor_dim |
517 | |
518 | - call timer( 'r-eigvec', 1 ) |
519 | + call timer( 'r-eigvec', 1 ) |
520 | call timer( 'r-buildHS', 1 ) |
521 | !$OMP parallel do default(shared), private(io,j,ind,jo) |
522 | do io = 1,nuo |
523 | @@ -157,6 +158,7 @@ |
524 | do j = 1,numh(io) |
525 | ind = listhptr(io) + j |
526 | jo = listh(ind) |
527 | + jo = MODP(jo,nuotot) ! To allow auxiliary supercells |
528 | Saux(jo,io) = Saux(jo,io) + S(ind) |
529 | Haux(jo,io) = Haux(jo,io) + H(ind,ispin) |
530 | enddo |
531 | @@ -182,6 +184,7 @@ |
532 | do j = 1,numh(io) |
533 | ind = listhptr(io) + j |
534 | jo = listh(ind) |
535 | + jo = MODP(jo,nuotot) ! To allow auxiliary supercells |
536 | Saux(jo,io) = Saux(jo,io) + S(ind) |
537 | Haux(jo,io) = Haux(jo,io) + H(ind,ispin) |
538 | enddo |
539 | @@ -298,6 +301,7 @@ |
540 | do j = 1,numd(io) |
541 | ind = listdptr(io) + j |
542 | jo = listd(ind) |
543 | + jo = MODP(jo,nuotot) ! To allow auxiliary supercells |
544 | Dnew(ind,ispin) = Dnew(ind,ispin) + qei*paux(jo) |
545 | Enew(ind,ispin) = Enew(ind,ispin) + eei*paux(jo) |
546 | enddo |
547 | |
548 | === modified file 'Src/diagon.F' |
549 | --- Src/diagon.F 2017-08-06 11:17:47 +0000 |
550 | +++ Src/diagon.F 2018-06-26 07:59:48 +0000 |
551 | @@ -15,7 +15,7 @@ |
552 | subroutine diagon(no, nspin, maxuo, maxnh, maxnd, |
553 | . maxo, numh, listhptr, listh, numd, |
554 | . listdptr, listd, H, S, qtot, fixspin, |
555 | - . qs, temp, e1, e2, gamma, xij, indxuo, nk, |
556 | + . qs, temp, e1, e2, xij, indxuo, gamma, nk, |
557 | . kpoint, wk, eo, qo, Dnew, Enew, ef, efs, |
558 | . Entropy, nuotot, occtol, iscf, neigwanted ) |
559 | C ********************************************************************* |
560 | @@ -56,13 +56,13 @@ |
561 | C real*8 e1, e2 : Energy range for density-matrix states |
562 | C (to find local density of states) |
563 | C Not used if e1 > e2 |
564 | -C logical gamma : Only gamma point? |
565 | C real*8 xij(3,maxnh) : Vectors between orbital centers (sparse) |
566 | C (not used if only gamma point) |
567 | C integer indxuo(no) : Index of equivalent orbital in unit cell |
568 | C Unit cell orbitals must be the first in |
569 | C orbital lists, i.e. indxuo.le.nuo, with |
570 | C nuo the number of orbitals in unit cell |
571 | +C logical Gamma : Whether only the Gamma point is sampled. |
572 | C integer nk : Number of k points |
573 | C real*8 kpoint(3,nk) : k point vectors |
574 | C real*8 wk(nk) : k point weights (must sum one) |
575 | @@ -116,6 +116,7 @@ |
576 | implicit none |
577 | |
578 | real(dp), intent(in) :: H(:,:) |
579 | + logical, intent(in) :: gamma |
580 | |
581 | integer |
582 | . iscf, maxnd, maxnh, maxuo, maxo, nk, no, nuotot, |
583 | @@ -133,7 +134,7 @@ |
584 | . xij(3,maxnh), qs(:), efs(nspin) |
585 | |
586 | logical |
587 | - . fixspin, gamma, getD, getPSI |
588 | + . fixspin, getD, getPSI |
589 | |
590 | external |
591 | . diag2g, diag2k, diagsprl |
592 | @@ -146,12 +147,6 @@ |
593 | #endif |
594 | integer :: io, iuo, naux, nhs, npsi, nuo |
595 | real(dp), pointer :: aux(:) |
596 | - integer, pointer :: muo(:) |
597 | - |
598 | -#ifdef DEBUG |
599 | - call write_debug( ' PRE diagon' ) |
600 | -#endif |
601 | - |
602 | C .................... |
603 | |
604 | C Get Node number and calculate local orbital range |
605 | @@ -164,7 +159,8 @@ |
606 | C Start time counter ................................................ |
607 | call timer( 'diagon', 1 ) |
608 | |
609 | -C Check internal dimensions .......................................... |
610 | +C Check internal dimensions .......................................... |
611 | + |
612 | if ( spin%none .or. spin%Col ) then |
613 | if (gamma) then |
614 | nhs = nuotot * nuo |
615 | @@ -195,36 +191,9 @@ |
616 | |
617 | |
618 | C Allocate local arrays |
619 | - nullify(aux,muo) |
620 | + nullify(aux) |
621 | call re_alloc( aux, 1, naux, 'aux', 'diagon' ) |
622 | - call re_alloc( muo, 1, nuo, 'muo', 'diagon' ) |
623 | - |
624 | - |
625 | -C Check indxuo |
626 | - do iuo = 1,nuo |
627 | - muo(iuo) = 0 |
628 | - enddo |
629 | - do io = 1,no |
630 | - iuo = indxuo(io) |
631 | - if (iuo.le.0 .or. iuo.gt.nuotot) then |
632 | - if (Node.eq.0) |
633 | - $ write(6,*) 'diagon: ERROR: invalid index: io, indxuo =', |
634 | - . io, indxuo(io) |
635 | - call die() |
636 | - endif |
637 | - call GlobalToLocalOrb(indxuo(io),Node,Nodes,iuo) |
638 | - if (iuo.gt.0) then |
639 | - muo(iuo) = muo(iuo) + 1 |
640 | - endif |
641 | - enddo |
642 | - do iuo = 1,nuo |
643 | - if (muo(iuo) .ne. muo(1)) then |
644 | - if (Node.eq.0) |
645 | - $ write(6,'(/,2a,3i6)') 'diagon: ERROR: inconsistent indxuo', |
646 | - . '. iuo, muo(iuo), muo(1) =', iuo, muo(iuo), muo(1) |
647 | - call die() |
648 | - endif |
649 | - enddo |
650 | + |
651 | |
652 | C Call apropriate routine |
653 | getD = .true. |
654 | @@ -337,13 +306,10 @@ |
655 | |
656 | C Free local arrays |
657 | call de_alloc( aux, name='aux', routine='diagon' ) |
658 | - call de_alloc( muo, name='muo', routine='diagon' ) |
659 | |
660 | C Stop time counter |
661 | call timer( 'diagon', 2 ) |
662 | -#ifdef DEBUG |
663 | - call write_debug( ' POS diagon' ) |
664 | -#endif |
665 | + |
666 | CONTAINS |
667 | |
668 | subroutine output_kpoint_occupation() ! CC RC It seems ok for osSO |
669 | |
670 | === modified file 'Src/final_H_f_stress.F' |
671 | --- Src/final_H_f_stress.F 2018-06-08 16:37:51 +0000 |
672 | +++ Src/final_H_f_stress.F 2018-06-26 07:59:48 +0000 |
673 | @@ -50,7 +50,6 @@ |
674 | use m_dipol |
675 | use m_forces, only: fa |
676 | use alloc, only: re_alloc, de_alloc |
677 | - use m_gamma |
678 | use m_hsx, only: write_hsx |
679 | use sys, only: die |
680 | use fdf |
681 | @@ -98,6 +97,7 @@ |
682 | #endif |
683 | character(len=label_length+13) :: fname |
684 | integer :: io_istep, io_ia1 |
685 | + logical :: not_using_auxcell |
686 | #ifdef CDF |
687 | #ifdef NCDF_4 |
688 | type(dict) :: dic_save |
689 | @@ -105,6 +105,8 @@ |
690 | #endif |
691 | !------------------------------------------------------------------------- BEGIN |
692 | |
693 | + not_using_auxcell = (no_s == no_u) |
694 | + |
695 | ! Initialize Hamiltonian ........................................ |
696 | call re_alloc(H_tmp, 1,maxnh, 1, spin%H, |
697 | $ 'H_tmp','final_H_f_stress') |
698 | @@ -288,7 +290,7 @@ |
699 | ! This call could be moved to a more appropriate place |
700 | ! |
701 | if (savehs) then |
702 | - call write_hsx( gamma, no_u, no_s, spin%H, indxuo, |
703 | + call write_hsx( no_u, no_s, spin%H, indxuo, |
704 | & maxnh, numh, listhptr, listh, H, S, Qtot, |
705 | & Temp, xijo) |
706 | endif |
707 | @@ -306,7 +308,7 @@ |
708 | ! This is "pure" MD and we only write consecutive numbers |
709 | ! Together with this you cannot also save FC |
710 | fname = fname_TSHS(slabel, istep = istep ) |
711 | - call ts_write_tshs(fname, .false., Gamma, ts_Gamma, |
712 | + call ts_write_tshs(fname, .false., not_using_auxcell, ts_Gamma, |
713 | & ucell, nsc, isc_off, na_u, no_s, spin%H, |
714 | & ts_kscell, ts_kdispl, |
715 | & xa, lasto, |
716 | @@ -325,7 +327,8 @@ |
717 | ! 6 = +z |
718 | call FC_index(istep,ia1,io_istep,io_ia1) |
719 | fname = fname_TSHS(slabel,istep = io_istep, ia1 = io_ia1) |
720 | - call ts_write_tshs(fname, .false., Gamma, ts_Gamma, |
721 | + call ts_write_tshs(fname, .false., |
722 | + & not_using_auxcell, ts_Gamma, |
723 | & ucell, nsc, isc_off, na_u, no_s, spin%H, |
724 | & ts_kscell, ts_kdispl, |
725 | & xa, lasto, |
726 | @@ -333,7 +336,8 @@ |
727 | & Ef, Qtot, Temp, io_istep, io_ia1) |
728 | else |
729 | fname = fname_TSHS(slabel) |
730 | - call ts_write_tshs(fname, .false., Gamma, ts_Gamma, |
731 | + call ts_write_tshs(fname, .false., |
732 | + & not_using_auxcell, ts_Gamma, |
733 | & ucell, nsc, isc_off, na_u, no_s, spin%H, |
734 | & ts_kscell, ts_kdispl, |
735 | & xa, lasto, |
736 | |
737 | === modified file 'Src/intrinsic_missing.F90' |
738 | --- Src/intrinsic_missing.F90 2018-03-23 08:38:08 +0000 |
739 | +++ Src/intrinsic_missing.F90 2018-06-26 07:59:48 +0000 |
740 | @@ -231,12 +231,7 @@ |
741 | elemental function MODP(a,p) |
742 | integer, intent(in) :: a,p |
743 | integer :: MODP |
744 | - if ( a > p ) then |
745 | - MODP = MOD(a,p) |
746 | - if ( MODP == 0 ) MODP = p |
747 | - else |
748 | - MODP = a |
749 | - end if |
750 | + MODP = MOD(a-1,p) + 1 |
751 | end function MODP |
752 | |
753 | ! Function to return the unique COUNT of an integer array. |
754 | |
755 | === modified file 'Src/local_DOS.F' |
756 | --- Src/local_DOS.F 2018-02-27 14:03:49 +0000 |
757 | +++ Src/local_DOS.F 2018-06-26 07:59:48 +0000 |
758 | @@ -36,7 +36,6 @@ |
759 | use m_spin, only: nspin |
760 | use m_spin, only: spinor_dim |
761 | use m_diagon, only: diagon |
762 | - use m_gamma |
763 | use m_dhscf, only: dhscf |
764 | implicit none |
765 | |
766 | @@ -79,7 +78,7 @@ |
767 | call diagon(no_s, spinor_dim, no_l, maxnh, maxnh, no_u, |
768 | . numh, listhptr, listh, numh, listhptr, listh, |
769 | . H, S, qtot, fixspin, qtots, temp, e1, e2, |
770 | - . gamma, xijo, indxuo, nkpnt, kpoint, kweight, |
771 | + . xijo, indxuo, gamma_SCF, nkpnt, kpoint, kweight, |
772 | . eo, qo, Dscf, Escf, ef, efs, dummy_Entrop, no_u, |
773 | . occtol, dummy_iscf, neigwanted) |
774 | |
775 | |
776 | === removed file 'Src/m_gamma.F90' |
777 | --- Src/m_gamma.F90 2016-01-25 16:00:16 +0000 |
778 | +++ Src/m_gamma.F90 1970-01-01 00:00:00 +0000 |
779 | @@ -1,18 +0,0 @@ |
780 | -! --- |
781 | -! Copyright (C) 1996-2016 The SIESTA group |
782 | -! This file is distributed under the terms of the |
783 | -! GNU General Public License: see COPYING in the top directory |
784 | -! or http://www.gnu.org/copyleft/gpl.txt . |
785 | -! See Docs/Contributors.txt for a list of contributors. |
786 | -! --- |
787 | -module m_gamma |
788 | - implicit none |
789 | - |
790 | - public |
791 | - |
792 | - logical:: gamma ! Gamma point (k=0) in BZ only? |
793 | - |
794 | -end module m_gamma |
795 | - |
796 | - |
797 | - |
798 | |
799 | === modified file 'Src/m_hsx.F' |
800 | --- Src/m_hsx.F 2017-10-10 19:27:53 +0000 |
801 | +++ Src/m_hsx.F 2018-06-26 07:59:48 +0000 |
802 | @@ -8,7 +8,7 @@ |
803 | module m_hsx |
804 | public :: write_hsx |
805 | CONTAINS |
806 | - subroutine write_hsx( gamma, no_u, no_s, nspin, indxuo, maxnh, |
807 | + subroutine write_hsx( no_u, no_s, nspin, indxuo, maxnh, |
808 | . numh, listhptr, listh, H, S, qtot, temp, xij) |
809 | C ********************************************************************* |
810 | C Saves the hamiltonian and overlap matrices, and other data required |
811 | @@ -16,8 +16,6 @@ |
812 | C Writen by J.Soler July 1997. |
813 | C Note because of the new more compact method of storing H and S |
814 | C this routine is NOT backwards compatible |
815 | -C *************************** INPUT ********************************** |
816 | -C logical gamma : Is only gamma point used? |
817 | C ******************** INPUT or OUTPUT (depending on task) *********** |
818 | C integer no_u : Number of basis orbitals per unit cell |
819 | C integer no_s : Number of basis orbitals per supercell |
820 | @@ -36,7 +34,6 @@ |
821 | C real*8 qtot : Total number of electrons |
822 | C real*8 temp : Electronic temperature for Fermi smearing |
823 | C real*8 xij(3,maxnh) : Vectors between orbital centers (sparse) |
824 | -C (not read/written if only gamma point) |
825 | |
826 | C |
827 | C Modules |
828 | @@ -59,7 +56,10 @@ |
829 | |
830 | implicit none |
831 | |
832 | - logical gamma |
833 | + ! This really means that supercell info is supported by default |
834 | + logical, parameter :: gamma = .false. |
835 | + logical, parameter :: write_xijk = .true. |
836 | + |
837 | integer maxnh, no_u, no_s, nspin |
838 | integer indxuo(no_s), listh(maxnh), numh(*), listhptr(*) |
839 | real(dp) H(maxnh,nspin), S(maxnh), |
840 | @@ -78,7 +78,6 @@ |
841 | real(dp), dimension(:), allocatable :: buffer |
842 | real(dp), dimension(:,:), allocatable :: buffer2 |
843 | #endif |
844 | - logical baddim, gammaonfile, write_xijk |
845 | |
846 | call timer("writeHSX",1) |
847 | |
848 | @@ -101,14 +100,14 @@ |
849 | C Write overall data |
850 | write(iu) no_u, no_s, nspin, maxnhtot |
851 | |
852 | -C Read logical |
853 | +C Write logical (always .false.) |
854 | write(iu) gamma |
855 | |
856 | C Allocate local array for global numh |
857 | allocate(numhg(no_u)) |
858 | call memory('A','I',no_u,'iohs') |
859 | |
860 | -C Write out indxuo |
861 | +C Write out indxuo always |
862 | if (.not.gamma) then |
863 | write(iu) (indxuo(ih),ih=1,no_s) |
864 | endif |
865 | @@ -272,9 +271,7 @@ |
866 | write(iu) qtot,temp |
867 | endif |
868 | |
869 | - write_xijk = .TRUE. |
870 | - |
871 | - if (write_xijk) then |
872 | + if (write_xijk) then ! Always |
873 | #ifdef MPI |
874 | C Allocate buffer array |
875 | if (Node .eq. 0) then |
876 | |
877 | === modified file 'Src/m_ncdf_siesta.F90' |
878 | --- Src/m_ncdf_siesta.F90 2018-02-27 14:03:49 +0000 |
879 | +++ Src/m_ncdf_siesta.F90 2018-06-26 07:59:48 +0000 |
880 | @@ -42,7 +42,6 @@ |
881 | use fdf, only : fdf_get, leqi |
882 | use class_Sparsity |
883 | use files, only : slabel |
884 | - use m_gamma, only : Gamma |
885 | use atomlist, only: no_u, no_s, lasto, Qtot |
886 | use siesta_geom, only: na_u, nsc |
887 | use sparse_matrices, only: sparse_pattern |
888 | |
889 | === modified file 'Src/m_transiesta.F90' |
890 | --- Src/m_transiesta.F90 2018-04-04 13:22:33 +0000 |
891 | +++ Src/m_transiesta.F90 2018-06-26 07:59:48 +0000 |
892 | @@ -46,7 +46,7 @@ |
893 | |
894 | subroutine transiesta(TSiscf,nspin, & |
895 | sp_dist, sparse_pattern, & |
896 | - Gamma, ucell, nsc, isc_off, no_u, na_u, lasto, xa, n_nzs, & |
897 | + no_aux_cell, ucell, nsc, isc_off, no_u, na_u, lasto, xa, n_nzs, & |
898 | H, S, DM, EDM, Ef, & |
899 | Qtot, Fermi_correct, DE_NEGF) |
900 | |
901 | @@ -82,7 +82,7 @@ |
902 | integer, intent(in) :: nspin |
903 | type(OrbitalDistribution), intent(inout) :: sp_dist |
904 | type(Sparsity), intent(inout) :: sparse_pattern |
905 | - logical, intent(in) :: Gamma |
906 | + logical, intent(in) :: no_aux_cell |
907 | real(dp), intent(in) :: ucell(3,3) |
908 | integer, intent(in) :: nsc(3), no_u, na_u |
909 | integer, intent(in) :: isc_off(3,product(nsc)) |
910 | @@ -134,7 +134,7 @@ |
911 | ! local sparsity pattern... |
912 | converged = IsVolt .or. TS_RHOCORR_METHOD == TS_RHOCORR_FERMI |
913 | call ts_sparse_init(slabel,converged, N_Elec, Elecs, & |
914 | - ucell, nsc, na_u, xa, lasto, sp_dist, sparse_pattern, Gamma, & |
915 | + ucell, nsc, na_u, xa, lasto, sp_dist, sparse_pattern, no_aux_cell, & |
916 | isc_off) |
917 | |
918 | if ( ts_method == TS_BTD ) then |
919 | |
920 | === modified file 'Src/pdos.F' |
921 | --- Src/pdos.F 2018-05-08 11:36:55 +0000 |
922 | +++ Src/pdos.F 2018-06-26 07:59:48 +0000 |
923 | @@ -8,7 +8,7 @@ |
924 | subroutine pdos( NO, nspin, maxspn, NO_L, MAXNH, |
925 | . MAXO, NUMH, LISTHPTR, LISTH, H, S, |
926 | . E1, E2, SIGMA, NHIST, |
927 | - . GAMMA, XIJ, INDXUO, NK, KPOINT, WK, EO, NO_U ) |
928 | + . XIJ, INDXUO, GAMMA, NK, KPOINT, WK, EO, NO_U ) |
929 | C ********************************************************************** |
930 | C Subroutine to calculate the projected density of states on the |
931 | C atomic orbitals for a given eigenvalue spectra |
932 | @@ -37,13 +37,13 @@ |
933 | C Not used if e1 > e2 |
934 | C REAL*8 SIGMA : Width of the gaussian to expand the eigenvalues |
935 | C INTEGER NHIST : Number of subdivisions of the histogram |
936 | -C LOGICAL GAMMA : Only gamma point? |
937 | C REAL*8 XIJ(3,MAXNH) : Vectors between orbital centers (sparse) |
938 | C (not used if only gamma point) |
939 | C INTEGER INDXUO(NO) : Index of equivalent orbital in unit cell |
940 | C Unit cell orbitals must be the first in |
941 | C orbital lists, i.e. indxuo.le.nuo, with |
942 | C nuo the nuber of orbitals in the unit cell |
943 | +C logical Gamma : whether only the Gamma point is sampled |
944 | C INTEGER NK : Number of k points |
945 | C REAL*8 KPOINT(3,NK) : k point vectors |
946 | C REAL*8 WK(NK) : k point weights (must sum one) |
947 | @@ -80,6 +80,7 @@ |
948 | . NO, NSPIN, MAXSPN, NO_L, MAXNH, NK, NHIST, |
949 | . MAXO, NO_U |
950 | |
951 | + logical, intent(in) :: Gamma |
952 | integer |
953 | . NUMH(*), LISTH(MAXNH), LISTHPTR(*), INDXUO(NO) |
954 | |
955 | @@ -87,9 +88,6 @@ |
956 | . H(MAXNH,NSPIN), S(MAXNH), E1, E2, SIGMA, |
957 | . XIJ(3,MAXNH), KPOINT(3,NK), WK(NK), EO(MAXO,MAXSPN,NK) |
958 | |
959 | - logical |
960 | - . gamma |
961 | - |
962 | C Dynamic arrays ------------------------------------------------------- |
963 | real(dp), dimension(:,:) , pointer :: DTOT |
964 | real(dp), dimension(:,:,:), pointer :: DPR |
965 | |
966 | === modified file 'Src/pdos2g.F' |
967 | --- Src/pdos2g.F 2018-04-17 20:18:03 +0000 |
968 | +++ Src/pdos2g.F 2018-06-26 07:59:48 +0000 |
969 | @@ -100,19 +100,19 @@ |
970 | & routine='pdos2g') |
971 | |
972 | C Initialize auxiliary variables |
973 | - Haux=dcmplx(0.0_dp,0.0_dp) |
974 | - Saux=dcmplx(0.0_dp,0.0_dp) |
975 | - |
976 | do io = 1,nuo |
977 | + Saux(:,:,:,io) = 0._dp |
978 | + Haux(:,:,:,io) = 0._dp |
979 | do j = 1,numh(io) |
980 | ind = listhptr(io) + j |
981 | jo = listh(ind) |
982 | - Saux(1,jo,1,io) = dcmplx( S(ind), 0.0_dp) |
983 | - Saux(2,jo,2,io) = dcmplx( S(ind), 0.0_dp) |
984 | - Haux(1,jo,1,io) = dcmplx(H(ind,1), 0.0_dp) |
985 | - Haux(2,jo,2,io) = dcmplx(H(ind,2), 0.0_dp) |
986 | - Haux(1,jo,2,io) = dcmplx(H(ind,3),-H(ind,4)) |
987 | - Haux(2,jo,1,io) = dcmplx(H(ind,3), H(ind,4)) |
988 | + jo = indxuo(jo) |
989 | + Saux(1,jo,1,io) = Saux(1,jo,1,io) + dcmplx( S(ind), 0.0_dp) |
990 | + Saux(2,jo,2,io) = Saux(2,jo,2,io) + dcmplx( S(ind), 0.0_dp) |
991 | + Haux(1,jo,1,io) = Haux(1,jo,1,io) + dcmplx(H(ind,1), 0.0_dp) |
992 | + Haux(2,jo,2,io) = Haux(2,jo,2,io) + dcmplx(H(ind,2), 0.0_dp) |
993 | + Haux(2,jo,1,io) = Haux(2,jo,1,io) + dcmplx(H(ind,3), H(ind,4)) |
994 | + Haux(1,jo,2,io) = Haux(1,jo,2,io) + dcmplx(H(ind,3),-H(ind,4)) |
995 | enddo |
996 | enddo |
997 | |
998 | @@ -123,19 +123,20 @@ |
999 | call die('Terminating due to failed diagonalisation') |
1000 | elseif (ierror .lt. 0) then |
1001 | C Repeat diagonalisation with increased memory to handle clustering |
1002 | - Saux = dcmplx(0.0_dp, 0.0_dp) |
1003 | - Haux = dcmplx(0.0_dp, 0.0_dp) |
1004 | do io = 1,nuo |
1005 | + Saux(:,:,:,io) = 0._dp |
1006 | + Haux(:,:,:,io) = 0._dp |
1007 | do j = 1,numh(io) |
1008 | - ind = listhptr(io) + j |
1009 | - jo = listh(ind) |
1010 | - Saux(1,jo,1,io) = dcmplx( S(ind), 0.0_dp) |
1011 | - Saux(2,jo,2,io) = dcmplx( S(ind), 0.0_dp) |
1012 | - Haux(1,jo,1,io) = dcmplx(H(ind,1), 0.0_dp) |
1013 | - Haux(2,jo,2,io) = dcmplx(H(ind,2), 0.0_dp) |
1014 | - Haux(1,jo,2,io) = dcmplx(H(ind,3),-H(ind,4)) |
1015 | - Haux(2,jo,1,io) = dcmplx(H(ind,3), H(ind,4)) |
1016 | - enddo |
1017 | + ind = listhptr(io) + j |
1018 | + jo = listh(ind) |
1019 | + jo = indxuo(jo) |
1020 | + Saux(1,jo,1,io) = Saux(1,jo,1,io) +dcmplx( S(ind), 0.0_dp) |
1021 | + Saux(2,jo,2,io) = Saux(2,jo,2,io) +dcmplx( S(ind), 0.0_dp) |
1022 | + Haux(1,jo,1,io) = Haux(1,jo,1,io) +dcmplx(H(ind,1), 0.0_dp) |
1023 | + Haux(2,jo,2,io) = Haux(2,jo,2,io) +dcmplx(H(ind,2), 0.0_dp) |
1024 | + Haux(2,jo,1,io) = Haux(2,jo,1,io) +dcmplx(H(ind,3), H(ind,4)) |
1025 | + Haux(1,jo,2,io) = Haux(1,jo,2,io) +dcmplx(H(ind,3),-H(ind,4)) |
1026 | + enddo |
1027 | enddo |
1028 | call cdiag(Haux,Saux,2*nuotot,2*nuo,2*nuotot,eo,psi, |
1029 | . 2*nuotot,1,ierror,2*BlockSize) |
1030 | @@ -147,7 +148,8 @@ |
1031 | do j = 1, numh(io) |
1032 | ind = listhptr(io) + j |
1033 | jo = listh(ind) |
1034 | - Spr(jo,io) = S(ind) |
1035 | + jo = indxuo(jo) |
1036 | + Spr(jo,io) = Spr(jo,io) + S(ind) |
1037 | enddo |
1038 | enddo |
1039 | |
1040 | |
1041 | === modified file 'Src/pdos3g.F' |
1042 | --- Src/pdos3g.F 2018-04-18 10:18:19 +0000 |
1043 | +++ Src/pdos3g.F 2018-06-26 07:59:48 +0000 |
1044 | @@ -95,25 +95,25 @@ |
1045 | delta = (E2 - E1)/nhist |
1046 | |
1047 | C Initialize auxiliary variables |
1048 | - Haux=dcmplx(0.0_dp,0.0_dp) |
1049 | - Saux=dcmplx(0.0_dp,0.0_dp) |
1050 | |
1051 | call re_alloc(Spr, 1, nuotot, 1, nuo, name='Spr', |
1052 | & routine='pdos3g') |
1053 | |
1054 | do io = 1,nuo |
1055 | + Saux(:,:,:,io) = 0._dp |
1056 | + Haux(:,:,:,io) = 0._dp |
1057 | do j = 1,numh(io) |
1058 | ind = listhptr(io) + j |
1059 | jo = listh(ind) |
1060 | - Saux(1,jo,1,io) = dcmplx( S(ind), 0.0_dp) |
1061 | - Saux(2,jo,2,io) = dcmplx( S(ind), 0.0_dp) |
1062 | - Haux(1,jo,1,io) = dcmplx(H(ind,1), H(ind,5)) |
1063 | - Haux(2,jo,2,io) = dcmplx(H(ind,2), H(ind,6)) |
1064 | - Haux(1,jo,2,io) = dcmplx(H(ind,3),-H(ind,4)) |
1065 | - Haux(2,jo,1,io) = dcmplx(H(ind,7), H(ind,8)) |
1066 | + jo = indxuo(jo) |
1067 | + Saux(1,jo,1,io) = Saux(1,jo,1,io) + dcmplx( S(ind), 0.0_dp) |
1068 | + Saux(2,jo,2,io) = Saux(2,jo,2,io) + dcmplx( S(ind), 0.0_dp) |
1069 | + Haux(1,jo,1,io) = Haux(1,jo,1,io) + dcmplx(H(ind,1), H(ind,5)) |
1070 | + Haux(2,jo,2,io) = Haux(2,jo,2,io) + dcmplx(H(ind,2), H(ind,6)) |
1071 | + Haux(1,jo,2,io) = Haux(1,jo,2,io) + dcmplx(H(ind,3),-H(ind,4)) |
1072 | + Haux(2,jo,1,io) = Haux(2,jo,1,io) + dcmplx(H(ind,7), H(ind,8)) |
1073 | enddo |
1074 | enddo |
1075 | - |
1076 | C Diagonalize at the Gamma point |
1077 | call cdiag( Haux, Saux, 2*nuotot, 2*nuo, 2*nuotot, |
1078 | . eo, psi, 2*nuotot, 1, ierror, 2*BlockSize ) |
1079 | @@ -121,20 +121,21 @@ |
1080 | call die('Terminating due to failed diagonalisation') |
1081 | elseif (ierror .lt. 0) then |
1082 | C Repeat diagonalisation with increased memory to handle clustering |
1083 | - Saux = dcmplx(0.0_dp, 0.0_dp) |
1084 | - Haux = dcmplx(0.0_dp, 0.0_dp) |
1085 | - do io = 1,nuo |
1086 | - do j = 1,numh(io) |
1087 | - ind = listhptr(io) + j |
1088 | - jo = listh(ind) |
1089 | - Saux(1,jo,1,io) = dcmplx( S(ind), 0.0_dp) |
1090 | - Saux(2,jo,2,io) = dcmplx( S(ind), 0.0_dp) |
1091 | - Haux(1,jo,1,io) = dcmplx(H(ind,1), H(ind,5)) |
1092 | - Haux(2,jo,2,io) = dcmplx(H(ind,2), H(ind,6)) |
1093 | - Haux(1,jo,2,io) = dcmplx(H(ind,3),-H(ind,4)) |
1094 | - Haux(2,jo,1,io) = dcmplx(H(ind,7), H(ind,8)) |
1095 | - enddo |
1096 | + do io = 1,nuo |
1097 | + Saux(:,:,:,io) = 0._dp |
1098 | + Haux(:,:,:,io) = 0._dp |
1099 | + do j = 1,numh(io) |
1100 | + ind = listhptr(io) + j |
1101 | + jo = listh(ind) |
1102 | + jo = indxuo(jo) |
1103 | + Saux(1,jo,1,io) = Saux(1,jo,1,io) + dcmplx( S(ind), 0.0_dp) |
1104 | + Saux(2,jo,2,io) = Saux(2,jo,2,io) + dcmplx( S(ind), 0.0_dp) |
1105 | + Haux(1,jo,1,io) = Haux(1,jo,1,io) + dcmplx(H(ind,1), H(ind,5)) |
1106 | + Haux(2,jo,2,io) = Haux(2,jo,2,io) + dcmplx(H(ind,2), H(ind,6)) |
1107 | + Haux(1,jo,2,io) = Haux(1,jo,2,io) + dcmplx(H(ind,3),-H(ind,4)) |
1108 | + Haux(2,jo,1,io) = Haux(2,jo,1,io) + dcmplx(H(ind,7), H(ind,8)) |
1109 | enddo |
1110 | + enddo |
1111 | call cdiag(Haux,Saux,2*nuotot,2*nuo,2*nuotot,eo,psi, |
1112 | . 2*nuotot,1,ierror,2*BlockSize) |
1113 | endif |
1114 | @@ -145,7 +146,8 @@ |
1115 | do j = 1, numh(io) |
1116 | ind = listhptr(io) + j |
1117 | jo = listh(ind) |
1118 | - Spr(jo,io) = S(ind) |
1119 | + jo = indxuo(jo) |
1120 | + Spr(jo,io) = Spr(jo,io) + S(ind) |
1121 | enddo |
1122 | enddo |
1123 | |
1124 | |
1125 | === modified file 'Src/post_scf_work.F' |
1126 | --- Src/post_scf_work.F 2018-02-27 14:03:49 +0000 |
1127 | +++ Src/post_scf_work.F 2018-06-26 07:59:48 +0000 |
1128 | @@ -41,7 +41,6 @@ |
1129 | use m_compute_dm, only : PreviousCallDiagon |
1130 | use m_eo |
1131 | use Kpoint_grid |
1132 | - use m_gamma |
1133 | implicit none |
1134 | |
1135 | ! MD-step, SCF-step |
1136 | @@ -52,12 +51,8 @@ |
1137 | type(Pair_Geometry_dSpData2D) :: pair |
1138 | type(Geometry) :: geom |
1139 | |
1140 | -#ifdef DEBUG |
1141 | - call write_debug( ' PRE post_scf_work' ) |
1142 | -#endif |
1143 | - |
1144 | call timer( 'PostSCF', 1 ) |
1145 | -! |
1146 | + |
1147 | ! If converged, make one last iteration to find forces and stress |
1148 | |
1149 | ! If we use the minimization routine, the energy-density |
1150 | @@ -81,15 +76,17 @@ |
1151 | & no_l, maxnh, maxnh, no_u, |
1152 | & numh, listhptr, listh, numh, listhptr, listh, |
1153 | & H, S, qtot, fixspin, qtots, temp, 1.0_dp, -1.0_dp, |
1154 | - & gamma, xijo, indxuo, nkpnt, kpoint, kweight, |
1155 | + & xijo, indxuo, gamma_SCF, nkpnt, kpoint, kweight, |
1156 | & eo, qo, Dscf, Escf, ef, efs, Entropy, no_u, |
1157 | & occtol, iscf, neigwanted) |
1158 | Ecorrec = 0.0_dp |
1159 | else |
1160 | - if (gamma) then |
1161 | + if ( no_u == no_s ) then ! Not using an auxiliary supercell |
1162 | call dminim(.true., .false., iscf, istp, no_l, nspin, no_u, |
1163 | & maxnh, numh, listhptr, listh, Escf, eta, qtots) |
1164 | else |
1165 | + ! When using an auxiliary supercell |
1166 | + ! (even for gamma point; not optimized yet) |
1167 | call zminim(.true., .false., iscf, istp, no_l, nspin, no_u, |
1168 | & maxnh, numh, listhptr, listh, Escf, eta, qtots, |
1169 | & no_s, xijo, indxuo, nkpnt, kpoint, kweight) |
1170 | |
1171 | === modified file 'Src/projected_DOS.F' |
1172 | --- Src/projected_DOS.F 2018-01-04 18:48:03 +0000 |
1173 | +++ Src/projected_DOS.F 2018-06-26 07:59:48 +0000 |
1174 | @@ -69,7 +69,6 @@ |
1175 | use parallel, only: IOnode |
1176 | use m_eo |
1177 | use m_spin, only: h_spin_dim, spinor_dim |
1178 | - use m_gamma |
1179 | use units, only: eV |
1180 | |
1181 | implicit none |
1182 | @@ -122,7 +121,7 @@ |
1183 | call pdos( no_s, h_spin_dim, spinor_dim, no_l, |
1184 | . maxnh, |
1185 | . no_u, numh, listhptr, listh, H, S, |
1186 | - . e1, e2, sigma, nhist, gamma_pdos, xijo, indxuo, |
1187 | + . e1, e2, sigma, nhist, xijo, indxuo, gamma_PDOS, |
1188 | . nkpnt_pdos, kpoints_pdos, kweight_pdos, eo, |
1189 | . no_u) |
1190 | else |
1191 | @@ -131,7 +130,8 @@ |
1192 | . maxnh, |
1193 | . no_u, numh, listhptr, listh, H, S, |
1194 | . e1, e2, sigma, nhist, |
1195 | - . gamma, xijo, indxuo, nkpnt, kpoint, kweight, eo, |
1196 | + . xijo, indxuo, gamma_SCF, |
1197 | + . nkpnt, kpoint, kweight, eo, |
1198 | . no_u) |
1199 | endif |
1200 | |
1201 | |
1202 | === modified file 'Src/setup_hamiltonian.F' |
1203 | --- Src/setup_hamiltonian.F 2018-03-30 23:16:29 +0000 |
1204 | +++ Src/setup_hamiltonian.F 2018-06-26 07:59:48 +0000 |
1205 | @@ -43,7 +43,6 @@ |
1206 | use m_spin, only: spin |
1207 | use m_dipol |
1208 | use alloc, only: re_alloc, de_alloc |
1209 | - use m_gamma |
1210 | use m_hsx, only: write_hsx |
1211 | use sys, only: die, bye |
1212 | use m_partial_charges, only: want_partial_charges |
1213 | @@ -256,7 +255,7 @@ |
1214 | ! Only in HSX format now. Use Util/HSX/hsx2hs to generate an HS file |
1215 | |
1216 | if (savehs .or. write_coop) then |
1217 | - call write_hsx( gamma, no_u, no_s, spin%H, indxuo, |
1218 | + call write_hsx( no_u, no_s, spin%H, indxuo, |
1219 | & maxnh, numh, listhptr, listh, H, S, qtot, |
1220 | & temp, xijo) |
1221 | endif |
1222 | |
1223 | === modified file 'Src/siesta_analysis.F' |
1224 | --- Src/siesta_analysis.F 2018-04-09 21:33:05 +0000 |
1225 | +++ Src/siesta_analysis.F 2018-06-26 07:59:48 +0000 |
1226 | @@ -15,7 +15,7 @@ |
1227 | |
1228 | subroutine siesta_analysis( relaxd ) |
1229 | USE band, only: nbk, bk, maxbk, bands |
1230 | - USE writewave, only: nwk, wfk, wwave |
1231 | + USE writewave, only: nwk, wfk, wwave, gamma_wavefunctions |
1232 | USE writewave, only: setup_wfs_list, wfs_filename |
1233 | USE m_ksvinit, only: nkpol, kpol, wgthpol |
1234 | use m_ksv |
1235 | @@ -35,7 +35,6 @@ |
1236 | & iphkb, no_u, no_s, iza, iphorb, rmaxo, indxua |
1237 | use atomlist, only: qtot |
1238 | use fdf |
1239 | - use writewave, only: wwave |
1240 | use siesta_cml |
1241 | use files, only : slabel |
1242 | use files, only : filesOut_t ! derived type for output file names |
1243 | @@ -52,7 +51,6 @@ |
1244 | use m_dipol |
1245 | use m_eo |
1246 | use m_forces, only: fa |
1247 | - use m_gamma |
1248 | use alloc, only: re_alloc, de_alloc |
1249 | use basis_enthalpy, only: write_basis_enthalpy |
1250 | use m_partial_charges, only: want_partial_charges |
1251 | @@ -275,7 +273,7 @@ |
1252 | call wwave( no_s, h_spin_dim, spinor_dim, no_u, no_l, maxnh, |
1253 | & nwk, |
1254 | & numh, listhptr, listh, H, S, Ef, xijo, indxuo, |
1255 | - & nwk, wfk, no_u, gamma, occtol ) |
1256 | + & gamma_wavefunctions, nwk, wfk, no_u, occtol ) |
1257 | endif |
1258 | |
1259 | |
1260 | @@ -295,7 +293,7 @@ |
1261 | call wwave( no_s, h_spin_dim, spinor_dim, no_u, no_l, maxnh, |
1262 | . nkpnt, |
1263 | . numh, listhptr, listh, H, S, Ef, xijo, indxuo, |
1264 | - . nkpnt, kpoint, no_u, gamma, occtol) |
1265 | + . gamma_SCF, nkpnt, kpoint, no_u, occtol) |
1266 | endif |
1267 | |
1268 | ! Compute bands |
1269 | |
1270 | === modified file 'Src/siesta_init.F' |
1271 | --- Src/siesta_init.F 2018-06-07 20:08:23 +0000 |
1272 | +++ Src/siesta_init.F 2018-06-26 07:59:48 +0000 |
1273 | @@ -57,7 +57,6 @@ |
1274 | use m_rmaxh |
1275 | use m_forces |
1276 | use m_eo |
1277 | - use m_gamma |
1278 | use m_fixed, only: init_fixed, print_fixed |
1279 | use m_ioxv, only: xv_file_read |
1280 | use m_projected_DOS, only: init_projected_DOS |
1281 | @@ -115,7 +114,7 @@ |
1282 | integer :: i, is, ispin, n_dm_items |
1283 | integer :: neigmin ! Min. number of eigenstates (per k point) |
1284 | integer :: ns ! Number of species |
1285 | - logical :: user_wants_supercell |
1286 | + logical :: user_wants_supercell, not_using_auxcell |
1287 | real(dp) :: walltime_m, walltime_s |
1288 | |
1289 | integer :: World_Group |
1290 | @@ -567,7 +566,7 @@ |
1291 | ! not early, in order to decide whether to use an |
1292 | ! auxiliary supercell for the calculation of matrix elements. |
1293 | call setup_Kpoint_grid( ucell ) |
1294 | - gamma = gamma_scf |
1295 | + not_using_auxcell = gamma_scf |
1296 | |
1297 | ! Read in diagonalization routines |
1298 | ! Note that only the sampled BZ is responsible for |
1299 | @@ -580,7 +579,7 @@ |
1300 | ! the auxiliary supercell is needed for a non-gamma calculation |
1301 | call init_projected_DOS( ) |
1302 | if (do_pdos) then |
1303 | - gamma = gamma .and. gamma_pdos |
1304 | + not_using_auxcell = not_using_auxcell.and. gamma_pdos |
1305 | endif |
1306 | |
1307 | nullify(eo,qo) |
1308 | @@ -590,13 +589,13 @@ |
1309 | & 'siesta_init') |
1310 | |
1311 | call setup_bands( ) |
1312 | - gamma = gamma .and. gamma_bands |
1313 | + not_using_auxcell = not_using_auxcell .and. gamma_bands |
1314 | |
1315 | call setup_wf_kpoints( ) |
1316 | - gamma = gamma .and. gamma_wavefunctions |
1317 | + not_using_auxcell = not_using_auxcell .and. gamma_wavefunctions |
1318 | |
1319 | call estimate_pol_kpoints( ucell ) |
1320 | - gamma = gamma .and. gamma_polarization |
1321 | + not_using_auxcell = not_using_auxcell .and. gamma_polarization |
1322 | ! print *, "gamma, gamma_pol: ", gamma, gamma_polarization |
1323 | ! |
1324 | ! User can request that the calculation is done with an explicit |
1325 | @@ -604,12 +603,12 @@ |
1326 | ! the gamma point |
1327 | ! |
1328 | user_wants_supercell = fdf_get( 'ForceAuxCell', .false. ) |
1329 | - if (user_wants_supercell) gamma = .false. |
1330 | + if (user_wants_supercell) not_using_auxcell = .false. |
1331 | |
1332 | ! Find required supercell |
1333 | ! 2*rmaxh is used to guarantee that two given orbitals in the |
1334 | ! supercell can only overlap once |
1335 | - if (gamma) then |
1336 | + if (not_using_auxcell) then |
1337 | nsc(1:3) = 1 |
1338 | else |
1339 | ! Discussion with Jose-Soler we get this size ! NPA |
1340 | |
1341 | === modified file 'Src/state_init.F' |
1342 | --- Src/state_init.F 2018-05-15 09:48:18 +0000 |
1343 | +++ Src/state_init.F 2018-06-26 07:59:48 +0000 |
1344 | @@ -13,7 +13,7 @@ |
1345 | CONTAINS |
1346 | |
1347 | subroutine state_init( istep ) |
1348 | - use Kpoint_grid, only: setup_Kpoint_grid, nkpnt |
1349 | + use Kpoint_grid, only: setup_Kpoint_grid, nkpnt, gamma_scf |
1350 | use m_os, only: file_exist |
1351 | use m_new_dm, only: new_dm |
1352 | use m_proximity_check, only: proximity_check |
1353 | @@ -66,7 +66,6 @@ |
1354 | use m_normalize_dm, only: normalize_dm |
1355 | |
1356 | use m_eo |
1357 | - use m_gamma |
1358 | use files, only: slabel |
1359 | use m_mpi_utils, only: globalize_or |
1360 | use m_mpi_utils, only: globalize_sum |
1361 | @@ -129,15 +128,15 @@ |
1362 | |
1363 | type(dData2D) :: tmp_2D |
1364 | real(dp) :: dummy_qspin(8) |
1365 | - |
1366 | + logical :: not_using_auxcell |
1367 | |
1368 | !------------------------------------------------------------------- BEGIN |
1369 | call timer( 'IterGeom', 1 ) |
1370 | -#ifdef DEBUG |
1371 | - call write_debug( ' PRE state_init' ) |
1372 | -#endif |
1373 | + |
1374 | call timer( 'state_init', 1 ) |
1375 | |
1376 | + not_using_auxcell = (no_s == no_u) |
1377 | + |
1378 | istp = istp + 1 |
1379 | |
1380 | if (IOnode) then |
1381 | @@ -245,7 +244,7 @@ |
1382 | endif |
1383 | |
1384 | if ( cell_can_change .and. |
1385 | - & (istep.ne.inicoor) .and. (.not.gamma) ) then |
1386 | + & (istep.ne.inicoor) .and. (.not.gamma_scf) ) then |
1387 | |
1388 | ! Will print k-points also |
1389 | call setup_Kpoint_grid( ucell ) |
1390 | @@ -258,7 +257,7 @@ |
1391 | & 'state_init' ) |
1392 | |
1393 | ! Find required supercell |
1394 | - if (gamma) then |
1395 | + if (not_using_auxcell) then |
1396 | nsc(1:3) = 1 |
1397 | else |
1398 | do i = 1 , 3 |
1399 | @@ -340,14 +339,14 @@ |
1400 | call delete(xij_2D) ! as xijo will be reallocated |
1401 | nullify(xijo) |
1402 | call hsparse( negl, scell, nsc, na_s, isa, xa, lasto, |
1403 | - & lastkb, iphorb, iphKB, maxnh, gamma, |
1404 | + & lastkb, iphorb, iphKB, maxnh, not_using_auxcell, |
1405 | $ set_xijo=.true., folding=folding1, |
1406 | $ diagonal_folding=diag_folding1, |
1407 | $ debug_folding=fdf_get('debug-folding',.false.)) |
1408 | ! |
1409 | call globalize_or(diag_folding1,diag_folding) |
1410 | call globalize_or(folding1,folding) |
1411 | - if (diag_folding .and. gamma) then |
1412 | + if (diag_folding .and. not_using_auxcell) then |
1413 | call message("WARNING","Gamma-point calculation " // |
1414 | $ "with interaction between periodic images") |
1415 | call message("WARNING", |
1416 | @@ -358,7 +357,7 @@ |
1417 | $ "'force-aux-cell T'") |
1418 | |
1419 | else if (folding) then |
1420 | - if (gamma) then |
1421 | + if (not_using_auxcell) then |
1422 | call message("INFO","Gamma-point calculation " // |
1423 | $ "with multiply-connected orbital pairs") |
1424 | call message("INFO", |
1425 | @@ -449,7 +448,7 @@ |
1426 | xijo => val(xij_2D) |
1427 | |
1428 | ! Calculate the super-cell offsets... |
1429 | - if ( Gamma ) then |
1430 | + if ( not_using_auxcell ) then |
1431 | ! Here we create the super-cell offsets |
1432 | call re_alloc(isc_off,1,3,1,1) |
1433 | isc_off(:,:) = 0 |
1434 | @@ -467,7 +466,7 @@ |
1435 | ! Force the creation of the full sparsity pattern |
1436 | call ts_sparse_init(slabel,IsVolt, N_Elec, Elecs, |
1437 | & ucell, nsc, na_u, xa, lasto, block_dist, sparse_pattern, |
1438 | - & Gamma, isc_off) |
1439 | + & not_using_auxcell, isc_off) |
1440 | |
1441 | ! create the tri-diagonal matrix |
1442 | call ts_tri_analyze( block_dist, sparse_pattern , N_Elec, |
1443 | @@ -580,7 +579,7 @@ |
1444 | ! We include H as S, well-knowing that we only write one of |
1445 | ! them, there is no need to allocate space for no reason! |
1446 | call ts_write_tshs(fname, |
1447 | - & .true., Gamma, ts_Gamma_file, |
1448 | + & .true., not_using_auxcell, ts_Gamma_file, |
1449 | & ucell, nsc, isc_off, na_u, no_s, spin%H, |
1450 | & ts_kscell_file, ts_kdispl_file, |
1451 | & xa, lasto, |
1452 | |
1453 | === modified file 'Src/writewave.F' |
1454 | --- Src/writewave.F 2018-06-08 14:34:39 +0000 |
1455 | +++ Src/writewave.F 2018-06-26 07:59:48 +0000 |
1456 | @@ -386,7 +386,7 @@ |
1457 | subroutine wwave( no, nspin, maxspn, maxo, maxuo, maxnh, |
1458 | . maxk, |
1459 | . numh, listhptr, listh, H, S, ef, xij, indxuo, |
1460 | - . nk, kpoint, nuotot, gamma, occtol) |
1461 | + . gamma, nk, kpoint, nuotot, occtol) |
1462 | C ********************************************************************* |
1463 | C Finds wavefunctions at selected k-points. |
1464 | C Written by P. Ordejon, June 2003 |
1465 | @@ -415,10 +415,10 @@ |
1466 | C Unit cell orbitals must be the first in |
1467 | C orbital lists, i.e. indxuo.le.nuo, with |
1468 | C nuo the number of orbitals in unit cell |
1469 | +C logical Gamma : whether only the Gamma-point is sampled |
1470 | C integer nk : Number of band k points |
1471 | C real*8 kpoint(3,maxk) : k point vectors |
1472 | C integer nuotot : Total number of orbitals in unit cell |
1473 | -C logical gamma : Indicates if this is a Gamma point run |
1474 | C real*8 occtol : Occupancy threshold for DM build |
1475 | C *************************** OUTPUT ********************************** |
1476 | C None; output is dumped to wave functions file SystemLabel.WFSX |
1477 | @@ -448,11 +448,11 @@ |
1478 | |
1479 | implicit none |
1480 | |
1481 | + logical, intent(in) :: Gamma |
1482 | integer maxk, maxnh, maxo, maxuo, nk, no, |
1483 | . h_spin_dim, spinor_dim, nspin, maxspn, |
1484 | . nuotot, indxuo(no), listh(maxnh), numh(*), |
1485 | . listhptr(*) |
1486 | - logical gamma |
1487 | real(dp) ef, H(:,:), kpoint(3,maxk), |
1488 | . S(maxnh), xij(3,maxnh), occtol |
1489 | |
1490 | @@ -470,7 +470,6 @@ |
1491 | . temp, wk, Entropy |
1492 | |
1493 | C Dynamic arrays |
1494 | - integer, allocatable :: muo(:) |
1495 | logical, parameter :: getD = .false. |
1496 | logical, parameter :: getPSI = .true. |
1497 | real(dp), allocatable :: aux(:) |
1498 | @@ -525,45 +524,11 @@ |
1499 | call re_alloc(Saux,1,nhs,name='Saux',routine='densematrix') |
1500 | call re_alloc(psi,1,nhs,name='psi',routine='densematrix') |
1501 | |
1502 | -CC RC ek has different arguments here than in 3.1.1 version that it is: |
1503 | -C allocate(ek(maxspn,nuo,nuotot)) and the next call to memory |
1504 | allocate(ek(nuotot,maxspn,nk)) |
1505 | call memory('A','D',maxspn*nk*nuotot,'writewave') |
1506 | naux = 2*nuotot*5 |
1507 | allocate(aux(naux)) |
1508 | call memory('A','D',naux,'writewave') |
1509 | - allocate(muo(nuotot)) |
1510 | - call memory('A','I',nuotot,'writewave') |
1511 | - |
1512 | -C Check indxuo |
1513 | - do iuo = 1,nuotot |
1514 | - muo(iuo) = 0 |
1515 | - enddo |
1516 | - do io = 1,no |
1517 | - iuo = indxuo(io) |
1518 | - if (indxuo(io).le.0 .or. indxuo(io).gt.nuotot) then |
1519 | - if (Node.eq.0) then |
1520 | - write(6,*) 'writewave: invalid index: io, indxuo =', |
1521 | - . io, indxuo(io) |
1522 | - call die('writewave: invalid indxuo') |
1523 | - else |
1524 | - call die() |
1525 | - endif |
1526 | - endif |
1527 | - muo(iuo) = muo(iuo) + 1 |
1528 | - enddo |
1529 | - do iuo = 1,nuotot |
1530 | - if (muo(iuo) .ne. muo(1)) then |
1531 | - if (Node.eq.0) then |
1532 | - write(6,'(/,2a,3i6)') 'writewave: ERROR: inconsistent indxuo.' |
1533 | - . ,' iuo, muo(iuo), muo(1) =', iuo, muo(iuo), muo(1) |
1534 | - call die('writewave: ERROR: inconsistent indxuo.') |
1535 | - else |
1536 | - call die() |
1537 | - endif |
1538 | - endif |
1539 | - enddo |
1540 | - |
1541 | |
1542 | C Open file |
1543 | |
1544 | @@ -602,7 +567,6 @@ |
1545 | |
1546 | C Call appropriate diagonalization routine |
1547 | |
1548 | -CC RC Added for on-site SO |
1549 | if (NoMagn .or. SPpol) then |
1550 | if (gamma) then |
1551 | call diagg( h_spin_dim, nuo, maxuo, maxnh, maxnh, |
1552 | @@ -621,7 +585,7 @@ |
1553 | & "WF info generation" |
1554 | end if |
1555 | ParallelOverK = .false. |
1556 | - Serial = Nodes == 1 |
1557 | + Serial = (Nodes == 1) |
1558 | call diag_init() |
1559 | end if |
1560 | |
1561 | @@ -638,7 +602,7 @@ |
1562 | if ( ParallelOverK ) Serial = .true. |
1563 | |
1564 | endif |
1565 | -CC RC Added for on-site SO |
1566 | + |
1567 | elseif (NonCol) then |
1568 | if (gamma) then |
1569 | call diag2g( nuo, no, maxuo, maxnh, maxnh, maxo, numh, |
1570 | @@ -677,8 +641,6 @@ |
1571 | |
1572 | |
1573 | C Free local arrays |
1574 | - call memory('D','I',size(muo),'writewave') |
1575 | - deallocate(muo) |
1576 | call memory('D','D',size(aux),'writewave') |
1577 | deallocate(aux) |
1578 | call memory('D','D',size(ek),'writewave') |
1579 | @@ -716,7 +678,7 @@ |
1580 | logical gamma |
1581 | |
1582 | C Internal variables ............................................. |
1583 | - integer BNode, ntot, iie, iw, indwf, j, ind, iu |
1584 | + integer BNode, iie, iw, indwf, j, ind, iu |
1585 | |
1586 | integer number_of_wfns |
1587 | integer, allocatable :: ind_wfn(:) |
1588 | @@ -746,21 +708,6 @@ |
1589 | . status='old') |
1590 | endif |
1591 | |
1592 | -C Check that the total number of orbitals is correct |
1593 | - |
1594 | -#ifdef MPI |
1595 | - if (Nodes.gt.1) then |
1596 | - call MPI_AllReduce(nuo,ntot,1,MPI_integer,MPI_sum, |
1597 | - . MPI_Comm_World,MPIerror) |
1598 | - else |
1599 | - ntot = nuo |
1600 | - endif |
1601 | -#else |
1602 | - ntot = nuo |
1603 | -#endif |
1604 | - |
1605 | - if (ntot .ne. nuotot) call die('Inconsistent number of orbitals') |
1606 | - |
1607 | if (wfs_energy_window) then |
1608 | allocate(ind_wfn(nwflist(ik))) |
1609 | number_of_wfns = 0 |
1610 | @@ -810,7 +757,10 @@ |
1611 | do iw = 1,nwflist(ik) |
1612 | indwf = iwf(ik,iw) |
1613 | |
1614 | -C Determine which node handles this wavefunction |
1615 | + ! Determine which node handles this wavefunction |
1616 | + ! Note that the distribution is block cyclic, |
1617 | + ! so the same 'orbital' helper functions apply |
1618 | + |
1619 | call WhichNodeOrb(indwf,Nodes,BNode) |
1620 | |
1621 | if (Node .eq. 0 .and. debug) then |
1622 | @@ -820,7 +770,7 @@ |
1623 | |
1624 | if (Node.eq.BNode) then |
1625 | |
1626 | -C Determine the index of the orbital in the local node |
1627 | +C Determine the index of the wavefunction in the local node |
1628 | |
1629 | call GlobalToLocalOrb( indwf, BNode, Nodes, iie) |
1630 | |
1631 | @@ -830,12 +780,12 @@ |
1632 | C must be handled differently |
1633 | |
1634 | if (gamma) then |
1635 | - do j = 1,ntot |
1636 | + do j = 1,nuotot |
1637 | ind = j + (iie-1)*nuotot |
1638 | aux(1,j) = real(psi(ind),kind=sp) |
1639 | enddo |
1640 | else |
1641 | - do j = 1,ntot |
1642 | + do j = 1,nuotot |
1643 | ind = 1+(j-1)*2+(iie-1)*2*nuotot |
1644 | aux(1,j) = real(psi(ind),kind=sp) |
1645 | aux(2,j) = real(psi(ind+1),kind=sp) |
1646 | @@ -862,12 +812,12 @@ |
1647 | endif |
1648 | #endif |
1649 | |
1650 | -C eigenvector is now stored in aux in all processors, and can be printed |
1651 | +C eigenvector is now stored in aux in Node 0, and can be printed |
1652 | |
1653 | if (Node .eq. 0) then |
1654 | write(iu) indwf |
1655 | write(iu) eo(indwf)/eV |
1656 | - write(iu) (aux(1:,j), j=1,ntot) |
1657 | + write(iu) (aux(1:,j), j=1,nuotot) |
1658 | endif |
1659 | |
1660 | enddo |
1661 | |
1662 | === modified file 'Util/COOP/Makefile' |
1663 | --- Util/COOP/Makefile 2018-06-08 09:23:57 +0000 |
1664 | +++ Util/COOP/Makefile 2018-06-26 07:59:48 +0000 |
1665 | @@ -88,7 +88,7 @@ |
1666 | atomlwf.o: spatial.o |
1667 | automatic_cell.o: atm_types.o atmfuncs.o parallel.o precision.o units.o |
1668 | bands.o: alloc.o atmfuncs.o atomlist.o densematrix.o diag.o diag_option.o |
1669 | -bands.o: files.o get_kpoints_scale.o local_sys.o m_gamma.o m_spin.o parallel.o |
1670 | +bands.o: files.o get_kpoints_scale.o local_sys.o m_spin.o parallel.o |
1671 | bands.o: parallelsubs.o precision.o siesta_geom.o writewave.o |
1672 | basis_enthalpy.o: atmfuncs.o atomlist.o precision.o siesta_geom.o units.o |
1673 | basis_io.o: atm_types.o atmparams.o atom_options.o basis_types.o chemical.o |
1674 | @@ -140,10 +140,10 @@ |
1675 | coceri.o: files.o periodic_table.o precision.o units.o |
1676 | compute_dm.o: atomlist.o class_SpData1D.o compute_ebs_shift.o diagon.o |
1677 | compute_dm.o: iodmhs_netcdf.o kpoint_grid.o local_sys.o m_dminim.o m_energies.o |
1678 | -compute_dm.o: m_eo.o m_gamma.o m_hsx.o m_pexsi_driver.o m_rmaxh.o m_spin.o |
1679 | -compute_dm.o: m_steps.o m_transiesta.o m_ts_global_vars.o m_zminim.o |
1680 | -compute_dm.o: normalize_dm.o ordern.o parallel.o precision.o siesta_geom.o |
1681 | -compute_dm.o: siesta_options.o sparse_matrices.o units.o |
1682 | +compute_dm.o: m_eo.o m_hsx.o m_pexsi_driver.o m_rmaxh.o m_spin.o m_steps.o |
1683 | +compute_dm.o: m_transiesta.o m_ts_global_vars.o m_zminim.o normalize_dm.o |
1684 | +compute_dm.o: ordern.o parallel.o precision.o siesta_geom.o siesta_options.o |
1685 | +compute_dm.o: sparse_matrices.o units.o |
1686 | compute_ebs_shift.o: m_mpi_utils.o parallel.o precision.o |
1687 | compute_energies.o: atomlist.o class_SpData1D.o class_SpData2D.o dhscf.o |
1688 | compute_energies.o: files.o m_dipol.o m_energies.o m_mpi_utils.o m_ntm.o |
1689 | @@ -155,8 +155,8 @@ |
1690 | compute_pw_matrix.o: parallel.o precision.o siesta2wannier90.o |
1691 | compute_pw_matrix.o: sparse_matrices.o |
1692 | compute_rhog.o: alloc.o atomlist.o dhscf.o files.o m_dipol.o m_energies.o |
1693 | -compute_rhog.o: m_gamma.o m_ntm.o m_spin.o m_stress.o siesta_geom.o |
1694 | -compute_rhog.o: siesta_options.o sparse_matrices.o |
1695 | +compute_rhog.o: m_ntm.o m_spin.o m_stress.o siesta_geom.o siesta_options.o |
1696 | +compute_rhog.o: sparse_matrices.o |
1697 | conjgr.o: precision.o |
1698 | conjgr_old.o: precision.o |
1699 | coor.o: alloc.o local_sys.o parallel.o precision.o siesta_geom.o units.o |
1700 | @@ -183,13 +183,15 @@ |
1701 | dhscf.o: meshdscf.o meshsubs.o moremeshsubs.o parallel.o parsing.o precision.o |
1702 | dhscf.o: rhofft.o rhoofd.o siesta_options.o units.o vmat.o |
1703 | diag.o: alloc.o diag_option.o local_sys.o parallel.o precision.o |
1704 | -diag2g.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
1705 | +diag2g.o: fermid.o intrinsic_missing.o local_sys.o parallel.o parallelsubs.o |
1706 | +diag2g.o: precision.o |
1707 | diag2k.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
1708 | -diag3g.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
1709 | +diag3g.o: fermid.o intrinsic_missing.o local_sys.o parallel.o parallelsubs.o |
1710 | +diag3g.o: precision.o |
1711 | diag3k.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
1712 | diag_option.o: parallel.o precision.o |
1713 | -diagg.o: alloc.o fermid.o local_sys.o m_spin.o parallel.o parallelsubs.o |
1714 | -diagg.o: precision.o writewave.o |
1715 | +diagg.o: alloc.o fermid.o intrinsic_missing.o local_sys.o m_spin.o parallel.o |
1716 | +diagg.o: parallelsubs.o precision.o writewave.o |
1717 | diagk.o: compute_norm.o fermid.o local_sys.o m_spin.o parallel.o parallelsubs.o |
1718 | diagk.o: precision.o writewave.o |
1719 | diagk_file.o: fermid.o iowfs_netcdf.o local_sys.o parallel.o parallelsubs.o |
1720 | @@ -231,11 +233,11 @@ |
1721 | fft1d.o: local_sys.o parallel.o precision.o |
1722 | final_H_f_stress.o: alloc.o atomlist.o class_SpData2D.o compute_max_diff.o |
1723 | final_H_f_stress.o: dnaefs.o files.o grdsam.o kinefsm.o ldau.o ldau_specs.o |
1724 | -final_H_f_stress.o: local_sys.o m_dipol.o m_energies.o m_forces.o m_gamma.o |
1725 | -final_H_f_stress.o: m_hsx.o m_mpi_utils.o m_ncdf_siesta.o m_ntm.o m_spin.o |
1726 | -final_H_f_stress.o: m_stress.o m_ts_io.o m_ts_kpoints.o m_ts_options.o |
1727 | -final_H_f_stress.o: metaforce.o molecularmechanics.o naefs.o nlefsm.o overfsm.o |
1728 | -final_H_f_stress.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
1729 | +final_H_f_stress.o: local_sys.o m_dipol.o m_energies.o m_forces.o m_hsx.o |
1730 | +final_H_f_stress.o: m_mpi_utils.o m_ncdf_siesta.o m_ntm.o m_spin.o m_stress.o |
1731 | +final_H_f_stress.o: m_ts_io.o m_ts_kpoints.o m_ts_options.o metaforce.o |
1732 | +final_H_f_stress.o: molecularmechanics.o naefs.o nlefsm.o overfsm.o parallel.o |
1733 | +final_H_f_stress.o: siesta_geom.o siesta_options.o sparse_matrices.o |
1734 | final_H_f_stress.o: spinorbit.o units.o |
1735 | find_kgrid.o: alloc.o minvec.o parallel.o precision.o units.o |
1736 | fire_optim.o: alloc.o m_fire.o m_mpi_utils.o parallel.o precision.o |
1737 | @@ -304,8 +306,8 @@ |
1738 | ldau_specs.o: parallel.o precision.o pseudopotential.o radial.o units.o |
1739 | listsc.o: alloc.o |
1740 | local_DOS.o: atomlist.o dhscf.o diagon.o files.o kpoint_grid.o local_sys.o |
1741 | -local_DOS.o: m_energies.o m_eo.o m_forces.o m_gamma.o m_ntm.o m_spin.o |
1742 | -local_DOS.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
1743 | +local_DOS.o: m_energies.o m_eo.o m_forces.o m_ntm.o m_spin.o parallel.o |
1744 | +local_DOS.o: siesta_geom.o siesta_options.o sparse_matrices.o |
1745 | m_broyddj.o: alloc.o local_sys.o m_mpi_utils.o parallel.o precision.o |
1746 | m_broyddj_nocomm.o: alloc.o local_sys.o parallel.o precision.o |
1747 | m_broyden_mixing.o: alloc.o m_broyddj.o m_mpi_utils.o parallel.o precision.o |
1748 | @@ -374,10 +376,10 @@ |
1749 | m_ncdf_io.o: class_OrbitalDistribution.o class_SpData1D.o class_SpData2D.o |
1750 | m_ncdf_io.o: class_Sparsity.o m_io_s.o parallel.o precision.o |
1751 | m_ncdf_siesta.o: atm_types.o atmparams.o atomlist.o class_Sparsity.o files.o |
1752 | -m_ncdf_siesta.o: kpoint_grid.o m_energies.o m_forces.o m_gamma.o m_kinetic.o |
1753 | -m_ncdf_siesta.o: m_ncdf_io.o m_ntm.o m_spin.o m_stress.o m_ts_electype.o |
1754 | -m_ncdf_siesta.o: m_ts_kpoints.o m_ts_options.o parallel.o precision.o radial.o |
1755 | -m_ncdf_siesta.o: siesta_geom.o siesta_options.o sparse_matrices.o timestamp.o |
1756 | +m_ncdf_siesta.o: kpoint_grid.o m_energies.o m_forces.o m_kinetic.o m_ncdf_io.o |
1757 | +m_ncdf_siesta.o: m_ntm.o m_spin.o m_stress.o m_ts_electype.o m_ts_kpoints.o |
1758 | +m_ncdf_siesta.o: m_ts_options.o parallel.o precision.o radial.o siesta_geom.o |
1759 | +m_ncdf_siesta.o: siesta_options.o sparse_matrices.o timestamp.o |
1760 | m_new_dm.o: alloc.o atomlist.o class_Data2D.o class_Fstack_Data1D.o |
1761 | m_new_dm.o: class_Fstack_Pair_Geometry_SpData2D.o class_Geometry.o |
1762 | m_new_dm.o: class_OrbitalDistribution.o class_Pair_Geometry_SpData2D.o |
1763 | @@ -481,7 +483,7 @@ |
1764 | m_ts_electrode.o: parallel.o precision.o units.o |
1765 | m_ts_electype.o: class_OrbitalDistribution.o class_SpData1D.o class_SpData2D.o |
1766 | m_ts_electype.o: class_Sparsity.o create_Sparsity_SC.o geom_helper.o |
1767 | -m_ts_electype.o: intrinsic_missing.o m_geom_box.o m_geom_plane.o |
1768 | +m_ts_electype.o: intrinsic_missing.o m_char.o m_geom_box.o m_geom_plane.o |
1769 | m_ts_electype.o: m_handle_sparse.o m_iodm.o m_os.o m_region.o m_ts_chem_pot.o |
1770 | m_ts_electype.o: m_ts_io.o m_ts_io_ctype.o m_ts_iodm.o parallel.o precision.o |
1771 | m_ts_electype.o: units.o |
1772 | @@ -674,14 +676,13 @@ |
1773 | post_scf_work.o: atomlist.o class_Fstack_Pair_Geometry_SpData2D.o |
1774 | post_scf_work.o: class_Geometry.o class_Pair_Geometry_SpData2D.o compute_dm.o |
1775 | post_scf_work.o: diagon.o final_H_f_stress.o kpoint_grid.o m_dminim.o |
1776 | -post_scf_work.o: m_energies.o m_eo.o m_gamma.o m_spin.o m_steps.o m_zminim.o |
1777 | -post_scf_work.o: mneighb.o parallel.o siesta_geom.o siesta_options.o |
1778 | -post_scf_work.o: sparse_matrices.o |
1779 | +post_scf_work.o: m_energies.o m_eo.o m_spin.o m_steps.o m_zminim.o mneighb.o |
1780 | +post_scf_work.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
1781 | print_spin.o: atomlist.o m_mpi_utils.o m_spin.o parallel.o precision.o |
1782 | print_spin.o: siesta_cml.o sparse_matrices.o |
1783 | printmatrix.o: alloc.o |
1784 | projected_DOS.o: alloc.o atomlist.o kpoint_grid.o kpoint_pdos.o local_sys.o |
1785 | -projected_DOS.o: m_eo.o m_gamma.o m_spin.o parallel.o precision.o siesta_geom.o |
1786 | +projected_DOS.o: m_eo.o m_spin.o parallel.o precision.o siesta_geom.o |
1787 | projected_DOS.o: siesta_options.o sparse_matrices.o units.o |
1788 | propor.o: local_sys.o precision.o |
1789 | proximity_check.o: chemical.o m_ts_global_vars.o mneighb.o parallel.o |
1790 | @@ -731,11 +732,10 @@ |
1791 | setup_H0.o: siesta_geom.o siesta_options.o sparse_matrices.o spinorbit.o |
1792 | setup_hamiltonian.o: alloc.o atmfuncs.o atomlist.o class_SpData1D.o |
1793 | setup_hamiltonian.o: class_SpData2D.o dhscf.o files.o ldau.o ldau_specs.o |
1794 | -setup_hamiltonian.o: local_sys.o m_dipol.o m_energies.o m_gamma.o m_hsx.o |
1795 | -setup_hamiltonian.o: m_mpi_utils.o m_ntm.o m_partial_charges.o m_rhog.o |
1796 | -setup_hamiltonian.o: m_spin.o m_steps.o m_stress.o metaforce.o |
1797 | -setup_hamiltonian.o: molecularmechanics.o parallel.o siesta_geom.o |
1798 | -setup_hamiltonian.o: siesta_options.o sparse_matrices.o |
1799 | +setup_hamiltonian.o: local_sys.o m_dipol.o m_energies.o m_hsx.o m_mpi_utils.o |
1800 | +setup_hamiltonian.o: m_ntm.o m_partial_charges.o m_rhog.o m_spin.o m_steps.o |
1801 | +setup_hamiltonian.o: m_stress.o metaforce.o molecularmechanics.o parallel.o |
1802 | +setup_hamiltonian.o: siesta_geom.o siesta_options.o sparse_matrices.o |
1803 | setup_ordern_indexes.o: alloc.o domain_decom.o parallel.o spatial.o |
1804 | shaper.o: atmfuncs.o mneighb.o precision.o |
1805 | show_distribution.o: atomlist.o local_sys.o parallel.o parallelsubs.o |
1806 | @@ -748,10 +748,10 @@ |
1807 | siesta2wannier90.o: siesta_options.o |
1808 | siesta_analysis.o: alloc.o atomlist.o bands.o basis_enthalpy.o dhscf.o files.o |
1809 | siesta_analysis.o: flook_siesta.o kpoint_grid.o ksv.o ksvinit.o local_DOS.o |
1810 | -siesta_analysis.o: m_dipol.o m_energies.o m_eo.o m_forces.o m_gamma.o |
1811 | -siesta_analysis.o: m_iodm_old.o m_mpi_utils.o m_ntm.o m_partial_charges.o |
1812 | -siesta_analysis.o: m_pexsi_dos.o m_pexsi_local_dos.o m_spin.o m_steps.o |
1813 | -siesta_analysis.o: parallel.o projected_DOS.o siesta2wannier90.o siesta_cml.o |
1814 | +siesta_analysis.o: m_dipol.o m_energies.o m_eo.o m_forces.o m_iodm_old.o |
1815 | +siesta_analysis.o: m_mpi_utils.o m_ntm.o m_partial_charges.o m_pexsi_dos.o |
1816 | +siesta_analysis.o: m_pexsi_local_dos.o m_spin.o m_steps.o parallel.o |
1817 | +siesta_analysis.o: projected_DOS.o siesta2wannier90.o siesta_cml.o |
1818 | siesta_analysis.o: siesta_geom.o siesta_options.o sparse_matrices.o units.o |
1819 | siesta_analysis.o: write_subs.o writewave.o zmatrix.o |
1820 | siesta_cmlsubs.o: files.o m_uuid.o parallel.o siesta_cml.o timestamp.o |
1821 | @@ -782,7 +782,7 @@ |
1822 | siesta_init.o: class_Fstack_Pair_Geometry_SpData2D.o densematrix.o |
1823 | siesta_init.o: diag_option.o files.o flook_siesta.o ioxv.o kpoint_grid.o |
1824 | siesta_init.o: kpoint_pdos.o ksvinit.o local_sys.o m_check_walltime.o m_cite.o |
1825 | -siesta_init.o: m_energies.o m_eo.o m_fixed.o m_forces.o m_gamma.o m_iostruct.o |
1826 | +siesta_init.o: m_energies.o m_eo.o m_fixed.o m_forces.o m_iostruct.o |
1827 | siesta_init.o: m_mpi_utils.o m_new_dm.o m_rmaxh.o m_spin.o m_steps.o |
1828 | siesta_init.o: m_supercell.o m_timer.o m_wallclock.o metaforce.o |
1829 | siesta_init.o: molecularmechanics.o object_debug.o parallel.o parallelsubs.o |
1830 | @@ -814,14 +814,14 @@ |
1831 | state_init.o: class_SpData2D.o class_Sparsity.o create_Sparsity_SC.o |
1832 | state_init.o: domain_decom.o files.o hsparse.o iodm_netcdf.o iodmhs_netcdf.o |
1833 | state_init.o: ioxv.o kpoint_grid.o ldau_specs.o local_sys.o m_energies.o m_eo.o |
1834 | -state_init.o: m_gamma.o m_mixing.o m_mixing_scf.o m_mpi_utils.o m_new_dm.o |
1835 | -state_init.o: m_os.o m_pivot_methods.o m_rmaxh.o m_sparse.o |
1836 | -state_init.o: m_sparsity_handling.o m_spin.o m_steps.o m_supercell.o |
1837 | -state_init.o: m_test_io.o m_ts_charge.o m_ts_electype.o m_ts_global_vars.o |
1838 | -state_init.o: m_ts_io.o m_ts_kpoints.o m_ts_options.o m_ts_sparse.o |
1839 | -state_init.o: m_ts_tri_init.o normalize_dm.o overlap.o parallel.o |
1840 | -state_init.o: proximity_check.o siesta_cml.o siesta_dicts.o siesta_geom.o |
1841 | -state_init.o: siesta_options.o sparse_matrices.o units.o write_subs.o zmatrix.o |
1842 | +state_init.o: m_mixing.o m_mixing_scf.o m_mpi_utils.o m_new_dm.o m_os.o |
1843 | +state_init.o: m_pivot_methods.o m_rmaxh.o m_sparse.o m_sparsity_handling.o |
1844 | +state_init.o: m_spin.o m_steps.o m_supercell.o m_test_io.o m_ts_charge.o |
1845 | +state_init.o: m_ts_electype.o m_ts_global_vars.o m_ts_io.o m_ts_kpoints.o |
1846 | +state_init.o: m_ts_options.o m_ts_sparse.o m_ts_tri_init.o normalize_dm.o |
1847 | +state_init.o: overlap.o parallel.o proximity_check.o siesta_cml.o |
1848 | +state_init.o: siesta_dicts.o siesta_geom.o siesta_options.o sparse_matrices.o |
1849 | +state_init.o: units.o write_subs.o zmatrix.o |
1850 | struct_init.o: alloc.o atmfuncs.o atomlist.o files.o ioxv.o m_exp_coord.o |
1851 | struct_init.o: m_iostruct.o m_mpi_utils.o m_steps.o parallel.o periodic_table.o |
1852 | struct_init.o: siesta_cml.o siesta_geom.o siesta_master.o siesta_options.o |
1853 | |
1854 | === modified file 'Util/COOP/dm_creator.F90' |
1855 | --- Util/COOP/dm_creator.F90 2016-01-25 16:00:16 +0000 |
1856 | +++ Util/COOP/dm_creator.F90 2018-06-26 07:59:48 +0000 |
1857 | @@ -178,7 +178,6 @@ |
1858 | ! Will pick up atoms, zval, and thus N_electrons |
1859 | |
1860 | call read_hs_file(trim(sflnm)//".HSX") |
1861 | - if (gamma_wfsx .neqv. gamma) STOP "Gamma mismatch" |
1862 | |
1863 | ztot = 0.0_dp |
1864 | do ia = 1, na_u |
1865 | @@ -326,7 +325,7 @@ |
1866 | |
1867 | ! * Curves |
1868 | |
1869 | - if (gamma) then |
1870 | + if (gamma_wfsx) then |
1871 | allocate(wf(1,1:no_u)) |
1872 | else |
1873 | allocate(wf(2,1:no_u)) |
1874 | @@ -378,7 +377,7 @@ |
1875 | !AG: Corrected: (qcos, qsin) = conjg(C_1)*(C_2) |
1876 | ! We might want to avoid recomputing this |
1877 | |
1878 | - if (gamma) then |
1879 | + if (gamma_wfsx) then |
1880 | qcos = wf(1,io1)*wf(1,io2) |
1881 | qsin = 0.0_dp |
1882 | else |
1883 | |
1884 | === modified file 'Util/COOP/fat.f90' |
1885 | --- Util/COOP/fat.f90 2016-05-05 13:00:27 +0000 |
1886 | +++ Util/COOP/fat.f90 2018-06-26 07:59:48 +0000 |
1887 | @@ -197,7 +197,6 @@ |
1888 | ! but the total charge is read as qtot. |
1889 | |
1890 | call read_hs_file(trim(sflnm)//".HSX") |
1891 | - if (gamma_wfsx .neqv. gamma) STOP "Gamma mismatch" |
1892 | |
1893 | if (energies_only) STOP |
1894 | |
1895 | @@ -340,7 +339,7 @@ |
1896 | nbands = max_band - min_band + 1 |
1897 | allocate(eig(nbands,nspin), fat(nbands,nspin)) |
1898 | |
1899 | - if (gamma) then |
1900 | + if (gamma_wfsx) then |
1901 | allocate(wf(1,1:no_u)) |
1902 | else |
1903 | allocate(wf(2,1:no_u)) |
1904 | @@ -469,7 +468,7 @@ |
1905 | !AG: Corrected: (qcos, qsin) = conjg(C_1)*(C_2) |
1906 | ! We might want to avoid recomputing this |
1907 | |
1908 | - if (gamma) then |
1909 | + if (gamma_wfsx) then |
1910 | qcos = wf(1,io1)*wf(1,io2) |
1911 | qsin = 0.0_dp |
1912 | else |
1913 | |
1914 | === modified file 'Util/COOP/io_hs.f90' |
1915 | --- Util/COOP/io_hs.f90 2016-01-25 16:00:16 +0000 |
1916 | +++ Util/COOP/io_hs.f90 2018-06-26 07:59:48 +0000 |
1917 | @@ -22,6 +22,7 @@ |
1918 | real(sp), allocatable :: buff3(:,:) |
1919 | |
1920 | integer numx, ind |
1921 | + logical lacking_indxuo |
1922 | |
1923 | write(6,"(1x,a)",advance='no') trim(fname) |
1924 | open(hs_u,file=trim(fname),status='old',form='unformatted') |
1925 | @@ -32,14 +33,20 @@ |
1926 | if (nnao /= nao) STOP "norbs inconsistency" |
1927 | no_u = nao |
1928 | |
1929 | - read(hs_u,iostat=iostat) gamma |
1930 | - if (iostat /= 0) STOP "gamma" |
1931 | - IF (DEBUG) PRINT *, "GAMMA=", gamma |
1932 | - if (.not. gamma) then |
1933 | + ! In modern versions of HSX files this should be always .false., that is, |
1934 | + ! files always include the indxuo array, even if it is trivial. |
1935 | + |
1936 | + read(hs_u,iostat=iostat) lacking_indxuo |
1937 | + if (iostat /= 0) STOP "lacking_indxuo" |
1938 | + IF (DEBUG) PRINT *, "LACKING_INDXUO=", lacking_indxuo |
1939 | + |
1940 | + if (.not. lacking_indxuo) then |
1941 | + ! read it |
1942 | allocate(indxuo(no_s)) |
1943 | read(hs_u) (indxuo(i),i=1,no_s) |
1944 | else |
1945 | allocate(indxuo(no_u)) |
1946 | + ! build it |
1947 | do i=1,no_u |
1948 | indxuo(i) = i |
1949 | enddo |
1950 | |
1951 | === modified file 'Util/COOP/main_vars.f90' |
1952 | --- Util/COOP/main_vars.f90 2016-05-05 13:00:27 +0000 |
1953 | +++ Util/COOP/main_vars.f90 2018-06-26 07:59:48 +0000 |
1954 | @@ -84,7 +84,6 @@ |
1955 | logical, allocatable :: ref_mask(:) |
1956 | |
1957 | ! |
1958 | - logical :: gamma |
1959 | real(dp) :: r_dummy(3), dummy_weight, ztot |
1960 | integer :: idummy |
1961 | ! |
1962 | |
1963 | === modified file 'Util/COOP/mprop.f90' |
1964 | --- Util/COOP/mprop.f90 2016-01-25 16:00:16 +0000 |
1965 | +++ Util/COOP/mprop.f90 2018-06-26 07:59:48 +0000 |
1966 | @@ -301,7 +301,6 @@ |
1967 | ! but the total charge is read as qtot. |
1968 | |
1969 | call read_hs_file(trim(sflnm)//".HSX") |
1970 | - if (gamma_wfsx .neqv. gamma) STOP "Gamma mismatch" |
1971 | |
1972 | ztot = 0.0_dp |
1973 | do ia = 1, na_u |
1974 | @@ -517,7 +516,7 @@ |
1975 | |
1976 | ! * Curves |
1977 | |
1978 | - if (gamma) then |
1979 | + if (gamma_wfsx) then |
1980 | allocate(wf(1,1:no_u)) |
1981 | else |
1982 | allocate(wf(2,1:no_u)) |
1983 | @@ -676,7 +675,7 @@ |
1984 | !AG: Corrected: (qcos, qsin) = conjg(C_1)*(C_2) |
1985 | ! We might want to avoid recomputing this |
1986 | |
1987 | - if (gamma) then |
1988 | + if (gamma_wfsx) then |
1989 | qcos = wf(1,io1)*wf(1,io2) |
1990 | qsin = 0.0_dp |
1991 | else |
1992 | |
1993 | === modified file 'Util/Denchar/Src/Makefile' |
1994 | --- Util/Denchar/Src/Makefile 2018-06-08 09:23:57 +0000 |
1995 | +++ Util/Denchar/Src/Makefile 2018-06-26 07:59:48 +0000 |
1996 | @@ -157,7 +157,7 @@ |
1997 | atomlwf.o: spatial.o |
1998 | automatic_cell.o: atm_types.o atmfuncs.o parallel.o precision.o units.o |
1999 | bands.o: alloc.o atmfuncs.o atomlist.o densematrix.o diag.o diag_option.o |
2000 | -bands.o: files.o get_kpoints_scale.o local_sys.o m_gamma.o m_spin.o parallel.o |
2001 | +bands.o: files.o get_kpoints_scale.o local_sys.o m_spin.o parallel.o |
2002 | bands.o: parallelsubs.o precision.o siesta_geom.o writewave.o |
2003 | basis_enthalpy.o: atmfuncs.o atomlist.o precision.o siesta_geom.o units.o |
2004 | basis_io.o: atm_types.o atmparams.o atom_options.o basis_types.o chemical.o |
2005 | @@ -214,10 +214,10 @@ |
2006 | coceri.o: files.o periodic_table.o precision.o units.o |
2007 | compute_dm.o: atomlist.o class_SpData1D.o compute_ebs_shift.o diagon.o |
2008 | compute_dm.o: iodmhs_netcdf.o kpoint_grid.o local_sys.o m_dminim.o m_energies.o |
2009 | -compute_dm.o: m_eo.o m_gamma.o m_hsx.o m_pexsi_driver.o m_rmaxh.o m_spin.o |
2010 | -compute_dm.o: m_steps.o m_transiesta.o m_ts_global_vars.o m_zminim.o |
2011 | -compute_dm.o: normalize_dm.o ordern.o parallel.o precision.o siesta_geom.o |
2012 | -compute_dm.o: siesta_options.o sparse_matrices.o units.o |
2013 | +compute_dm.o: m_eo.o m_hsx.o m_pexsi_driver.o m_rmaxh.o m_spin.o m_steps.o |
2014 | +compute_dm.o: m_transiesta.o m_ts_global_vars.o m_zminim.o normalize_dm.o |
2015 | +compute_dm.o: ordern.o parallel.o precision.o siesta_geom.o siesta_options.o |
2016 | +compute_dm.o: sparse_matrices.o units.o |
2017 | compute_ebs_shift.o: m_mpi_utils.o parallel.o precision.o |
2018 | compute_energies.o: atomlist.o class_SpData1D.o class_SpData2D.o dhscf.o |
2019 | compute_energies.o: files.o m_dipol.o m_energies.o m_mpi_utils.o m_ntm.o |
2020 | @@ -229,8 +229,8 @@ |
2021 | compute_pw_matrix.o: parallel.o precision.o siesta2wannier90.o |
2022 | compute_pw_matrix.o: sparse_matrices.o |
2023 | compute_rhog.o: alloc.o atomlist.o dhscf.o files.o m_dipol.o m_energies.o |
2024 | -compute_rhog.o: m_gamma.o m_ntm.o m_spin.o m_stress.o siesta_geom.o |
2025 | -compute_rhog.o: siesta_options.o sparse_matrices.o |
2026 | +compute_rhog.o: m_ntm.o m_spin.o m_stress.o siesta_geom.o siesta_options.o |
2027 | +compute_rhog.o: sparse_matrices.o |
2028 | conjgr.o: precision.o |
2029 | conjgr_old.o: precision.o |
2030 | coor.o: alloc.o local_sys.o parallel.o precision.o siesta_geom.o units.o |
2031 | @@ -257,13 +257,15 @@ |
2032 | dhscf.o: meshdscf.o meshsubs.o moremeshsubs.o parallel.o parsing.o precision.o |
2033 | dhscf.o: rhofft.o rhoofd.o siesta_options.o units.o vmat.o |
2034 | diag.o: alloc.o diag_option.o local_sys.o parallel.o precision.o |
2035 | -diag2g.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
2036 | +diag2g.o: fermid.o intrinsic_missing.o local_sys.o parallel.o parallelsubs.o |
2037 | +diag2g.o: precision.o |
2038 | diag2k.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
2039 | -diag3g.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
2040 | +diag3g.o: fermid.o intrinsic_missing.o local_sys.o parallel.o parallelsubs.o |
2041 | +diag3g.o: precision.o |
2042 | diag3k.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
2043 | diag_option.o: parallel.o precision.o |
2044 | -diagg.o: alloc.o fermid.o local_sys.o m_spin.o parallel.o parallelsubs.o |
2045 | -diagg.o: precision.o writewave.o |
2046 | +diagg.o: alloc.o fermid.o intrinsic_missing.o local_sys.o m_spin.o parallel.o |
2047 | +diagg.o: parallelsubs.o precision.o writewave.o |
2048 | diagk.o: compute_norm.o fermid.o local_sys.o m_spin.o parallel.o parallelsubs.o |
2049 | diagk.o: precision.o writewave.o |
2050 | diagk_file.o: fermid.o iowfs_netcdf.o local_sys.o parallel.o parallelsubs.o |
2051 | @@ -305,11 +307,11 @@ |
2052 | fft1d.o: local_sys.o parallel.o precision.o |
2053 | final_H_f_stress.o: alloc.o atomlist.o class_SpData2D.o compute_max_diff.o |
2054 | final_H_f_stress.o: dnaefs.o files.o grdsam.o kinefsm.o ldau.o ldau_specs.o |
2055 | -final_H_f_stress.o: local_sys.o m_dipol.o m_energies.o m_forces.o m_gamma.o |
2056 | -final_H_f_stress.o: m_hsx.o m_mpi_utils.o m_ncdf_siesta.o m_ntm.o m_spin.o |
2057 | -final_H_f_stress.o: m_stress.o m_ts_io.o m_ts_kpoints.o m_ts_options.o |
2058 | -final_H_f_stress.o: metaforce.o molecularmechanics.o naefs.o nlefsm.o overfsm.o |
2059 | -final_H_f_stress.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
2060 | +final_H_f_stress.o: local_sys.o m_dipol.o m_energies.o m_forces.o m_hsx.o |
2061 | +final_H_f_stress.o: m_mpi_utils.o m_ncdf_siesta.o m_ntm.o m_spin.o m_stress.o |
2062 | +final_H_f_stress.o: m_ts_io.o m_ts_kpoints.o m_ts_options.o metaforce.o |
2063 | +final_H_f_stress.o: molecularmechanics.o naefs.o nlefsm.o overfsm.o parallel.o |
2064 | +final_H_f_stress.o: siesta_geom.o siesta_options.o sparse_matrices.o |
2065 | final_H_f_stress.o: spinorbit.o units.o |
2066 | find_kgrid.o: alloc.o minvec.o parallel.o precision.o units.o |
2067 | fire_optim.o: alloc.o m_fire.o m_mpi_utils.o parallel.o precision.o |
2068 | @@ -378,8 +380,8 @@ |
2069 | ldau_specs.o: parallel.o precision.o pseudopotential.o radial.o units.o |
2070 | listsc.o: alloc.o |
2071 | local_DOS.o: atomlist.o dhscf.o diagon.o files.o kpoint_grid.o local_sys.o |
2072 | -local_DOS.o: m_energies.o m_eo.o m_forces.o m_gamma.o m_ntm.o m_spin.o |
2073 | -local_DOS.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
2074 | +local_DOS.o: m_energies.o m_eo.o m_forces.o m_ntm.o m_spin.o parallel.o |
2075 | +local_DOS.o: siesta_geom.o siesta_options.o sparse_matrices.o |
2076 | m_broyddj.o: alloc.o local_sys.o m_mpi_utils.o parallel.o precision.o |
2077 | m_broyddj_nocomm.o: alloc.o local_sys.o parallel.o precision.o |
2078 | m_broyden_mixing.o: alloc.o m_broyddj.o m_mpi_utils.o parallel.o precision.o |
2079 | @@ -448,10 +450,10 @@ |
2080 | m_ncdf_io.o: class_OrbitalDistribution.o class_SpData1D.o class_SpData2D.o |
2081 | m_ncdf_io.o: class_Sparsity.o m_io_s.o parallel.o precision.o |
2082 | m_ncdf_siesta.o: atm_types.o atmparams.o atomlist.o class_Sparsity.o files.o |
2083 | -m_ncdf_siesta.o: kpoint_grid.o m_energies.o m_forces.o m_gamma.o m_kinetic.o |
2084 | -m_ncdf_siesta.o: m_ncdf_io.o m_ntm.o m_spin.o m_stress.o m_ts_electype.o |
2085 | -m_ncdf_siesta.o: m_ts_kpoints.o m_ts_options.o parallel.o precision.o radial.o |
2086 | -m_ncdf_siesta.o: siesta_geom.o siesta_options.o sparse_matrices.o timestamp.o |
2087 | +m_ncdf_siesta.o: kpoint_grid.o m_energies.o m_forces.o m_kinetic.o m_ncdf_io.o |
2088 | +m_ncdf_siesta.o: m_ntm.o m_spin.o m_stress.o m_ts_electype.o m_ts_kpoints.o |
2089 | +m_ncdf_siesta.o: m_ts_options.o parallel.o precision.o radial.o siesta_geom.o |
2090 | +m_ncdf_siesta.o: siesta_options.o sparse_matrices.o timestamp.o |
2091 | m_new_dm.o: alloc.o atomlist.o class_Data2D.o class_Fstack_Data1D.o |
2092 | m_new_dm.o: class_Fstack_Pair_Geometry_SpData2D.o class_Geometry.o |
2093 | m_new_dm.o: class_OrbitalDistribution.o class_Pair_Geometry_SpData2D.o |
2094 | @@ -555,7 +557,7 @@ |
2095 | m_ts_electrode.o: parallel.o precision.o units.o |
2096 | m_ts_electype.o: class_OrbitalDistribution.o class_SpData1D.o class_SpData2D.o |
2097 | m_ts_electype.o: class_Sparsity.o create_Sparsity_SC.o geom_helper.o |
2098 | -m_ts_electype.o: intrinsic_missing.o m_geom_box.o m_geom_plane.o |
2099 | +m_ts_electype.o: intrinsic_missing.o m_char.o m_geom_box.o m_geom_plane.o |
2100 | m_ts_electype.o: m_handle_sparse.o m_iodm.o m_os.o m_region.o m_ts_chem_pot.o |
2101 | m_ts_electype.o: m_ts_io.o m_ts_io_ctype.o m_ts_iodm.o parallel.o precision.o |
2102 | m_ts_electype.o: units.o |
2103 | @@ -748,14 +750,13 @@ |
2104 | post_scf_work.o: atomlist.o class_Fstack_Pair_Geometry_SpData2D.o |
2105 | post_scf_work.o: class_Geometry.o class_Pair_Geometry_SpData2D.o compute_dm.o |
2106 | post_scf_work.o: diagon.o final_H_f_stress.o kpoint_grid.o m_dminim.o |
2107 | -post_scf_work.o: m_energies.o m_eo.o m_gamma.o m_spin.o m_steps.o m_zminim.o |
2108 | -post_scf_work.o: mneighb.o parallel.o siesta_geom.o siesta_options.o |
2109 | -post_scf_work.o: sparse_matrices.o |
2110 | +post_scf_work.o: m_energies.o m_eo.o m_spin.o m_steps.o m_zminim.o mneighb.o |
2111 | +post_scf_work.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
2112 | print_spin.o: atomlist.o m_mpi_utils.o m_spin.o parallel.o precision.o |
2113 | print_spin.o: siesta_cml.o sparse_matrices.o |
2114 | printmatrix.o: alloc.o |
2115 | projected_DOS.o: alloc.o atomlist.o kpoint_grid.o kpoint_pdos.o local_sys.o |
2116 | -projected_DOS.o: m_eo.o m_gamma.o m_spin.o parallel.o precision.o siesta_geom.o |
2117 | +projected_DOS.o: m_eo.o m_spin.o parallel.o precision.o siesta_geom.o |
2118 | projected_DOS.o: siesta_options.o sparse_matrices.o units.o |
2119 | propor.o: local_sys.o precision.o |
2120 | proximity_check.o: chemical.o m_ts_global_vars.o mneighb.o parallel.o |
2121 | @@ -805,11 +806,10 @@ |
2122 | setup_H0.o: siesta_geom.o siesta_options.o sparse_matrices.o spinorbit.o |
2123 | setup_hamiltonian.o: alloc.o atmfuncs.o atomlist.o class_SpData1D.o |
2124 | setup_hamiltonian.o: class_SpData2D.o dhscf.o files.o ldau.o ldau_specs.o |
2125 | -setup_hamiltonian.o: local_sys.o m_dipol.o m_energies.o m_gamma.o m_hsx.o |
2126 | -setup_hamiltonian.o: m_mpi_utils.o m_ntm.o m_partial_charges.o m_rhog.o |
2127 | -setup_hamiltonian.o: m_spin.o m_steps.o m_stress.o metaforce.o |
2128 | -setup_hamiltonian.o: molecularmechanics.o parallel.o siesta_geom.o |
2129 | -setup_hamiltonian.o: siesta_options.o sparse_matrices.o |
2130 | +setup_hamiltonian.o: local_sys.o m_dipol.o m_energies.o m_hsx.o m_mpi_utils.o |
2131 | +setup_hamiltonian.o: m_ntm.o m_partial_charges.o m_rhog.o m_spin.o m_steps.o |
2132 | +setup_hamiltonian.o: m_stress.o metaforce.o molecularmechanics.o parallel.o |
2133 | +setup_hamiltonian.o: siesta_geom.o siesta_options.o sparse_matrices.o |
2134 | setup_ordern_indexes.o: alloc.o domain_decom.o parallel.o spatial.o |
2135 | shaper.o: atmfuncs.o mneighb.o precision.o |
2136 | show_distribution.o: atomlist.o local_sys.o parallel.o parallelsubs.o |
2137 | @@ -822,10 +822,10 @@ |
2138 | siesta2wannier90.o: siesta_options.o |
2139 | siesta_analysis.o: alloc.o atomlist.o bands.o basis_enthalpy.o dhscf.o files.o |
2140 | siesta_analysis.o: flook_siesta.o kpoint_grid.o ksv.o ksvinit.o local_DOS.o |
2141 | -siesta_analysis.o: m_dipol.o m_energies.o m_eo.o m_forces.o m_gamma.o |
2142 | -siesta_analysis.o: m_iodm_old.o m_mpi_utils.o m_ntm.o m_partial_charges.o |
2143 | -siesta_analysis.o: m_pexsi_dos.o m_pexsi_local_dos.o m_spin.o m_steps.o |
2144 | -siesta_analysis.o: parallel.o projected_DOS.o siesta2wannier90.o siesta_cml.o |
2145 | +siesta_analysis.o: m_dipol.o m_energies.o m_eo.o m_forces.o m_iodm_old.o |
2146 | +siesta_analysis.o: m_mpi_utils.o m_ntm.o m_partial_charges.o m_pexsi_dos.o |
2147 | +siesta_analysis.o: m_pexsi_local_dos.o m_spin.o m_steps.o parallel.o |
2148 | +siesta_analysis.o: projected_DOS.o siesta2wannier90.o siesta_cml.o |
2149 | siesta_analysis.o: siesta_geom.o siesta_options.o sparse_matrices.o units.o |
2150 | siesta_analysis.o: write_subs.o writewave.o zmatrix.o |
2151 | siesta_cmlsubs.o: files.o m_uuid.o parallel.o siesta_cml.o timestamp.o |
2152 | @@ -856,7 +856,7 @@ |
2153 | siesta_init.o: class_Fstack_Pair_Geometry_SpData2D.o densematrix.o |
2154 | siesta_init.o: diag_option.o files.o flook_siesta.o ioxv.o kpoint_grid.o |
2155 | siesta_init.o: kpoint_pdos.o ksvinit.o local_sys.o m_check_walltime.o m_cite.o |
2156 | -siesta_init.o: m_energies.o m_eo.o m_fixed.o m_forces.o m_gamma.o m_iostruct.o |
2157 | +siesta_init.o: m_energies.o m_eo.o m_fixed.o m_forces.o m_iostruct.o |
2158 | siesta_init.o: m_mpi_utils.o m_new_dm.o m_rmaxh.o m_spin.o m_steps.o |
2159 | siesta_init.o: m_supercell.o m_timer.o m_wallclock.o metaforce.o |
2160 | siesta_init.o: molecularmechanics.o object_debug.o parallel.o parallelsubs.o |
2161 | @@ -888,14 +888,14 @@ |
2162 | state_init.o: class_SpData2D.o class_Sparsity.o create_Sparsity_SC.o |
2163 | state_init.o: domain_decom.o files.o hsparse.o iodm_netcdf.o iodmhs_netcdf.o |
2164 | state_init.o: ioxv.o kpoint_grid.o ldau_specs.o local_sys.o m_energies.o m_eo.o |
2165 | -state_init.o: m_gamma.o m_mixing.o m_mixing_scf.o m_mpi_utils.o m_new_dm.o |
2166 | -state_init.o: m_os.o m_pivot_methods.o m_rmaxh.o m_sparse.o |
2167 | -state_init.o: m_sparsity_handling.o m_spin.o m_steps.o m_supercell.o |
2168 | -state_init.o: m_test_io.o m_ts_charge.o m_ts_electype.o m_ts_global_vars.o |
2169 | -state_init.o: m_ts_io.o m_ts_kpoints.o m_ts_options.o m_ts_sparse.o |
2170 | -state_init.o: m_ts_tri_init.o normalize_dm.o overlap.o parallel.o |
2171 | -state_init.o: proximity_check.o siesta_cml.o siesta_dicts.o siesta_geom.o |
2172 | -state_init.o: siesta_options.o sparse_matrices.o units.o write_subs.o zmatrix.o |
2173 | +state_init.o: m_mixing.o m_mixing_scf.o m_mpi_utils.o m_new_dm.o m_os.o |
2174 | +state_init.o: m_pivot_methods.o m_rmaxh.o m_sparse.o m_sparsity_handling.o |
2175 | +state_init.o: m_spin.o m_steps.o m_supercell.o m_test_io.o m_ts_charge.o |
2176 | +state_init.o: m_ts_electype.o m_ts_global_vars.o m_ts_io.o m_ts_kpoints.o |
2177 | +state_init.o: m_ts_options.o m_ts_sparse.o m_ts_tri_init.o normalize_dm.o |
2178 | +state_init.o: overlap.o parallel.o proximity_check.o siesta_cml.o |
2179 | +state_init.o: siesta_dicts.o siesta_geom.o siesta_options.o sparse_matrices.o |
2180 | +state_init.o: units.o write_subs.o zmatrix.o |
2181 | struct_init.o: alloc.o atmfuncs.o atomlist.o files.o ioxv.o m_exp_coord.o |
2182 | struct_init.o: m_iostruct.o m_mpi_utils.o m_steps.o parallel.o periodic_table.o |
2183 | struct_init.o: siesta_cml.o siesta_geom.o siesta_master.o siesta_options.o |
2184 | |
2185 | === modified file 'Util/Gen-basis/Makefile' |
2186 | --- Util/Gen-basis/Makefile 2018-06-08 09:23:57 +0000 |
2187 | +++ Util/Gen-basis/Makefile 2018-06-26 07:59:48 +0000 |
2188 | @@ -152,7 +152,7 @@ |
2189 | atomlwf.o: spatial.o |
2190 | automatic_cell.o: atm_types.o atmfuncs.o parallel.o precision.o units.o |
2191 | bands.o: alloc.o atmfuncs.o atomlist.o densematrix.o diag.o diag_option.o |
2192 | -bands.o: files.o get_kpoints_scale.o local_sys.o m_gamma.o m_spin.o parallel.o |
2193 | +bands.o: files.o get_kpoints_scale.o local_sys.o m_spin.o parallel.o |
2194 | bands.o: parallelsubs.o precision.o siesta_geom.o writewave.o |
2195 | basis_enthalpy.o: atmfuncs.o atomlist.o precision.o siesta_geom.o units.o |
2196 | basis_io.o: atm_types.o atmparams.o atom_options.o basis_types.o chemical.o |
2197 | @@ -204,10 +204,10 @@ |
2198 | coceri.o: files.o periodic_table.o precision.o units.o |
2199 | compute_dm.o: atomlist.o class_SpData1D.o compute_ebs_shift.o diagon.o |
2200 | compute_dm.o: iodmhs_netcdf.o kpoint_grid.o local_sys.o m_dminim.o m_energies.o |
2201 | -compute_dm.o: m_eo.o m_gamma.o m_hsx.o m_pexsi_driver.o m_rmaxh.o m_spin.o |
2202 | -compute_dm.o: m_steps.o m_transiesta.o m_ts_global_vars.o m_zminim.o |
2203 | -compute_dm.o: normalize_dm.o ordern.o parallel.o precision.o siesta_geom.o |
2204 | -compute_dm.o: siesta_options.o sparse_matrices.o units.o |
2205 | +compute_dm.o: m_eo.o m_hsx.o m_pexsi_driver.o m_rmaxh.o m_spin.o m_steps.o |
2206 | +compute_dm.o: m_transiesta.o m_ts_global_vars.o m_zminim.o normalize_dm.o |
2207 | +compute_dm.o: ordern.o parallel.o precision.o siesta_geom.o siesta_options.o |
2208 | +compute_dm.o: sparse_matrices.o units.o |
2209 | compute_ebs_shift.o: m_mpi_utils.o parallel.o precision.o |
2210 | compute_energies.o: atomlist.o class_SpData1D.o class_SpData2D.o dhscf.o |
2211 | compute_energies.o: files.o m_dipol.o m_energies.o m_mpi_utils.o m_ntm.o |
2212 | @@ -219,8 +219,8 @@ |
2213 | compute_pw_matrix.o: parallel.o precision.o siesta2wannier90.o |
2214 | compute_pw_matrix.o: sparse_matrices.o |
2215 | compute_rhog.o: alloc.o atomlist.o dhscf.o files.o m_dipol.o m_energies.o |
2216 | -compute_rhog.o: m_gamma.o m_ntm.o m_spin.o m_stress.o siesta_geom.o |
2217 | -compute_rhog.o: siesta_options.o sparse_matrices.o |
2218 | +compute_rhog.o: m_ntm.o m_spin.o m_stress.o siesta_geom.o siesta_options.o |
2219 | +compute_rhog.o: sparse_matrices.o |
2220 | conjgr.o: precision.o |
2221 | conjgr_old.o: precision.o |
2222 | coor.o: alloc.o local_sys.o parallel.o precision.o siesta_geom.o units.o |
2223 | @@ -247,13 +247,15 @@ |
2224 | dhscf.o: meshdscf.o meshsubs.o moremeshsubs.o parallel.o parsing.o precision.o |
2225 | dhscf.o: rhofft.o rhoofd.o siesta_options.o units.o vmat.o |
2226 | diag.o: alloc.o diag_option.o local_sys.o parallel.o precision.o |
2227 | -diag2g.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
2228 | +diag2g.o: fermid.o intrinsic_missing.o local_sys.o parallel.o parallelsubs.o |
2229 | +diag2g.o: precision.o |
2230 | diag2k.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
2231 | -diag3g.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
2232 | +diag3g.o: fermid.o intrinsic_missing.o local_sys.o parallel.o parallelsubs.o |
2233 | +diag3g.o: precision.o |
2234 | diag3k.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
2235 | diag_option.o: parallel.o precision.o |
2236 | -diagg.o: alloc.o fermid.o local_sys.o m_spin.o parallel.o parallelsubs.o |
2237 | -diagg.o: precision.o writewave.o |
2238 | +diagg.o: alloc.o fermid.o intrinsic_missing.o local_sys.o m_spin.o parallel.o |
2239 | +diagg.o: parallelsubs.o precision.o writewave.o |
2240 | diagk.o: compute_norm.o fermid.o local_sys.o m_spin.o parallel.o parallelsubs.o |
2241 | diagk.o: precision.o writewave.o |
2242 | diagk_file.o: fermid.o iowfs_netcdf.o local_sys.o parallel.o parallelsubs.o |
2243 | @@ -295,11 +297,11 @@ |
2244 | fft1d.o: local_sys.o parallel.o precision.o |
2245 | final_H_f_stress.o: alloc.o atomlist.o class_SpData2D.o compute_max_diff.o |
2246 | final_H_f_stress.o: dnaefs.o files.o grdsam.o kinefsm.o ldau.o ldau_specs.o |
2247 | -final_H_f_stress.o: local_sys.o m_dipol.o m_energies.o m_forces.o m_gamma.o |
2248 | -final_H_f_stress.o: m_hsx.o m_mpi_utils.o m_ncdf_siesta.o m_ntm.o m_spin.o |
2249 | -final_H_f_stress.o: m_stress.o m_ts_io.o m_ts_kpoints.o m_ts_options.o |
2250 | -final_H_f_stress.o: metaforce.o molecularmechanics.o naefs.o nlefsm.o overfsm.o |
2251 | -final_H_f_stress.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
2252 | +final_H_f_stress.o: local_sys.o m_dipol.o m_energies.o m_forces.o m_hsx.o |
2253 | +final_H_f_stress.o: m_mpi_utils.o m_ncdf_siesta.o m_ntm.o m_spin.o m_stress.o |
2254 | +final_H_f_stress.o: m_ts_io.o m_ts_kpoints.o m_ts_options.o metaforce.o |
2255 | +final_H_f_stress.o: molecularmechanics.o naefs.o nlefsm.o overfsm.o parallel.o |
2256 | +final_H_f_stress.o: siesta_geom.o siesta_options.o sparse_matrices.o |
2257 | final_H_f_stress.o: spinorbit.o units.o |
2258 | find_kgrid.o: alloc.o minvec.o parallel.o precision.o units.o |
2259 | fire_optim.o: alloc.o m_fire.o m_mpi_utils.o parallel.o precision.o |
2260 | @@ -368,8 +370,8 @@ |
2261 | ldau_specs.o: parallel.o precision.o pseudopotential.o radial.o units.o |
2262 | listsc.o: alloc.o |
2263 | local_DOS.o: atomlist.o dhscf.o diagon.o files.o kpoint_grid.o local_sys.o |
2264 | -local_DOS.o: m_energies.o m_eo.o m_forces.o m_gamma.o m_ntm.o m_spin.o |
2265 | -local_DOS.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
2266 | +local_DOS.o: m_energies.o m_eo.o m_forces.o m_ntm.o m_spin.o parallel.o |
2267 | +local_DOS.o: siesta_geom.o siesta_options.o sparse_matrices.o |
2268 | m_broyddj.o: alloc.o local_sys.o m_mpi_utils.o parallel.o precision.o |
2269 | m_broyddj_nocomm.o: alloc.o local_sys.o parallel.o precision.o |
2270 | m_broyden_mixing.o: alloc.o m_broyddj.o m_mpi_utils.o parallel.o precision.o |
2271 | @@ -438,10 +440,10 @@ |
2272 | m_ncdf_io.o: class_OrbitalDistribution.o class_SpData1D.o class_SpData2D.o |
2273 | m_ncdf_io.o: class_Sparsity.o m_io_s.o parallel.o precision.o |
2274 | m_ncdf_siesta.o: atm_types.o atmparams.o atomlist.o class_Sparsity.o files.o |
2275 | -m_ncdf_siesta.o: kpoint_grid.o m_energies.o m_forces.o m_gamma.o m_kinetic.o |
2276 | -m_ncdf_siesta.o: m_ncdf_io.o m_ntm.o m_spin.o m_stress.o m_ts_electype.o |
2277 | -m_ncdf_siesta.o: m_ts_kpoints.o m_ts_options.o parallel.o precision.o radial.o |
2278 | -m_ncdf_siesta.o: siesta_geom.o siesta_options.o sparse_matrices.o timestamp.o |
2279 | +m_ncdf_siesta.o: kpoint_grid.o m_energies.o m_forces.o m_kinetic.o m_ncdf_io.o |
2280 | +m_ncdf_siesta.o: m_ntm.o m_spin.o m_stress.o m_ts_electype.o m_ts_kpoints.o |
2281 | +m_ncdf_siesta.o: m_ts_options.o parallel.o precision.o radial.o siesta_geom.o |
2282 | +m_ncdf_siesta.o: siesta_options.o sparse_matrices.o timestamp.o |
2283 | m_new_dm.o: alloc.o atomlist.o class_Data2D.o class_Fstack_Data1D.o |
2284 | m_new_dm.o: class_Fstack_Pair_Geometry_SpData2D.o class_Geometry.o |
2285 | m_new_dm.o: class_OrbitalDistribution.o class_Pair_Geometry_SpData2D.o |
2286 | @@ -545,7 +547,7 @@ |
2287 | m_ts_electrode.o: parallel.o precision.o units.o |
2288 | m_ts_electype.o: class_OrbitalDistribution.o class_SpData1D.o class_SpData2D.o |
2289 | m_ts_electype.o: class_Sparsity.o create_Sparsity_SC.o geom_helper.o |
2290 | -m_ts_electype.o: intrinsic_missing.o m_geom_box.o m_geom_plane.o |
2291 | +m_ts_electype.o: intrinsic_missing.o m_char.o m_geom_box.o m_geom_plane.o |
2292 | m_ts_electype.o: m_handle_sparse.o m_iodm.o m_os.o m_region.o m_ts_chem_pot.o |
2293 | m_ts_electype.o: m_ts_io.o m_ts_io_ctype.o m_ts_iodm.o parallel.o precision.o |
2294 | m_ts_electype.o: units.o |
2295 | @@ -738,14 +740,13 @@ |
2296 | post_scf_work.o: atomlist.o class_Fstack_Pair_Geometry_SpData2D.o |
2297 | post_scf_work.o: class_Geometry.o class_Pair_Geometry_SpData2D.o compute_dm.o |
2298 | post_scf_work.o: diagon.o final_H_f_stress.o kpoint_grid.o m_dminim.o |
2299 | -post_scf_work.o: m_energies.o m_eo.o m_gamma.o m_spin.o m_steps.o m_zminim.o |
2300 | -post_scf_work.o: mneighb.o parallel.o siesta_geom.o siesta_options.o |
2301 | -post_scf_work.o: sparse_matrices.o |
2302 | +post_scf_work.o: m_energies.o m_eo.o m_spin.o m_steps.o m_zminim.o mneighb.o |
2303 | +post_scf_work.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
2304 | print_spin.o: atomlist.o m_mpi_utils.o m_spin.o parallel.o precision.o |
2305 | print_spin.o: siesta_cml.o sparse_matrices.o |
2306 | printmatrix.o: alloc.o |
2307 | projected_DOS.o: alloc.o atomlist.o kpoint_grid.o kpoint_pdos.o local_sys.o |
2308 | -projected_DOS.o: m_eo.o m_gamma.o m_spin.o parallel.o precision.o siesta_geom.o |
2309 | +projected_DOS.o: m_eo.o m_spin.o parallel.o precision.o siesta_geom.o |
2310 | projected_DOS.o: siesta_options.o sparse_matrices.o units.o |
2311 | propor.o: local_sys.o precision.o |
2312 | proximity_check.o: chemical.o m_ts_global_vars.o mneighb.o parallel.o |
2313 | @@ -795,11 +796,10 @@ |
2314 | setup_H0.o: siesta_geom.o siesta_options.o sparse_matrices.o spinorbit.o |
2315 | setup_hamiltonian.o: alloc.o atmfuncs.o atomlist.o class_SpData1D.o |
2316 | setup_hamiltonian.o: class_SpData2D.o dhscf.o files.o ldau.o ldau_specs.o |
2317 | -setup_hamiltonian.o: local_sys.o m_dipol.o m_energies.o m_gamma.o m_hsx.o |
2318 | -setup_hamiltonian.o: m_mpi_utils.o m_ntm.o m_partial_charges.o m_rhog.o |
2319 | -setup_hamiltonian.o: m_spin.o m_steps.o m_stress.o metaforce.o |
2320 | -setup_hamiltonian.o: molecularmechanics.o parallel.o siesta_geom.o |
2321 | -setup_hamiltonian.o: siesta_options.o sparse_matrices.o |
2322 | +setup_hamiltonian.o: local_sys.o m_dipol.o m_energies.o m_hsx.o m_mpi_utils.o |
2323 | +setup_hamiltonian.o: m_ntm.o m_partial_charges.o m_rhog.o m_spin.o m_steps.o |
2324 | +setup_hamiltonian.o: m_stress.o metaforce.o molecularmechanics.o parallel.o |
2325 | +setup_hamiltonian.o: siesta_geom.o siesta_options.o sparse_matrices.o |
2326 | setup_ordern_indexes.o: alloc.o domain_decom.o parallel.o spatial.o |
2327 | shaper.o: atmfuncs.o mneighb.o precision.o |
2328 | show_distribution.o: atomlist.o local_sys.o parallel.o parallelsubs.o |
2329 | @@ -812,10 +812,10 @@ |
2330 | siesta2wannier90.o: siesta_options.o |
2331 | siesta_analysis.o: alloc.o atomlist.o bands.o basis_enthalpy.o dhscf.o files.o |
2332 | siesta_analysis.o: flook_siesta.o kpoint_grid.o ksv.o ksvinit.o local_DOS.o |
2333 | -siesta_analysis.o: m_dipol.o m_energies.o m_eo.o m_forces.o m_gamma.o |
2334 | -siesta_analysis.o: m_iodm_old.o m_mpi_utils.o m_ntm.o m_partial_charges.o |
2335 | -siesta_analysis.o: m_pexsi_dos.o m_pexsi_local_dos.o m_spin.o m_steps.o |
2336 | -siesta_analysis.o: parallel.o projected_DOS.o siesta2wannier90.o siesta_cml.o |
2337 | +siesta_analysis.o: m_dipol.o m_energies.o m_eo.o m_forces.o m_iodm_old.o |
2338 | +siesta_analysis.o: m_mpi_utils.o m_ntm.o m_partial_charges.o m_pexsi_dos.o |
2339 | +siesta_analysis.o: m_pexsi_local_dos.o m_spin.o m_steps.o parallel.o |
2340 | +siesta_analysis.o: projected_DOS.o siesta2wannier90.o siesta_cml.o |
2341 | siesta_analysis.o: siesta_geom.o siesta_options.o sparse_matrices.o units.o |
2342 | siesta_analysis.o: write_subs.o writewave.o zmatrix.o |
2343 | siesta_cmlsubs.o: files.o m_uuid.o parallel.o siesta_cml.o timestamp.o |
2344 | @@ -846,7 +846,7 @@ |
2345 | siesta_init.o: class_Fstack_Pair_Geometry_SpData2D.o densematrix.o |
2346 | siesta_init.o: diag_option.o files.o flook_siesta.o ioxv.o kpoint_grid.o |
2347 | siesta_init.o: kpoint_pdos.o ksvinit.o local_sys.o m_check_walltime.o m_cite.o |
2348 | -siesta_init.o: m_energies.o m_eo.o m_fixed.o m_forces.o m_gamma.o m_iostruct.o |
2349 | +siesta_init.o: m_energies.o m_eo.o m_fixed.o m_forces.o m_iostruct.o |
2350 | siesta_init.o: m_mpi_utils.o m_new_dm.o m_rmaxh.o m_spin.o m_steps.o |
2351 | siesta_init.o: m_supercell.o m_timer.o m_wallclock.o metaforce.o |
2352 | siesta_init.o: molecularmechanics.o object_debug.o parallel.o parallelsubs.o |
2353 | @@ -878,14 +878,14 @@ |
2354 | state_init.o: class_SpData2D.o class_Sparsity.o create_Sparsity_SC.o |
2355 | state_init.o: domain_decom.o files.o hsparse.o iodm_netcdf.o iodmhs_netcdf.o |
2356 | state_init.o: ioxv.o kpoint_grid.o ldau_specs.o local_sys.o m_energies.o m_eo.o |
2357 | -state_init.o: m_gamma.o m_mixing.o m_mixing_scf.o m_mpi_utils.o m_new_dm.o |
2358 | -state_init.o: m_os.o m_pivot_methods.o m_rmaxh.o m_sparse.o |
2359 | -state_init.o: m_sparsity_handling.o m_spin.o m_steps.o m_supercell.o |
2360 | -state_init.o: m_test_io.o m_ts_charge.o m_ts_electype.o m_ts_global_vars.o |
2361 | -state_init.o: m_ts_io.o m_ts_kpoints.o m_ts_options.o m_ts_sparse.o |
2362 | -state_init.o: m_ts_tri_init.o normalize_dm.o overlap.o parallel.o |
2363 | -state_init.o: proximity_check.o siesta_cml.o siesta_dicts.o siesta_geom.o |
2364 | -state_init.o: siesta_options.o sparse_matrices.o units.o write_subs.o zmatrix.o |
2365 | +state_init.o: m_mixing.o m_mixing_scf.o m_mpi_utils.o m_new_dm.o m_os.o |
2366 | +state_init.o: m_pivot_methods.o m_rmaxh.o m_sparse.o m_sparsity_handling.o |
2367 | +state_init.o: m_spin.o m_steps.o m_supercell.o m_test_io.o m_ts_charge.o |
2368 | +state_init.o: m_ts_electype.o m_ts_global_vars.o m_ts_io.o m_ts_kpoints.o |
2369 | +state_init.o: m_ts_options.o m_ts_sparse.o m_ts_tri_init.o normalize_dm.o |
2370 | +state_init.o: overlap.o parallel.o proximity_check.o siesta_cml.o |
2371 | +state_init.o: siesta_dicts.o siesta_geom.o siesta_options.o sparse_matrices.o |
2372 | +state_init.o: units.o write_subs.o zmatrix.o |
2373 | struct_init.o: alloc.o atmfuncs.o atomlist.o files.o ioxv.o m_exp_coord.o |
2374 | struct_init.o: m_iostruct.o m_mpi_utils.o m_steps.o parallel.o periodic_table.o |
2375 | struct_init.o: siesta_cml.o siesta_geom.o siesta_master.o siesta_options.o |
2376 | |
2377 | === modified file 'Util/Grimme/Makefile' |
2378 | --- Util/Grimme/Makefile 2018-06-08 09:23:57 +0000 |
2379 | +++ Util/Grimme/Makefile 2018-06-26 07:59:48 +0000 |
2380 | @@ -90,7 +90,7 @@ |
2381 | atomlwf.o: spatial.o |
2382 | automatic_cell.o: atm_types.o atmfuncs.o parallel.o precision.o units.o |
2383 | bands.o: alloc.o atmfuncs.o atomlist.o densematrix.o diag.o diag_option.o |
2384 | -bands.o: files.o get_kpoints_scale.o local_sys.o m_gamma.o m_spin.o parallel.o |
2385 | +bands.o: files.o get_kpoints_scale.o local_sys.o m_spin.o parallel.o |
2386 | bands.o: parallelsubs.o precision.o siesta_geom.o writewave.o |
2387 | basis_enthalpy.o: atmfuncs.o atomlist.o precision.o siesta_geom.o units.o |
2388 | basis_io.o: atm_types.o atmparams.o atom_options.o basis_types.o chemical.o |
2389 | @@ -142,10 +142,10 @@ |
2390 | coceri.o: files.o periodic_table.o precision.o units.o |
2391 | compute_dm.o: atomlist.o class_SpData1D.o compute_ebs_shift.o diagon.o |
2392 | compute_dm.o: iodmhs_netcdf.o kpoint_grid.o local_sys.o m_dminim.o m_energies.o |
2393 | -compute_dm.o: m_eo.o m_gamma.o m_hsx.o m_pexsi_driver.o m_rmaxh.o m_spin.o |
2394 | -compute_dm.o: m_steps.o m_transiesta.o m_ts_global_vars.o m_zminim.o |
2395 | -compute_dm.o: normalize_dm.o ordern.o parallel.o precision.o siesta_geom.o |
2396 | -compute_dm.o: siesta_options.o sparse_matrices.o units.o |
2397 | +compute_dm.o: m_eo.o m_hsx.o m_pexsi_driver.o m_rmaxh.o m_spin.o m_steps.o |
2398 | +compute_dm.o: m_transiesta.o m_ts_global_vars.o m_zminim.o normalize_dm.o |
2399 | +compute_dm.o: ordern.o parallel.o precision.o siesta_geom.o siesta_options.o |
2400 | +compute_dm.o: sparse_matrices.o units.o |
2401 | compute_ebs_shift.o: m_mpi_utils.o parallel.o precision.o |
2402 | compute_energies.o: atomlist.o class_SpData1D.o class_SpData2D.o dhscf.o |
2403 | compute_energies.o: files.o m_dipol.o m_energies.o m_mpi_utils.o m_ntm.o |
2404 | @@ -157,8 +157,8 @@ |
2405 | compute_pw_matrix.o: parallel.o precision.o siesta2wannier90.o |
2406 | compute_pw_matrix.o: sparse_matrices.o |
2407 | compute_rhog.o: alloc.o atomlist.o dhscf.o files.o m_dipol.o m_energies.o |
2408 | -compute_rhog.o: m_gamma.o m_ntm.o m_spin.o m_stress.o siesta_geom.o |
2409 | -compute_rhog.o: siesta_options.o sparse_matrices.o |
2410 | +compute_rhog.o: m_ntm.o m_spin.o m_stress.o siesta_geom.o siesta_options.o |
2411 | +compute_rhog.o: sparse_matrices.o |
2412 | conjgr.o: precision.o |
2413 | conjgr_old.o: precision.o |
2414 | coor.o: alloc.o local_sys.o parallel.o precision.o siesta_geom.o units.o |
2415 | @@ -185,13 +185,15 @@ |
2416 | dhscf.o: meshdscf.o meshsubs.o moremeshsubs.o parallel.o parsing.o precision.o |
2417 | dhscf.o: rhofft.o rhoofd.o siesta_options.o units.o vmat.o |
2418 | diag.o: alloc.o diag_option.o local_sys.o parallel.o precision.o |
2419 | -diag2g.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
2420 | +diag2g.o: fermid.o intrinsic_missing.o local_sys.o parallel.o parallelsubs.o |
2421 | +diag2g.o: precision.o |
2422 | diag2k.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
2423 | -diag3g.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
2424 | +diag3g.o: fermid.o intrinsic_missing.o local_sys.o parallel.o parallelsubs.o |
2425 | +diag3g.o: precision.o |
2426 | diag3k.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
2427 | diag_option.o: parallel.o precision.o |
2428 | -diagg.o: alloc.o fermid.o local_sys.o m_spin.o parallel.o parallelsubs.o |
2429 | -diagg.o: precision.o writewave.o |
2430 | +diagg.o: alloc.o fermid.o intrinsic_missing.o local_sys.o m_spin.o parallel.o |
2431 | +diagg.o: parallelsubs.o precision.o writewave.o |
2432 | diagk.o: compute_norm.o fermid.o local_sys.o m_spin.o parallel.o parallelsubs.o |
2433 | diagk.o: precision.o writewave.o |
2434 | diagk_file.o: fermid.o iowfs_netcdf.o local_sys.o parallel.o parallelsubs.o |
2435 | @@ -233,11 +235,11 @@ |
2436 | fft1d.o: local_sys.o parallel.o precision.o |
2437 | final_H_f_stress.o: alloc.o atomlist.o class_SpData2D.o compute_max_diff.o |
2438 | final_H_f_stress.o: dnaefs.o files.o grdsam.o kinefsm.o ldau.o ldau_specs.o |
2439 | -final_H_f_stress.o: local_sys.o m_dipol.o m_energies.o m_forces.o m_gamma.o |
2440 | -final_H_f_stress.o: m_hsx.o m_mpi_utils.o m_ncdf_siesta.o m_ntm.o m_spin.o |
2441 | -final_H_f_stress.o: m_stress.o m_ts_io.o m_ts_kpoints.o m_ts_options.o |
2442 | -final_H_f_stress.o: metaforce.o molecularmechanics.o naefs.o nlefsm.o overfsm.o |
2443 | -final_H_f_stress.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
2444 | +final_H_f_stress.o: local_sys.o m_dipol.o m_energies.o m_forces.o m_hsx.o |
2445 | +final_H_f_stress.o: m_mpi_utils.o m_ncdf_siesta.o m_ntm.o m_spin.o m_stress.o |
2446 | +final_H_f_stress.o: m_ts_io.o m_ts_kpoints.o m_ts_options.o metaforce.o |
2447 | +final_H_f_stress.o: molecularmechanics.o naefs.o nlefsm.o overfsm.o parallel.o |
2448 | +final_H_f_stress.o: siesta_geom.o siesta_options.o sparse_matrices.o |
2449 | final_H_f_stress.o: spinorbit.o units.o |
2450 | find_kgrid.o: alloc.o minvec.o parallel.o precision.o units.o |
2451 | fire_optim.o: alloc.o m_fire.o m_mpi_utils.o parallel.o precision.o |
2452 | @@ -306,8 +308,8 @@ |
2453 | ldau_specs.o: parallel.o precision.o pseudopotential.o radial.o units.o |
2454 | listsc.o: alloc.o |
2455 | local_DOS.o: atomlist.o dhscf.o diagon.o files.o kpoint_grid.o local_sys.o |
2456 | -local_DOS.o: m_energies.o m_eo.o m_forces.o m_gamma.o m_ntm.o m_spin.o |
2457 | -local_DOS.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
2458 | +local_DOS.o: m_energies.o m_eo.o m_forces.o m_ntm.o m_spin.o parallel.o |
2459 | +local_DOS.o: siesta_geom.o siesta_options.o sparse_matrices.o |
2460 | m_broyddj.o: alloc.o local_sys.o m_mpi_utils.o parallel.o precision.o |
2461 | m_broyddj_nocomm.o: alloc.o local_sys.o parallel.o precision.o |
2462 | m_broyden_mixing.o: alloc.o m_broyddj.o m_mpi_utils.o parallel.o precision.o |
2463 | @@ -376,10 +378,10 @@ |
2464 | m_ncdf_io.o: class_OrbitalDistribution.o class_SpData1D.o class_SpData2D.o |
2465 | m_ncdf_io.o: class_Sparsity.o m_io_s.o parallel.o precision.o |
2466 | m_ncdf_siesta.o: atm_types.o atmparams.o atomlist.o class_Sparsity.o files.o |
2467 | -m_ncdf_siesta.o: kpoint_grid.o m_energies.o m_forces.o m_gamma.o m_kinetic.o |
2468 | -m_ncdf_siesta.o: m_ncdf_io.o m_ntm.o m_spin.o m_stress.o m_ts_electype.o |
2469 | -m_ncdf_siesta.o: m_ts_kpoints.o m_ts_options.o parallel.o precision.o radial.o |
2470 | -m_ncdf_siesta.o: siesta_geom.o siesta_options.o sparse_matrices.o timestamp.o |
2471 | +m_ncdf_siesta.o: kpoint_grid.o m_energies.o m_forces.o m_kinetic.o m_ncdf_io.o |
2472 | +m_ncdf_siesta.o: m_ntm.o m_spin.o m_stress.o m_ts_electype.o m_ts_kpoints.o |
2473 | +m_ncdf_siesta.o: m_ts_options.o parallel.o precision.o radial.o siesta_geom.o |
2474 | +m_ncdf_siesta.o: siesta_options.o sparse_matrices.o timestamp.o |
2475 | m_new_dm.o: alloc.o atomlist.o class_Data2D.o class_Fstack_Data1D.o |
2476 | m_new_dm.o: class_Fstack_Pair_Geometry_SpData2D.o class_Geometry.o |
2477 | m_new_dm.o: class_OrbitalDistribution.o class_Pair_Geometry_SpData2D.o |
2478 | @@ -483,7 +485,7 @@ |
2479 | m_ts_electrode.o: parallel.o precision.o units.o |
2480 | m_ts_electype.o: class_OrbitalDistribution.o class_SpData1D.o class_SpData2D.o |
2481 | m_ts_electype.o: class_Sparsity.o create_Sparsity_SC.o geom_helper.o |
2482 | -m_ts_electype.o: intrinsic_missing.o m_geom_box.o m_geom_plane.o |
2483 | +m_ts_electype.o: intrinsic_missing.o m_char.o m_geom_box.o m_geom_plane.o |
2484 | m_ts_electype.o: m_handle_sparse.o m_iodm.o m_os.o m_region.o m_ts_chem_pot.o |
2485 | m_ts_electype.o: m_ts_io.o m_ts_io_ctype.o m_ts_iodm.o parallel.o precision.o |
2486 | m_ts_electype.o: units.o |
2487 | @@ -676,14 +678,13 @@ |
2488 | post_scf_work.o: atomlist.o class_Fstack_Pair_Geometry_SpData2D.o |
2489 | post_scf_work.o: class_Geometry.o class_Pair_Geometry_SpData2D.o compute_dm.o |
2490 | post_scf_work.o: diagon.o final_H_f_stress.o kpoint_grid.o m_dminim.o |
2491 | -post_scf_work.o: m_energies.o m_eo.o m_gamma.o m_spin.o m_steps.o m_zminim.o |
2492 | -post_scf_work.o: mneighb.o parallel.o siesta_geom.o siesta_options.o |
2493 | -post_scf_work.o: sparse_matrices.o |
2494 | +post_scf_work.o: m_energies.o m_eo.o m_spin.o m_steps.o m_zminim.o mneighb.o |
2495 | +post_scf_work.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
2496 | print_spin.o: atomlist.o m_mpi_utils.o m_spin.o parallel.o precision.o |
2497 | print_spin.o: siesta_cml.o sparse_matrices.o |
2498 | printmatrix.o: alloc.o |
2499 | projected_DOS.o: alloc.o atomlist.o kpoint_grid.o kpoint_pdos.o local_sys.o |
2500 | -projected_DOS.o: m_eo.o m_gamma.o m_spin.o parallel.o precision.o siesta_geom.o |
2501 | +projected_DOS.o: m_eo.o m_spin.o parallel.o precision.o siesta_geom.o |
2502 | projected_DOS.o: siesta_options.o sparse_matrices.o units.o |
2503 | propor.o: local_sys.o precision.o |
2504 | proximity_check.o: chemical.o m_ts_global_vars.o mneighb.o parallel.o |
2505 | @@ -733,11 +734,10 @@ |
2506 | setup_H0.o: siesta_geom.o siesta_options.o sparse_matrices.o spinorbit.o |
2507 | setup_hamiltonian.o: alloc.o atmfuncs.o atomlist.o class_SpData1D.o |
2508 | setup_hamiltonian.o: class_SpData2D.o dhscf.o files.o ldau.o ldau_specs.o |
2509 | -setup_hamiltonian.o: local_sys.o m_dipol.o m_energies.o m_gamma.o m_hsx.o |
2510 | -setup_hamiltonian.o: m_mpi_utils.o m_ntm.o m_partial_charges.o m_rhog.o |
2511 | -setup_hamiltonian.o: m_spin.o m_steps.o m_stress.o metaforce.o |
2512 | -setup_hamiltonian.o: molecularmechanics.o parallel.o siesta_geom.o |
2513 | -setup_hamiltonian.o: siesta_options.o sparse_matrices.o |
2514 | +setup_hamiltonian.o: local_sys.o m_dipol.o m_energies.o m_hsx.o m_mpi_utils.o |
2515 | +setup_hamiltonian.o: m_ntm.o m_partial_charges.o m_rhog.o m_spin.o m_steps.o |
2516 | +setup_hamiltonian.o: m_stress.o metaforce.o molecularmechanics.o parallel.o |
2517 | +setup_hamiltonian.o: siesta_geom.o siesta_options.o sparse_matrices.o |
2518 | setup_ordern_indexes.o: alloc.o domain_decom.o parallel.o spatial.o |
2519 | shaper.o: atmfuncs.o mneighb.o precision.o |
2520 | show_distribution.o: atomlist.o local_sys.o parallel.o parallelsubs.o |
2521 | @@ -750,10 +750,10 @@ |
2522 | siesta2wannier90.o: siesta_options.o |
2523 | siesta_analysis.o: alloc.o atomlist.o bands.o basis_enthalpy.o dhscf.o files.o |
2524 | siesta_analysis.o: flook_siesta.o kpoint_grid.o ksv.o ksvinit.o local_DOS.o |
2525 | -siesta_analysis.o: m_dipol.o m_energies.o m_eo.o m_forces.o m_gamma.o |
2526 | -siesta_analysis.o: m_iodm_old.o m_mpi_utils.o m_ntm.o m_partial_charges.o |
2527 | -siesta_analysis.o: m_pexsi_dos.o m_pexsi_local_dos.o m_spin.o m_steps.o |
2528 | -siesta_analysis.o: parallel.o projected_DOS.o siesta2wannier90.o siesta_cml.o |
2529 | +siesta_analysis.o: m_dipol.o m_energies.o m_eo.o m_forces.o m_iodm_old.o |
2530 | +siesta_analysis.o: m_mpi_utils.o m_ntm.o m_partial_charges.o m_pexsi_dos.o |
2531 | +siesta_analysis.o: m_pexsi_local_dos.o m_spin.o m_steps.o parallel.o |
2532 | +siesta_analysis.o: projected_DOS.o siesta2wannier90.o siesta_cml.o |
2533 | siesta_analysis.o: siesta_geom.o siesta_options.o sparse_matrices.o units.o |
2534 | siesta_analysis.o: write_subs.o writewave.o zmatrix.o |
2535 | siesta_cmlsubs.o: files.o m_uuid.o parallel.o siesta_cml.o timestamp.o |
2536 | @@ -784,7 +784,7 @@ |
2537 | siesta_init.o: class_Fstack_Pair_Geometry_SpData2D.o densematrix.o |
2538 | siesta_init.o: diag_option.o files.o flook_siesta.o ioxv.o kpoint_grid.o |
2539 | siesta_init.o: kpoint_pdos.o ksvinit.o local_sys.o m_check_walltime.o m_cite.o |
2540 | -siesta_init.o: m_energies.o m_eo.o m_fixed.o m_forces.o m_gamma.o m_iostruct.o |
2541 | +siesta_init.o: m_energies.o m_eo.o m_fixed.o m_forces.o m_iostruct.o |
2542 | siesta_init.o: m_mpi_utils.o m_new_dm.o m_rmaxh.o m_spin.o m_steps.o |
2543 | siesta_init.o: m_supercell.o m_timer.o m_wallclock.o metaforce.o |
2544 | siesta_init.o: molecularmechanics.o object_debug.o parallel.o parallelsubs.o |
2545 | @@ -816,14 +816,14 @@ |
2546 | state_init.o: class_SpData2D.o class_Sparsity.o create_Sparsity_SC.o |
2547 | state_init.o: domain_decom.o files.o hsparse.o iodm_netcdf.o iodmhs_netcdf.o |
2548 | state_init.o: ioxv.o kpoint_grid.o ldau_specs.o local_sys.o m_energies.o m_eo.o |
2549 | -state_init.o: m_gamma.o m_mixing.o m_mixing_scf.o m_mpi_utils.o m_new_dm.o |
2550 | -state_init.o: m_os.o m_pivot_methods.o m_rmaxh.o m_sparse.o |
2551 | -state_init.o: m_sparsity_handling.o m_spin.o m_steps.o m_supercell.o |
2552 | -state_init.o: m_test_io.o m_ts_charge.o m_ts_electype.o m_ts_global_vars.o |
2553 | -state_init.o: m_ts_io.o m_ts_kpoints.o m_ts_options.o m_ts_sparse.o |
2554 | -state_init.o: m_ts_tri_init.o normalize_dm.o overlap.o parallel.o |
2555 | -state_init.o: proximity_check.o siesta_cml.o siesta_dicts.o siesta_geom.o |
2556 | -state_init.o: siesta_options.o sparse_matrices.o units.o write_subs.o zmatrix.o |
2557 | +state_init.o: m_mixing.o m_mixing_scf.o m_mpi_utils.o m_new_dm.o m_os.o |
2558 | +state_init.o: m_pivot_methods.o m_rmaxh.o m_sparse.o m_sparsity_handling.o |
2559 | +state_init.o: m_spin.o m_steps.o m_supercell.o m_test_io.o m_ts_charge.o |
2560 | +state_init.o: m_ts_electype.o m_ts_global_vars.o m_ts_io.o m_ts_kpoints.o |
2561 | +state_init.o: m_ts_options.o m_ts_sparse.o m_ts_tri_init.o normalize_dm.o |
2562 | +state_init.o: overlap.o parallel.o proximity_check.o siesta_cml.o |
2563 | +state_init.o: siesta_dicts.o siesta_geom.o siesta_options.o sparse_matrices.o |
2564 | +state_init.o: units.o write_subs.o zmatrix.o |
2565 | struct_init.o: alloc.o atmfuncs.o atomlist.o files.o ioxv.o m_exp_coord.o |
2566 | struct_init.o: m_iostruct.o m_mpi_utils.o m_steps.o parallel.o periodic_table.o |
2567 | struct_init.o: siesta_cml.o siesta_geom.o siesta_master.o siesta_options.o |
2568 | |
2569 | === modified file 'Util/Helpers/Makefile' |
2570 | --- Util/Helpers/Makefile 2018-06-08 09:23:57 +0000 |
2571 | +++ Util/Helpers/Makefile 2018-06-26 07:59:48 +0000 |
2572 | @@ -93,7 +93,7 @@ |
2573 | atomlwf.o: spatial.o |
2574 | automatic_cell.o: atm_types.o atmfuncs.o parallel.o precision.o units.o |
2575 | bands.o: alloc.o atmfuncs.o atomlist.o densematrix.o diag.o diag_option.o |
2576 | -bands.o: files.o get_kpoints_scale.o local_sys.o m_gamma.o m_spin.o parallel.o |
2577 | +bands.o: files.o get_kpoints_scale.o local_sys.o m_spin.o parallel.o |
2578 | bands.o: parallelsubs.o precision.o siesta_geom.o writewave.o |
2579 | basis_enthalpy.o: atmfuncs.o atomlist.o precision.o siesta_geom.o units.o |
2580 | basis_io.o: atm_types.o atmparams.o atom_options.o basis_types.o chemical.o |
2581 | @@ -145,10 +145,10 @@ |
2582 | coceri.o: files.o periodic_table.o precision.o units.o |
2583 | compute_dm.o: atomlist.o class_SpData1D.o compute_ebs_shift.o diagon.o |
2584 | compute_dm.o: iodmhs_netcdf.o kpoint_grid.o local_sys.o m_dminim.o m_energies.o |
2585 | -compute_dm.o: m_eo.o m_gamma.o m_hsx.o m_pexsi_driver.o m_rmaxh.o m_spin.o |
2586 | -compute_dm.o: m_steps.o m_transiesta.o m_ts_global_vars.o m_zminim.o |
2587 | -compute_dm.o: normalize_dm.o ordern.o parallel.o precision.o siesta_geom.o |
2588 | -compute_dm.o: siesta_options.o sparse_matrices.o units.o |
2589 | +compute_dm.o: m_eo.o m_hsx.o m_pexsi_driver.o m_rmaxh.o m_spin.o m_steps.o |
2590 | +compute_dm.o: m_transiesta.o m_ts_global_vars.o m_zminim.o normalize_dm.o |
2591 | +compute_dm.o: ordern.o parallel.o precision.o siesta_geom.o siesta_options.o |
2592 | +compute_dm.o: sparse_matrices.o units.o |
2593 | compute_ebs_shift.o: m_mpi_utils.o parallel.o precision.o |
2594 | compute_energies.o: atomlist.o class_SpData1D.o class_SpData2D.o dhscf.o |
2595 | compute_energies.o: files.o m_dipol.o m_energies.o m_mpi_utils.o m_ntm.o |
2596 | @@ -160,8 +160,8 @@ |
2597 | compute_pw_matrix.o: parallel.o precision.o siesta2wannier90.o |
2598 | compute_pw_matrix.o: sparse_matrices.o |
2599 | compute_rhog.o: alloc.o atomlist.o dhscf.o files.o m_dipol.o m_energies.o |
2600 | -compute_rhog.o: m_gamma.o m_ntm.o m_spin.o m_stress.o siesta_geom.o |
2601 | -compute_rhog.o: siesta_options.o sparse_matrices.o |
2602 | +compute_rhog.o: m_ntm.o m_spin.o m_stress.o siesta_geom.o siesta_options.o |
2603 | +compute_rhog.o: sparse_matrices.o |
2604 | conjgr.o: precision.o |
2605 | conjgr_old.o: precision.o |
2606 | coor.o: alloc.o local_sys.o parallel.o precision.o siesta_geom.o units.o |
2607 | @@ -188,13 +188,15 @@ |
2608 | dhscf.o: meshdscf.o meshsubs.o moremeshsubs.o parallel.o parsing.o precision.o |
2609 | dhscf.o: rhofft.o rhoofd.o siesta_options.o units.o vmat.o |
2610 | diag.o: alloc.o diag_option.o local_sys.o parallel.o precision.o |
2611 | -diag2g.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
2612 | +diag2g.o: fermid.o intrinsic_missing.o local_sys.o parallel.o parallelsubs.o |
2613 | +diag2g.o: precision.o |
2614 | diag2k.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
2615 | -diag3g.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
2616 | +diag3g.o: fermid.o intrinsic_missing.o local_sys.o parallel.o parallelsubs.o |
2617 | +diag3g.o: precision.o |
2618 | diag3k.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
2619 | diag_option.o: parallel.o precision.o |
2620 | -diagg.o: alloc.o fermid.o local_sys.o m_spin.o parallel.o parallelsubs.o |
2621 | -diagg.o: precision.o writewave.o |
2622 | +diagg.o: alloc.o fermid.o intrinsic_missing.o local_sys.o m_spin.o parallel.o |
2623 | +diagg.o: parallelsubs.o precision.o writewave.o |
2624 | diagk.o: compute_norm.o fermid.o local_sys.o m_spin.o parallel.o parallelsubs.o |
2625 | diagk.o: precision.o writewave.o |
2626 | diagk_file.o: fermid.o iowfs_netcdf.o local_sys.o parallel.o parallelsubs.o |
2627 | @@ -236,11 +238,11 @@ |
2628 | fft1d.o: local_sys.o parallel.o precision.o |
2629 | final_H_f_stress.o: alloc.o atomlist.o class_SpData2D.o compute_max_diff.o |
2630 | final_H_f_stress.o: dnaefs.o files.o grdsam.o kinefsm.o ldau.o ldau_specs.o |
2631 | -final_H_f_stress.o: local_sys.o m_dipol.o m_energies.o m_forces.o m_gamma.o |
2632 | -final_H_f_stress.o: m_hsx.o m_mpi_utils.o m_ncdf_siesta.o m_ntm.o m_spin.o |
2633 | -final_H_f_stress.o: m_stress.o m_ts_io.o m_ts_kpoints.o m_ts_options.o |
2634 | -final_H_f_stress.o: metaforce.o molecularmechanics.o naefs.o nlefsm.o overfsm.o |
2635 | -final_H_f_stress.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
2636 | +final_H_f_stress.o: local_sys.o m_dipol.o m_energies.o m_forces.o m_hsx.o |
2637 | +final_H_f_stress.o: m_mpi_utils.o m_ncdf_siesta.o m_ntm.o m_spin.o m_stress.o |
2638 | +final_H_f_stress.o: m_ts_io.o m_ts_kpoints.o m_ts_options.o metaforce.o |
2639 | +final_H_f_stress.o: molecularmechanics.o naefs.o nlefsm.o overfsm.o parallel.o |
2640 | +final_H_f_stress.o: siesta_geom.o siesta_options.o sparse_matrices.o |
2641 | final_H_f_stress.o: spinorbit.o units.o |
2642 | find_kgrid.o: alloc.o minvec.o parallel.o precision.o units.o |
2643 | fire_optim.o: alloc.o m_fire.o m_mpi_utils.o parallel.o precision.o |
2644 | @@ -309,8 +311,8 @@ |
2645 | ldau_specs.o: parallel.o precision.o pseudopotential.o radial.o units.o |
2646 | listsc.o: alloc.o |
2647 | local_DOS.o: atomlist.o dhscf.o diagon.o files.o kpoint_grid.o local_sys.o |
2648 | -local_DOS.o: m_energies.o m_eo.o m_forces.o m_gamma.o m_ntm.o m_spin.o |
2649 | -local_DOS.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
2650 | +local_DOS.o: m_energies.o m_eo.o m_forces.o m_ntm.o m_spin.o parallel.o |
2651 | +local_DOS.o: siesta_geom.o siesta_options.o sparse_matrices.o |
2652 | m_broyddj.o: alloc.o local_sys.o m_mpi_utils.o parallel.o precision.o |
2653 | m_broyddj_nocomm.o: alloc.o local_sys.o parallel.o precision.o |
2654 | m_broyden_mixing.o: alloc.o m_broyddj.o m_mpi_utils.o parallel.o precision.o |
2655 | @@ -379,10 +381,10 @@ |
2656 | m_ncdf_io.o: class_OrbitalDistribution.o class_SpData1D.o class_SpData2D.o |
2657 | m_ncdf_io.o: class_Sparsity.o m_io_s.o parallel.o precision.o |
2658 | m_ncdf_siesta.o: atm_types.o atmparams.o atomlist.o class_Sparsity.o files.o |
2659 | -m_ncdf_siesta.o: kpoint_grid.o m_energies.o m_forces.o m_gamma.o m_kinetic.o |
2660 | -m_ncdf_siesta.o: m_ncdf_io.o m_ntm.o m_spin.o m_stress.o m_ts_electype.o |
2661 | -m_ncdf_siesta.o: m_ts_kpoints.o m_ts_options.o parallel.o precision.o radial.o |
2662 | -m_ncdf_siesta.o: siesta_geom.o siesta_options.o sparse_matrices.o timestamp.o |
2663 | +m_ncdf_siesta.o: kpoint_grid.o m_energies.o m_forces.o m_kinetic.o m_ncdf_io.o |
2664 | +m_ncdf_siesta.o: m_ntm.o m_spin.o m_stress.o m_ts_electype.o m_ts_kpoints.o |
2665 | +m_ncdf_siesta.o: m_ts_options.o parallel.o precision.o radial.o siesta_geom.o |
2666 | +m_ncdf_siesta.o: siesta_options.o sparse_matrices.o timestamp.o |
2667 | m_new_dm.o: alloc.o atomlist.o class_Data2D.o class_Fstack_Data1D.o |
2668 | m_new_dm.o: class_Fstack_Pair_Geometry_SpData2D.o class_Geometry.o |
2669 | m_new_dm.o: class_OrbitalDistribution.o class_Pair_Geometry_SpData2D.o |
2670 | @@ -486,7 +488,7 @@ |
2671 | m_ts_electrode.o: parallel.o precision.o units.o |
2672 | m_ts_electype.o: class_OrbitalDistribution.o class_SpData1D.o class_SpData2D.o |
2673 | m_ts_electype.o: class_Sparsity.o create_Sparsity_SC.o geom_helper.o |
2674 | -m_ts_electype.o: intrinsic_missing.o m_geom_box.o m_geom_plane.o |
2675 | +m_ts_electype.o: intrinsic_missing.o m_char.o m_geom_box.o m_geom_plane.o |
2676 | m_ts_electype.o: m_handle_sparse.o m_iodm.o m_os.o m_region.o m_ts_chem_pot.o |
2677 | m_ts_electype.o: m_ts_io.o m_ts_io_ctype.o m_ts_iodm.o parallel.o precision.o |
2678 | m_ts_electype.o: units.o |
2679 | @@ -679,14 +681,13 @@ |
2680 | post_scf_work.o: atomlist.o class_Fstack_Pair_Geometry_SpData2D.o |
2681 | post_scf_work.o: class_Geometry.o class_Pair_Geometry_SpData2D.o compute_dm.o |
2682 | post_scf_work.o: diagon.o final_H_f_stress.o kpoint_grid.o m_dminim.o |
2683 | -post_scf_work.o: m_energies.o m_eo.o m_gamma.o m_spin.o m_steps.o m_zminim.o |
2684 | -post_scf_work.o: mneighb.o parallel.o siesta_geom.o siesta_options.o |
2685 | -post_scf_work.o: sparse_matrices.o |
2686 | +post_scf_work.o: m_energies.o m_eo.o m_spin.o m_steps.o m_zminim.o mneighb.o |
2687 | +post_scf_work.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
2688 | print_spin.o: atomlist.o m_mpi_utils.o m_spin.o parallel.o precision.o |
2689 | print_spin.o: siesta_cml.o sparse_matrices.o |
2690 | printmatrix.o: alloc.o |
2691 | projected_DOS.o: alloc.o atomlist.o kpoint_grid.o kpoint_pdos.o local_sys.o |
2692 | -projected_DOS.o: m_eo.o m_gamma.o m_spin.o parallel.o precision.o siesta_geom.o |
2693 | +projected_DOS.o: m_eo.o m_spin.o parallel.o precision.o siesta_geom.o |
2694 | projected_DOS.o: siesta_options.o sparse_matrices.o units.o |
2695 | propor.o: local_sys.o precision.o |
2696 | proximity_check.o: chemical.o m_ts_global_vars.o mneighb.o parallel.o |
2697 | @@ -736,11 +737,10 @@ |
2698 | setup_H0.o: siesta_geom.o siesta_options.o sparse_matrices.o spinorbit.o |
2699 | setup_hamiltonian.o: alloc.o atmfuncs.o atomlist.o class_SpData1D.o |
2700 | setup_hamiltonian.o: class_SpData2D.o dhscf.o files.o ldau.o ldau_specs.o |
2701 | -setup_hamiltonian.o: local_sys.o m_dipol.o m_energies.o m_gamma.o m_hsx.o |
2702 | -setup_hamiltonian.o: m_mpi_utils.o m_ntm.o m_partial_charges.o m_rhog.o |
2703 | -setup_hamiltonian.o: m_spin.o m_steps.o m_stress.o metaforce.o |
2704 | -setup_hamiltonian.o: molecularmechanics.o parallel.o siesta_geom.o |
2705 | -setup_hamiltonian.o: siesta_options.o sparse_matrices.o |
2706 | +setup_hamiltonian.o: local_sys.o m_dipol.o m_energies.o m_hsx.o m_mpi_utils.o |
2707 | +setup_hamiltonian.o: m_ntm.o m_partial_charges.o m_rhog.o m_spin.o m_steps.o |
2708 | +setup_hamiltonian.o: m_stress.o metaforce.o molecularmechanics.o parallel.o |
2709 | +setup_hamiltonian.o: siesta_geom.o siesta_options.o sparse_matrices.o |
2710 | setup_ordern_indexes.o: alloc.o domain_decom.o parallel.o spatial.o |
2711 | shaper.o: atmfuncs.o mneighb.o precision.o |
2712 | show_distribution.o: atomlist.o local_sys.o parallel.o parallelsubs.o |
2713 | @@ -753,10 +753,10 @@ |
2714 | siesta2wannier90.o: siesta_options.o |
2715 | siesta_analysis.o: alloc.o atomlist.o bands.o basis_enthalpy.o dhscf.o files.o |
2716 | siesta_analysis.o: flook_siesta.o kpoint_grid.o ksv.o ksvinit.o local_DOS.o |
2717 | -siesta_analysis.o: m_dipol.o m_energies.o m_eo.o m_forces.o m_gamma.o |
2718 | -siesta_analysis.o: m_iodm_old.o m_mpi_utils.o m_ntm.o m_partial_charges.o |
2719 | -siesta_analysis.o: m_pexsi_dos.o m_pexsi_local_dos.o m_spin.o m_steps.o |
2720 | -siesta_analysis.o: parallel.o projected_DOS.o siesta2wannier90.o siesta_cml.o |
2721 | +siesta_analysis.o: m_dipol.o m_energies.o m_eo.o m_forces.o m_iodm_old.o |
2722 | +siesta_analysis.o: m_mpi_utils.o m_ntm.o m_partial_charges.o m_pexsi_dos.o |
2723 | +siesta_analysis.o: m_pexsi_local_dos.o m_spin.o m_steps.o parallel.o |
2724 | +siesta_analysis.o: projected_DOS.o siesta2wannier90.o siesta_cml.o |
2725 | siesta_analysis.o: siesta_geom.o siesta_options.o sparse_matrices.o units.o |
2726 | siesta_analysis.o: write_subs.o writewave.o zmatrix.o |
2727 | siesta_cmlsubs.o: files.o m_uuid.o parallel.o siesta_cml.o timestamp.o |
2728 | @@ -787,7 +787,7 @@ |
2729 | siesta_init.o: class_Fstack_Pair_Geometry_SpData2D.o densematrix.o |
2730 | siesta_init.o: diag_option.o files.o flook_siesta.o ioxv.o kpoint_grid.o |
2731 | siesta_init.o: kpoint_pdos.o ksvinit.o local_sys.o m_check_walltime.o m_cite.o |
2732 | -siesta_init.o: m_energies.o m_eo.o m_fixed.o m_forces.o m_gamma.o m_iostruct.o |
2733 | +siesta_init.o: m_energies.o m_eo.o m_fixed.o m_forces.o m_iostruct.o |
2734 | siesta_init.o: m_mpi_utils.o m_new_dm.o m_rmaxh.o m_spin.o m_steps.o |
2735 | siesta_init.o: m_supercell.o m_timer.o m_wallclock.o metaforce.o |
2736 | siesta_init.o: molecularmechanics.o object_debug.o parallel.o parallelsubs.o |
2737 | @@ -819,14 +819,14 @@ |
2738 | state_init.o: class_SpData2D.o class_Sparsity.o create_Sparsity_SC.o |
2739 | state_init.o: domain_decom.o files.o hsparse.o iodm_netcdf.o iodmhs_netcdf.o |
2740 | state_init.o: ioxv.o kpoint_grid.o ldau_specs.o local_sys.o m_energies.o m_eo.o |
2741 | -state_init.o: m_gamma.o m_mixing.o m_mixing_scf.o m_mpi_utils.o m_new_dm.o |
2742 | -state_init.o: m_os.o m_pivot_methods.o m_rmaxh.o m_sparse.o |
2743 | -state_init.o: m_sparsity_handling.o m_spin.o m_steps.o m_supercell.o |
2744 | -state_init.o: m_test_io.o m_ts_charge.o m_ts_electype.o m_ts_global_vars.o |
2745 | -state_init.o: m_ts_io.o m_ts_kpoints.o m_ts_options.o m_ts_sparse.o |
2746 | -state_init.o: m_ts_tri_init.o normalize_dm.o overlap.o parallel.o |
2747 | -state_init.o: proximity_check.o siesta_cml.o siesta_dicts.o siesta_geom.o |
2748 | -state_init.o: siesta_options.o sparse_matrices.o units.o write_subs.o zmatrix.o |
2749 | +state_init.o: m_mixing.o m_mixing_scf.o m_mpi_utils.o m_new_dm.o m_os.o |
2750 | +state_init.o: m_pivot_methods.o m_rmaxh.o m_sparse.o m_sparsity_handling.o |
2751 | +state_init.o: m_spin.o m_steps.o m_supercell.o m_test_io.o m_ts_charge.o |
2752 | +state_init.o: m_ts_electype.o m_ts_global_vars.o m_ts_io.o m_ts_kpoints.o |
2753 | +state_init.o: m_ts_options.o m_ts_sparse.o m_ts_tri_init.o normalize_dm.o |
2754 | +state_init.o: overlap.o parallel.o proximity_check.o siesta_cml.o |
2755 | +state_init.o: siesta_dicts.o siesta_geom.o siesta_options.o sparse_matrices.o |
2756 | +state_init.o: units.o write_subs.o zmatrix.o |
2757 | struct_init.o: alloc.o atmfuncs.o atomlist.o files.o ioxv.o m_exp_coord.o |
2758 | struct_init.o: m_iostruct.o m_mpi_utils.o m_steps.o parallel.o periodic_table.o |
2759 | struct_init.o: siesta_cml.o siesta_geom.o siesta_master.o siesta_options.o |
2760 | |
2761 | === modified file 'Util/STM/ol-stm/Src/Makefile' |
2762 | --- Util/STM/ol-stm/Src/Makefile 2018-06-08 09:23:57 +0000 |
2763 | +++ Util/STM/ol-stm/Src/Makefile 2018-06-26 07:59:48 +0000 |
2764 | @@ -170,7 +170,7 @@ |
2765 | atomlwf.o: spatial.o |
2766 | automatic_cell.o: atm_types.o atmfuncs.o parallel.o precision.o units.o |
2767 | bands.o: alloc.o atmfuncs.o atomlist.o densematrix.o diag.o diag_option.o |
2768 | -bands.o: files.o get_kpoints_scale.o local_sys.o m_gamma.o m_spin.o parallel.o |
2769 | +bands.o: files.o get_kpoints_scale.o local_sys.o m_spin.o parallel.o |
2770 | bands.o: parallelsubs.o precision.o siesta_geom.o writewave.o |
2771 | basis_enthalpy.o: atmfuncs.o atomlist.o precision.o siesta_geom.o units.o |
2772 | basis_io.o: atm_types.o atmparams.o atom_options.o basis_types.o chemical.o |
2773 | @@ -227,10 +227,10 @@ |
2774 | coceri.o: files.o periodic_table.o precision.o units.o |
2775 | compute_dm.o: atomlist.o class_SpData1D.o compute_ebs_shift.o diagon.o |
2776 | compute_dm.o: iodmhs_netcdf.o kpoint_grid.o local_sys.o m_dminim.o m_energies.o |
2777 | -compute_dm.o: m_eo.o m_gamma.o m_hsx.o m_pexsi_driver.o m_rmaxh.o m_spin.o |
2778 | -compute_dm.o: m_steps.o m_transiesta.o m_ts_global_vars.o m_zminim.o |
2779 | -compute_dm.o: normalize_dm.o ordern.o parallel.o precision.o siesta_geom.o |
2780 | -compute_dm.o: siesta_options.o sparse_matrices.o units.o |
2781 | +compute_dm.o: m_eo.o m_hsx.o m_pexsi_driver.o m_rmaxh.o m_spin.o m_steps.o |
2782 | +compute_dm.o: m_transiesta.o m_ts_global_vars.o m_zminim.o normalize_dm.o |
2783 | +compute_dm.o: ordern.o parallel.o precision.o siesta_geom.o siesta_options.o |
2784 | +compute_dm.o: sparse_matrices.o units.o |
2785 | compute_ebs_shift.o: m_mpi_utils.o parallel.o precision.o |
2786 | compute_energies.o: atomlist.o class_SpData1D.o class_SpData2D.o dhscf.o |
2787 | compute_energies.o: files.o m_dipol.o m_energies.o m_mpi_utils.o m_ntm.o |
2788 | @@ -242,8 +242,8 @@ |
2789 | compute_pw_matrix.o: parallel.o precision.o siesta2wannier90.o |
2790 | compute_pw_matrix.o: sparse_matrices.o |
2791 | compute_rhog.o: alloc.o atomlist.o dhscf.o files.o m_dipol.o m_energies.o |
2792 | -compute_rhog.o: m_gamma.o m_ntm.o m_spin.o m_stress.o siesta_geom.o |
2793 | -compute_rhog.o: siesta_options.o sparse_matrices.o |
2794 | +compute_rhog.o: m_ntm.o m_spin.o m_stress.o siesta_geom.o siesta_options.o |
2795 | +compute_rhog.o: sparse_matrices.o |
2796 | conjgr.o: precision.o |
2797 | conjgr_old.o: precision.o |
2798 | coor.o: alloc.o local_sys.o parallel.o precision.o siesta_geom.o units.o |
2799 | @@ -270,13 +270,15 @@ |
2800 | dhscf.o: meshdscf.o meshsubs.o moremeshsubs.o parallel.o parsing.o precision.o |
2801 | dhscf.o: rhofft.o rhoofd.o siesta_options.o units.o vmat.o |
2802 | diag.o: alloc.o diag_option.o local_sys.o parallel.o precision.o |
2803 | -diag2g.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
2804 | +diag2g.o: fermid.o intrinsic_missing.o local_sys.o parallel.o parallelsubs.o |
2805 | +diag2g.o: precision.o |
2806 | diag2k.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
2807 | -diag3g.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
2808 | +diag3g.o: fermid.o intrinsic_missing.o local_sys.o parallel.o parallelsubs.o |
2809 | +diag3g.o: precision.o |
2810 | diag3k.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
2811 | diag_option.o: parallel.o precision.o |
2812 | -diagg.o: alloc.o fermid.o local_sys.o m_spin.o parallel.o parallelsubs.o |
2813 | -diagg.o: precision.o writewave.o |
2814 | +diagg.o: alloc.o fermid.o intrinsic_missing.o local_sys.o m_spin.o parallel.o |
2815 | +diagg.o: parallelsubs.o precision.o writewave.o |
2816 | diagk.o: compute_norm.o fermid.o local_sys.o m_spin.o parallel.o parallelsubs.o |
2817 | diagk.o: precision.o writewave.o |
2818 | diagk_file.o: fermid.o iowfs_netcdf.o local_sys.o parallel.o parallelsubs.o |
2819 | @@ -318,11 +320,11 @@ |
2820 | fft1d.o: local_sys.o parallel.o precision.o |
2821 | final_H_f_stress.o: alloc.o atomlist.o class_SpData2D.o compute_max_diff.o |
2822 | final_H_f_stress.o: dnaefs.o files.o grdsam.o kinefsm.o ldau.o ldau_specs.o |
2823 | -final_H_f_stress.o: local_sys.o m_dipol.o m_energies.o m_forces.o m_gamma.o |
2824 | -final_H_f_stress.o: m_hsx.o m_mpi_utils.o m_ncdf_siesta.o m_ntm.o m_spin.o |
2825 | -final_H_f_stress.o: m_stress.o m_ts_io.o m_ts_kpoints.o m_ts_options.o |
2826 | -final_H_f_stress.o: metaforce.o molecularmechanics.o naefs.o nlefsm.o overfsm.o |
2827 | -final_H_f_stress.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
2828 | +final_H_f_stress.o: local_sys.o m_dipol.o m_energies.o m_forces.o m_hsx.o |
2829 | +final_H_f_stress.o: m_mpi_utils.o m_ncdf_siesta.o m_ntm.o m_spin.o m_stress.o |
2830 | +final_H_f_stress.o: m_ts_io.o m_ts_kpoints.o m_ts_options.o metaforce.o |
2831 | +final_H_f_stress.o: molecularmechanics.o naefs.o nlefsm.o overfsm.o parallel.o |
2832 | +final_H_f_stress.o: siesta_geom.o siesta_options.o sparse_matrices.o |
2833 | final_H_f_stress.o: spinorbit.o units.o |
2834 | find_kgrid.o: alloc.o minvec.o parallel.o precision.o units.o |
2835 | fire_optim.o: alloc.o m_fire.o m_mpi_utils.o parallel.o precision.o |
2836 | @@ -391,8 +393,8 @@ |
2837 | ldau_specs.o: parallel.o precision.o pseudopotential.o radial.o units.o |
2838 | listsc.o: alloc.o |
2839 | local_DOS.o: atomlist.o dhscf.o diagon.o files.o kpoint_grid.o local_sys.o |
2840 | -local_DOS.o: m_energies.o m_eo.o m_forces.o m_gamma.o m_ntm.o m_spin.o |
2841 | -local_DOS.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
2842 | +local_DOS.o: m_energies.o m_eo.o m_forces.o m_ntm.o m_spin.o parallel.o |
2843 | +local_DOS.o: siesta_geom.o siesta_options.o sparse_matrices.o |
2844 | m_broyddj.o: alloc.o local_sys.o m_mpi_utils.o parallel.o precision.o |
2845 | m_broyddj_nocomm.o: alloc.o local_sys.o parallel.o precision.o |
2846 | m_broyden_mixing.o: alloc.o m_broyddj.o m_mpi_utils.o parallel.o precision.o |
2847 | @@ -461,10 +463,10 @@ |
2848 | m_ncdf_io.o: class_OrbitalDistribution.o class_SpData1D.o class_SpData2D.o |
2849 | m_ncdf_io.o: class_Sparsity.o m_io_s.o parallel.o precision.o |
2850 | m_ncdf_siesta.o: atm_types.o atmparams.o atomlist.o class_Sparsity.o files.o |
2851 | -m_ncdf_siesta.o: kpoint_grid.o m_energies.o m_forces.o m_gamma.o m_kinetic.o |
2852 | -m_ncdf_siesta.o: m_ncdf_io.o m_ntm.o m_spin.o m_stress.o m_ts_electype.o |
2853 | -m_ncdf_siesta.o: m_ts_kpoints.o m_ts_options.o parallel.o precision.o radial.o |
2854 | -m_ncdf_siesta.o: siesta_geom.o siesta_options.o sparse_matrices.o timestamp.o |
2855 | +m_ncdf_siesta.o: kpoint_grid.o m_energies.o m_forces.o m_kinetic.o m_ncdf_io.o |
2856 | +m_ncdf_siesta.o: m_ntm.o m_spin.o m_stress.o m_ts_electype.o m_ts_kpoints.o |
2857 | +m_ncdf_siesta.o: m_ts_options.o parallel.o precision.o radial.o siesta_geom.o |
2858 | +m_ncdf_siesta.o: siesta_options.o sparse_matrices.o timestamp.o |
2859 | m_new_dm.o: alloc.o atomlist.o class_Data2D.o class_Fstack_Data1D.o |
2860 | m_new_dm.o: class_Fstack_Pair_Geometry_SpData2D.o class_Geometry.o |
2861 | m_new_dm.o: class_OrbitalDistribution.o class_Pair_Geometry_SpData2D.o |
2862 | @@ -568,7 +570,7 @@ |
2863 | m_ts_electrode.o: parallel.o precision.o units.o |
2864 | m_ts_electype.o: class_OrbitalDistribution.o class_SpData1D.o class_SpData2D.o |
2865 | m_ts_electype.o: class_Sparsity.o create_Sparsity_SC.o geom_helper.o |
2866 | -m_ts_electype.o: intrinsic_missing.o m_geom_box.o m_geom_plane.o |
2867 | +m_ts_electype.o: intrinsic_missing.o m_char.o m_geom_box.o m_geom_plane.o |
2868 | m_ts_electype.o: m_handle_sparse.o m_iodm.o m_os.o m_region.o m_ts_chem_pot.o |
2869 | m_ts_electype.o: m_ts_io.o m_ts_io_ctype.o m_ts_iodm.o parallel.o precision.o |
2870 | m_ts_electype.o: units.o |
2871 | @@ -761,14 +763,13 @@ |
2872 | post_scf_work.o: atomlist.o class_Fstack_Pair_Geometry_SpData2D.o |
2873 | post_scf_work.o: class_Geometry.o class_Pair_Geometry_SpData2D.o compute_dm.o |
2874 | post_scf_work.o: diagon.o final_H_f_stress.o kpoint_grid.o m_dminim.o |
2875 | -post_scf_work.o: m_energies.o m_eo.o m_gamma.o m_spin.o m_steps.o m_zminim.o |
2876 | -post_scf_work.o: mneighb.o parallel.o siesta_geom.o siesta_options.o |
2877 | -post_scf_work.o: sparse_matrices.o |
2878 | +post_scf_work.o: m_energies.o m_eo.o m_spin.o m_steps.o m_zminim.o mneighb.o |
2879 | +post_scf_work.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
2880 | print_spin.o: atomlist.o m_mpi_utils.o m_spin.o parallel.o precision.o |
2881 | print_spin.o: siesta_cml.o sparse_matrices.o |
2882 | printmatrix.o: alloc.o |
2883 | projected_DOS.o: alloc.o atomlist.o kpoint_grid.o kpoint_pdos.o local_sys.o |
2884 | -projected_DOS.o: m_eo.o m_gamma.o m_spin.o parallel.o precision.o siesta_geom.o |
2885 | +projected_DOS.o: m_eo.o m_spin.o parallel.o precision.o siesta_geom.o |
2886 | projected_DOS.o: siesta_options.o sparse_matrices.o units.o |
2887 | propor.o: local_sys.o precision.o |
2888 | proximity_check.o: chemical.o m_ts_global_vars.o mneighb.o parallel.o |
2889 | @@ -818,11 +819,10 @@ |
2890 | setup_H0.o: siesta_geom.o siesta_options.o sparse_matrices.o spinorbit.o |
2891 | setup_hamiltonian.o: alloc.o atmfuncs.o atomlist.o class_SpData1D.o |
2892 | setup_hamiltonian.o: class_SpData2D.o dhscf.o files.o ldau.o ldau_specs.o |
2893 | -setup_hamiltonian.o: local_sys.o m_dipol.o m_energies.o m_gamma.o m_hsx.o |
2894 | -setup_hamiltonian.o: m_mpi_utils.o m_ntm.o m_partial_charges.o m_rhog.o |
2895 | -setup_hamiltonian.o: m_spin.o m_steps.o m_stress.o metaforce.o |
2896 | -setup_hamiltonian.o: molecularmechanics.o parallel.o siesta_geom.o |
2897 | -setup_hamiltonian.o: siesta_options.o sparse_matrices.o |
2898 | +setup_hamiltonian.o: local_sys.o m_dipol.o m_energies.o m_hsx.o m_mpi_utils.o |
2899 | +setup_hamiltonian.o: m_ntm.o m_partial_charges.o m_rhog.o m_spin.o m_steps.o |
2900 | +setup_hamiltonian.o: m_stress.o metaforce.o molecularmechanics.o parallel.o |
2901 | +setup_hamiltonian.o: siesta_geom.o siesta_options.o sparse_matrices.o |
2902 | setup_ordern_indexes.o: alloc.o domain_decom.o parallel.o spatial.o |
2903 | shaper.o: atmfuncs.o mneighb.o precision.o |
2904 | show_distribution.o: atomlist.o local_sys.o parallel.o parallelsubs.o |
2905 | @@ -835,10 +835,10 @@ |
2906 | siesta2wannier90.o: siesta_options.o |
2907 | siesta_analysis.o: alloc.o atomlist.o bands.o basis_enthalpy.o dhscf.o files.o |
2908 | siesta_analysis.o: flook_siesta.o kpoint_grid.o ksv.o ksvinit.o local_DOS.o |
2909 | -siesta_analysis.o: m_dipol.o m_energies.o m_eo.o m_forces.o m_gamma.o |
2910 | -siesta_analysis.o: m_iodm_old.o m_mpi_utils.o m_ntm.o m_partial_charges.o |
2911 | -siesta_analysis.o: m_pexsi_dos.o m_pexsi_local_dos.o m_spin.o m_steps.o |
2912 | -siesta_analysis.o: parallel.o projected_DOS.o siesta2wannier90.o siesta_cml.o |
2913 | +siesta_analysis.o: m_dipol.o m_energies.o m_eo.o m_forces.o m_iodm_old.o |
2914 | +siesta_analysis.o: m_mpi_utils.o m_ntm.o m_partial_charges.o m_pexsi_dos.o |
2915 | +siesta_analysis.o: m_pexsi_local_dos.o m_spin.o m_steps.o parallel.o |
2916 | +siesta_analysis.o: projected_DOS.o siesta2wannier90.o siesta_cml.o |
2917 | siesta_analysis.o: siesta_geom.o siesta_options.o sparse_matrices.o units.o |
2918 | siesta_analysis.o: write_subs.o writewave.o zmatrix.o |
2919 | siesta_cmlsubs.o: files.o m_uuid.o parallel.o siesta_cml.o timestamp.o |
2920 | @@ -869,7 +869,7 @@ |
2921 | siesta_init.o: class_Fstack_Pair_Geometry_SpData2D.o densematrix.o |
2922 | siesta_init.o: diag_option.o files.o flook_siesta.o ioxv.o kpoint_grid.o |
2923 | siesta_init.o: kpoint_pdos.o ksvinit.o local_sys.o m_check_walltime.o m_cite.o |
2924 | -siesta_init.o: m_energies.o m_eo.o m_fixed.o m_forces.o m_gamma.o m_iostruct.o |
2925 | +siesta_init.o: m_energies.o m_eo.o m_fixed.o m_forces.o m_iostruct.o |
2926 | siesta_init.o: m_mpi_utils.o m_new_dm.o m_rmaxh.o m_spin.o m_steps.o |
2927 | siesta_init.o: m_supercell.o m_timer.o m_wallclock.o metaforce.o |
2928 | siesta_init.o: molecularmechanics.o object_debug.o parallel.o parallelsubs.o |
2929 | @@ -901,14 +901,14 @@ |
2930 | state_init.o: class_SpData2D.o class_Sparsity.o create_Sparsity_SC.o |
2931 | state_init.o: domain_decom.o files.o hsparse.o iodm_netcdf.o iodmhs_netcdf.o |
2932 | state_init.o: ioxv.o kpoint_grid.o ldau_specs.o local_sys.o m_energies.o m_eo.o |
2933 | -state_init.o: m_gamma.o m_mixing.o m_mixing_scf.o m_mpi_utils.o m_new_dm.o |
2934 | -state_init.o: m_os.o m_pivot_methods.o m_rmaxh.o m_sparse.o |
2935 | -state_init.o: m_sparsity_handling.o m_spin.o m_steps.o m_supercell.o |
2936 | -state_init.o: m_test_io.o m_ts_charge.o m_ts_electype.o m_ts_global_vars.o |
2937 | -state_init.o: m_ts_io.o m_ts_kpoints.o m_ts_options.o m_ts_sparse.o |
2938 | -state_init.o: m_ts_tri_init.o normalize_dm.o overlap.o parallel.o |
2939 | -state_init.o: proximity_check.o siesta_cml.o siesta_dicts.o siesta_geom.o |
2940 | -state_init.o: siesta_options.o sparse_matrices.o units.o write_subs.o zmatrix.o |
2941 | +state_init.o: m_mixing.o m_mixing_scf.o m_mpi_utils.o m_new_dm.o m_os.o |
2942 | +state_init.o: m_pivot_methods.o m_rmaxh.o m_sparse.o m_sparsity_handling.o |
2943 | +state_init.o: m_spin.o m_steps.o m_supercell.o m_test_io.o m_ts_charge.o |
2944 | +state_init.o: m_ts_electype.o m_ts_global_vars.o m_ts_io.o m_ts_kpoints.o |
2945 | +state_init.o: m_ts_options.o m_ts_sparse.o m_ts_tri_init.o normalize_dm.o |
2946 | +state_init.o: overlap.o parallel.o proximity_check.o siesta_cml.o |
2947 | +state_init.o: siesta_dicts.o siesta_geom.o siesta_options.o sparse_matrices.o |
2948 | +state_init.o: units.o write_subs.o zmatrix.o |
2949 | struct_init.o: alloc.o atmfuncs.o atomlist.o files.o ioxv.o m_exp_coord.o |
2950 | struct_init.o: m_iostruct.o m_mpi_utils.o m_steps.o parallel.o periodic_table.o |
2951 | struct_init.o: siesta_cml.o siesta_geom.o siesta_master.o siesta_options.o |
2952 | |
2953 | === modified file 'Util/SpPivot/Makefile' |
2954 | --- Util/SpPivot/Makefile 2018-06-08 09:23:57 +0000 |
2955 | +++ Util/SpPivot/Makefile 2018-06-26 07:59:48 +0000 |
2956 | @@ -99,7 +99,7 @@ |
2957 | atomlwf.o: spatial.o |
2958 | automatic_cell.o: atm_types.o atmfuncs.o parallel.o precision.o units.o |
2959 | bands.o: alloc.o atmfuncs.o atomlist.o densematrix.o diag.o diag_option.o |
2960 | -bands.o: files.o get_kpoints_scale.o local_sys.o m_gamma.o m_spin.o parallel.o |
2961 | +bands.o: files.o get_kpoints_scale.o local_sys.o m_spin.o parallel.o |
2962 | bands.o: parallelsubs.o precision.o siesta_geom.o writewave.o |
2963 | basis_enthalpy.o: atmfuncs.o atomlist.o precision.o siesta_geom.o units.o |
2964 | basis_io.o: atm_types.o atmparams.o atom_options.o basis_types.o chemical.o |
2965 | @@ -156,10 +156,10 @@ |
2966 | coceri.o: files.o periodic_table.o precision.o units.o |
2967 | compute_dm.o: atomlist.o class_SpData1D.o compute_ebs_shift.o diagon.o |
2968 | compute_dm.o: iodmhs_netcdf.o kpoint_grid.o local_sys.o m_dminim.o m_energies.o |
2969 | -compute_dm.o: m_eo.o m_gamma.o m_hsx.o m_pexsi_driver.o m_rmaxh.o m_spin.o |
2970 | -compute_dm.o: m_steps.o m_transiesta.o m_ts_global_vars.o m_zminim.o |
2971 | -compute_dm.o: normalize_dm.o ordern.o parallel.o precision.o siesta_geom.o |
2972 | -compute_dm.o: siesta_options.o sparse_matrices.o units.o |
2973 | +compute_dm.o: m_eo.o m_hsx.o m_pexsi_driver.o m_rmaxh.o m_spin.o m_steps.o |
2974 | +compute_dm.o: m_transiesta.o m_ts_global_vars.o m_zminim.o normalize_dm.o |
2975 | +compute_dm.o: ordern.o parallel.o precision.o siesta_geom.o siesta_options.o |
2976 | +compute_dm.o: sparse_matrices.o units.o |
2977 | compute_ebs_shift.o: m_mpi_utils.o parallel.o precision.o |
2978 | compute_energies.o: atomlist.o class_SpData1D.o class_SpData2D.o dhscf.o |
2979 | compute_energies.o: files.o m_dipol.o m_energies.o m_mpi_utils.o m_ntm.o |
2980 | @@ -171,8 +171,8 @@ |
2981 | compute_pw_matrix.o: parallel.o precision.o siesta2wannier90.o |
2982 | compute_pw_matrix.o: sparse_matrices.o |
2983 | compute_rhog.o: alloc.o atomlist.o dhscf.o files.o m_dipol.o m_energies.o |
2984 | -compute_rhog.o: m_gamma.o m_ntm.o m_spin.o m_stress.o siesta_geom.o |
2985 | -compute_rhog.o: siesta_options.o sparse_matrices.o |
2986 | +compute_rhog.o: m_ntm.o m_spin.o m_stress.o siesta_geom.o siesta_options.o |
2987 | +compute_rhog.o: sparse_matrices.o |
2988 | conjgr.o: precision.o |
2989 | conjgr_old.o: precision.o |
2990 | coor.o: alloc.o local_sys.o parallel.o precision.o siesta_geom.o units.o |
2991 | @@ -199,13 +199,15 @@ |
2992 | dhscf.o: meshdscf.o meshsubs.o moremeshsubs.o parallel.o parsing.o precision.o |
2993 | dhscf.o: rhofft.o rhoofd.o siesta_options.o units.o vmat.o |
2994 | diag.o: alloc.o diag_option.o local_sys.o parallel.o precision.o |
2995 | -diag2g.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
2996 | +diag2g.o: fermid.o intrinsic_missing.o local_sys.o parallel.o parallelsubs.o |
2997 | +diag2g.o: precision.o |
2998 | diag2k.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
2999 | -diag3g.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
3000 | +diag3g.o: fermid.o intrinsic_missing.o local_sys.o parallel.o parallelsubs.o |
3001 | +diag3g.o: precision.o |
3002 | diag3k.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
3003 | diag_option.o: parallel.o precision.o |
3004 | -diagg.o: alloc.o fermid.o local_sys.o m_spin.o parallel.o parallelsubs.o |
3005 | -diagg.o: precision.o writewave.o |
3006 | +diagg.o: alloc.o fermid.o intrinsic_missing.o local_sys.o m_spin.o parallel.o |
3007 | +diagg.o: parallelsubs.o precision.o writewave.o |
3008 | diagk.o: compute_norm.o fermid.o local_sys.o m_spin.o parallel.o parallelsubs.o |
3009 | diagk.o: precision.o writewave.o |
3010 | diagk_file.o: fermid.o iowfs_netcdf.o local_sys.o parallel.o parallelsubs.o |
3011 | @@ -247,11 +249,11 @@ |
3012 | fft1d.o: local_sys.o parallel.o precision.o |
3013 | final_H_f_stress.o: alloc.o atomlist.o class_SpData2D.o compute_max_diff.o |
3014 | final_H_f_stress.o: dnaefs.o files.o grdsam.o kinefsm.o ldau.o ldau_specs.o |
3015 | -final_H_f_stress.o: local_sys.o m_dipol.o m_energies.o m_forces.o m_gamma.o |
3016 | -final_H_f_stress.o: m_hsx.o m_mpi_utils.o m_ncdf_siesta.o m_ntm.o m_spin.o |
3017 | -final_H_f_stress.o: m_stress.o m_ts_io.o m_ts_kpoints.o m_ts_options.o |
3018 | -final_H_f_stress.o: metaforce.o molecularmechanics.o naefs.o nlefsm.o overfsm.o |
3019 | -final_H_f_stress.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
3020 | +final_H_f_stress.o: local_sys.o m_dipol.o m_energies.o m_forces.o m_hsx.o |
3021 | +final_H_f_stress.o: m_mpi_utils.o m_ncdf_siesta.o m_ntm.o m_spin.o m_stress.o |
3022 | +final_H_f_stress.o: m_ts_io.o m_ts_kpoints.o m_ts_options.o metaforce.o |
3023 | +final_H_f_stress.o: molecularmechanics.o naefs.o nlefsm.o overfsm.o parallel.o |
3024 | +final_H_f_stress.o: siesta_geom.o siesta_options.o sparse_matrices.o |
3025 | final_H_f_stress.o: spinorbit.o units.o |
3026 | find_kgrid.o: alloc.o minvec.o parallel.o precision.o units.o |
3027 | fire_optim.o: alloc.o m_fire.o m_mpi_utils.o parallel.o precision.o |
3028 | @@ -320,8 +322,8 @@ |
3029 | ldau_specs.o: parallel.o precision.o pseudopotential.o radial.o units.o |
3030 | listsc.o: alloc.o |
3031 | local_DOS.o: atomlist.o dhscf.o diagon.o files.o kpoint_grid.o local_sys.o |
3032 | -local_DOS.o: m_energies.o m_eo.o m_forces.o m_gamma.o m_ntm.o m_spin.o |
3033 | -local_DOS.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
3034 | +local_DOS.o: m_energies.o m_eo.o m_forces.o m_ntm.o m_spin.o parallel.o |
3035 | +local_DOS.o: siesta_geom.o siesta_options.o sparse_matrices.o |
3036 | m_broyddj.o: alloc.o local_sys.o m_mpi_utils.o parallel.o precision.o |
3037 | m_broyddj_nocomm.o: alloc.o local_sys.o parallel.o precision.o |
3038 | m_broyden_mixing.o: alloc.o m_broyddj.o m_mpi_utils.o parallel.o precision.o |
3039 | @@ -390,10 +392,10 @@ |
3040 | m_ncdf_io.o: class_OrbitalDistribution.o class_SpData1D.o class_SpData2D.o |
3041 | m_ncdf_io.o: class_Sparsity.o m_io_s.o parallel.o precision.o |
3042 | m_ncdf_siesta.o: atm_types.o atmparams.o atomlist.o class_Sparsity.o files.o |
3043 | -m_ncdf_siesta.o: kpoint_grid.o m_energies.o m_forces.o m_gamma.o m_kinetic.o |
3044 | -m_ncdf_siesta.o: m_ncdf_io.o m_ntm.o m_spin.o m_stress.o m_ts_electype.o |
3045 | -m_ncdf_siesta.o: m_ts_kpoints.o m_ts_options.o parallel.o precision.o radial.o |
3046 | -m_ncdf_siesta.o: siesta_geom.o siesta_options.o sparse_matrices.o timestamp.o |
3047 | +m_ncdf_siesta.o: kpoint_grid.o m_energies.o m_forces.o m_kinetic.o m_ncdf_io.o |
3048 | +m_ncdf_siesta.o: m_ntm.o m_spin.o m_stress.o m_ts_electype.o m_ts_kpoints.o |
3049 | +m_ncdf_siesta.o: m_ts_options.o parallel.o precision.o radial.o siesta_geom.o |
3050 | +m_ncdf_siesta.o: siesta_options.o sparse_matrices.o timestamp.o |
3051 | m_new_dm.o: alloc.o atomlist.o class_Data2D.o class_Fstack_Data1D.o |
3052 | m_new_dm.o: class_Fstack_Pair_Geometry_SpData2D.o class_Geometry.o |
3053 | m_new_dm.o: class_OrbitalDistribution.o class_Pair_Geometry_SpData2D.o |
3054 | @@ -497,7 +499,7 @@ |
3055 | m_ts_electrode.o: parallel.o precision.o units.o |
3056 | m_ts_electype.o: class_OrbitalDistribution.o class_SpData1D.o class_SpData2D.o |
3057 | m_ts_electype.o: class_Sparsity.o create_Sparsity_SC.o geom_helper.o |
3058 | -m_ts_electype.o: intrinsic_missing.o m_geom_box.o m_geom_plane.o |
3059 | +m_ts_electype.o: intrinsic_missing.o m_char.o m_geom_box.o m_geom_plane.o |
3060 | m_ts_electype.o: m_handle_sparse.o m_iodm.o m_os.o m_region.o m_ts_chem_pot.o |
3061 | m_ts_electype.o: m_ts_io.o m_ts_io_ctype.o m_ts_iodm.o parallel.o precision.o |
3062 | m_ts_electype.o: units.o |
3063 | @@ -690,14 +692,13 @@ |
3064 | post_scf_work.o: atomlist.o class_Fstack_Pair_Geometry_SpData2D.o |
3065 | post_scf_work.o: class_Geometry.o class_Pair_Geometry_SpData2D.o compute_dm.o |
3066 | post_scf_work.o: diagon.o final_H_f_stress.o kpoint_grid.o m_dminim.o |
3067 | -post_scf_work.o: m_energies.o m_eo.o m_gamma.o m_spin.o m_steps.o m_zminim.o |
3068 | -post_scf_work.o: mneighb.o parallel.o siesta_geom.o siesta_options.o |
3069 | -post_scf_work.o: sparse_matrices.o |
3070 | +post_scf_work.o: m_energies.o m_eo.o m_spin.o m_steps.o m_zminim.o mneighb.o |
3071 | +post_scf_work.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
3072 | print_spin.o: atomlist.o m_mpi_utils.o m_spin.o parallel.o precision.o |
3073 | print_spin.o: siesta_cml.o sparse_matrices.o |
3074 | printmatrix.o: alloc.o |
3075 | projected_DOS.o: alloc.o atomlist.o kpoint_grid.o kpoint_pdos.o local_sys.o |
3076 | -projected_DOS.o: m_eo.o m_gamma.o m_spin.o parallel.o precision.o siesta_geom.o |
3077 | +projected_DOS.o: m_eo.o m_spin.o parallel.o precision.o siesta_geom.o |
3078 | projected_DOS.o: siesta_options.o sparse_matrices.o units.o |
3079 | propor.o: local_sys.o precision.o |
3080 | proximity_check.o: chemical.o m_ts_global_vars.o mneighb.o parallel.o |
3081 | @@ -747,11 +748,10 @@ |
3082 | setup_H0.o: siesta_geom.o siesta_options.o sparse_matrices.o spinorbit.o |
3083 | setup_hamiltonian.o: alloc.o atmfuncs.o atomlist.o class_SpData1D.o |
3084 | setup_hamiltonian.o: class_SpData2D.o dhscf.o files.o ldau.o ldau_specs.o |
3085 | -setup_hamiltonian.o: local_sys.o m_dipol.o m_energies.o m_gamma.o m_hsx.o |
3086 | -setup_hamiltonian.o: m_mpi_utils.o m_ntm.o m_partial_charges.o m_rhog.o |
3087 | -setup_hamiltonian.o: m_spin.o m_steps.o m_stress.o metaforce.o |
3088 | -setup_hamiltonian.o: molecularmechanics.o parallel.o siesta_geom.o |
3089 | -setup_hamiltonian.o: siesta_options.o sparse_matrices.o |
3090 | +setup_hamiltonian.o: local_sys.o m_dipol.o m_energies.o m_hsx.o m_mpi_utils.o |
3091 | +setup_hamiltonian.o: m_ntm.o m_partial_charges.o m_rhog.o m_spin.o m_steps.o |
3092 | +setup_hamiltonian.o: m_stress.o metaforce.o molecularmechanics.o parallel.o |
3093 | +setup_hamiltonian.o: siesta_geom.o siesta_options.o sparse_matrices.o |
3094 | setup_ordern_indexes.o: alloc.o domain_decom.o parallel.o spatial.o |
3095 | shaper.o: atmfuncs.o mneighb.o precision.o |
3096 | show_distribution.o: atomlist.o local_sys.o parallel.o parallelsubs.o |
3097 | @@ -764,10 +764,10 @@ |
3098 | siesta2wannier90.o: siesta_options.o |
3099 | siesta_analysis.o: alloc.o atomlist.o bands.o basis_enthalpy.o dhscf.o files.o |
3100 | siesta_analysis.o: flook_siesta.o kpoint_grid.o ksv.o ksvinit.o local_DOS.o |
3101 | -siesta_analysis.o: m_dipol.o m_energies.o m_eo.o m_forces.o m_gamma.o |
3102 | -siesta_analysis.o: m_iodm_old.o m_mpi_utils.o m_ntm.o m_partial_charges.o |
3103 | -siesta_analysis.o: m_pexsi_dos.o m_pexsi_local_dos.o m_spin.o m_steps.o |
3104 | -siesta_analysis.o: parallel.o projected_DOS.o siesta2wannier90.o siesta_cml.o |
3105 | +siesta_analysis.o: m_dipol.o m_energies.o m_eo.o m_forces.o m_iodm_old.o |
3106 | +siesta_analysis.o: m_mpi_utils.o m_ntm.o m_partial_charges.o m_pexsi_dos.o |
3107 | +siesta_analysis.o: m_pexsi_local_dos.o m_spin.o m_steps.o parallel.o |
3108 | +siesta_analysis.o: projected_DOS.o siesta2wannier90.o siesta_cml.o |
3109 | siesta_analysis.o: siesta_geom.o siesta_options.o sparse_matrices.o units.o |
3110 | siesta_analysis.o: write_subs.o writewave.o zmatrix.o |
3111 | siesta_cmlsubs.o: files.o m_uuid.o parallel.o siesta_cml.o timestamp.o |
3112 | @@ -798,7 +798,7 @@ |
3113 | siesta_init.o: class_Fstack_Pair_Geometry_SpData2D.o densematrix.o |
3114 | siesta_init.o: diag_option.o files.o flook_siesta.o ioxv.o kpoint_grid.o |
3115 | siesta_init.o: kpoint_pdos.o ksvinit.o local_sys.o m_check_walltime.o m_cite.o |
3116 | -siesta_init.o: m_energies.o m_eo.o m_fixed.o m_forces.o m_gamma.o m_iostruct.o |
3117 | +siesta_init.o: m_energies.o m_eo.o m_fixed.o m_forces.o m_iostruct.o |
3118 | siesta_init.o: m_mpi_utils.o m_new_dm.o m_rmaxh.o m_spin.o m_steps.o |
3119 | siesta_init.o: m_supercell.o m_timer.o m_wallclock.o metaforce.o |
3120 | siesta_init.o: molecularmechanics.o object_debug.o parallel.o parallelsubs.o |
3121 | @@ -830,14 +830,14 @@ |
3122 | state_init.o: class_SpData2D.o class_Sparsity.o create_Sparsity_SC.o |
3123 | state_init.o: domain_decom.o files.o hsparse.o iodm_netcdf.o iodmhs_netcdf.o |
3124 | state_init.o: ioxv.o kpoint_grid.o ldau_specs.o local_sys.o m_energies.o m_eo.o |
3125 | -state_init.o: m_gamma.o m_mixing.o m_mixing_scf.o m_mpi_utils.o m_new_dm.o |
3126 | -state_init.o: m_os.o m_pivot_methods.o m_rmaxh.o m_sparse.o |
3127 | -state_init.o: m_sparsity_handling.o m_spin.o m_steps.o m_supercell.o |
3128 | -state_init.o: m_test_io.o m_ts_charge.o m_ts_electype.o m_ts_global_vars.o |
3129 | -state_init.o: m_ts_io.o m_ts_kpoints.o m_ts_options.o m_ts_sparse.o |
3130 | -state_init.o: m_ts_tri_init.o normalize_dm.o overlap.o parallel.o |
3131 | -state_init.o: proximity_check.o siesta_cml.o siesta_dicts.o siesta_geom.o |
3132 | -state_init.o: siesta_options.o sparse_matrices.o units.o write_subs.o zmatrix.o |
3133 | +state_init.o: m_mixing.o m_mixing_scf.o m_mpi_utils.o m_new_dm.o m_os.o |
3134 | +state_init.o: m_pivot_methods.o m_rmaxh.o m_sparse.o m_sparsity_handling.o |
3135 | +state_init.o: m_spin.o m_steps.o m_supercell.o m_test_io.o m_ts_charge.o |
3136 | +state_init.o: m_ts_electype.o m_ts_global_vars.o m_ts_io.o m_ts_kpoints.o |
3137 | +state_init.o: m_ts_options.o m_ts_sparse.o m_ts_tri_init.o normalize_dm.o |
3138 | +state_init.o: overlap.o parallel.o proximity_check.o siesta_cml.o |
3139 | +state_init.o: siesta_dicts.o siesta_geom.o siesta_options.o sparse_matrices.o |
3140 | +state_init.o: units.o write_subs.o zmatrix.o |
3141 | struct_init.o: alloc.o atmfuncs.o atomlist.o files.o ioxv.o m_exp_coord.o |
3142 | struct_init.o: m_iostruct.o m_mpi_utils.o m_steps.o parallel.o periodic_table.o |
3143 | struct_init.o: siesta_cml.o siesta_geom.o siesta_master.o siesta_options.o |
3144 | |
3145 | === modified file 'Util/TS/TBtrans/Makefile' |
3146 | --- Util/TS/TBtrans/Makefile 2018-06-08 09:23:57 +0000 |
3147 | +++ Util/TS/TBtrans/Makefile 2018-06-26 07:59:48 +0000 |
3148 | @@ -355,7 +355,7 @@ |
3149 | atomlwf.o: spatial.o |
3150 | automatic_cell.o: atm_types.o atmfuncs.o parallel.o precision.o units.o |
3151 | bands.o: alloc.o atmfuncs.o atomlist.o densematrix.o diag.o diag_option.o |
3152 | -bands.o: files.o get_kpoints_scale.o local_sys.o m_gamma.o m_spin.o parallel.o |
3153 | +bands.o: files.o get_kpoints_scale.o local_sys.o m_spin.o parallel.o |
3154 | bands.o: parallelsubs.o precision.o siesta_geom.o writewave.o |
3155 | basis_enthalpy.o: atmfuncs.o atomlist.o precision.o siesta_geom.o units.o |
3156 | basis_io.o: atm_types.o atmparams.o atom_options.o basis_types.o chemical.o |
3157 | @@ -412,10 +412,10 @@ |
3158 | coceri.o: files.o periodic_table.o precision.o units.o |
3159 | compute_dm.o: atomlist.o class_SpData1D.o compute_ebs_shift.o diagon.o |
3160 | compute_dm.o: iodmhs_netcdf.o kpoint_grid.o local_sys.o m_dminim.o m_energies.o |
3161 | -compute_dm.o: m_eo.o m_gamma.o m_hsx.o m_pexsi_driver.o m_rmaxh.o m_spin.o |
3162 | -compute_dm.o: m_steps.o m_transiesta.o m_ts_global_vars.o m_zminim.o |
3163 | -compute_dm.o: normalize_dm.o ordern.o parallel.o precision.o siesta_geom.o |
3164 | -compute_dm.o: siesta_options.o sparse_matrices.o units.o |
3165 | +compute_dm.o: m_eo.o m_hsx.o m_pexsi_driver.o m_rmaxh.o m_spin.o m_steps.o |
3166 | +compute_dm.o: m_transiesta.o m_ts_global_vars.o m_zminim.o normalize_dm.o |
3167 | +compute_dm.o: ordern.o parallel.o precision.o siesta_geom.o siesta_options.o |
3168 | +compute_dm.o: sparse_matrices.o units.o |
3169 | compute_ebs_shift.o: m_mpi_utils.o parallel.o precision.o |
3170 | compute_energies.o: atomlist.o class_SpData1D.o class_SpData2D.o dhscf.o |
3171 | compute_energies.o: files.o m_dipol.o m_energies.o m_mpi_utils.o m_ntm.o |
3172 | @@ -427,8 +427,8 @@ |
3173 | compute_pw_matrix.o: parallel.o precision.o siesta2wannier90.o |
3174 | compute_pw_matrix.o: sparse_matrices.o |
3175 | compute_rhog.o: alloc.o atomlist.o dhscf.o files.o m_dipol.o m_energies.o |
3176 | -compute_rhog.o: m_gamma.o m_ntm.o m_spin.o m_stress.o siesta_geom.o |
3177 | -compute_rhog.o: siesta_options.o sparse_matrices.o |
3178 | +compute_rhog.o: m_ntm.o m_spin.o m_stress.o siesta_geom.o siesta_options.o |
3179 | +compute_rhog.o: sparse_matrices.o |
3180 | conjgr.o: precision.o |
3181 | conjgr_old.o: precision.o |
3182 | coor.o: alloc.o local_sys.o parallel.o precision.o siesta_geom.o units.o |
3183 | @@ -455,13 +455,15 @@ |
3184 | dhscf.o: meshdscf.o meshsubs.o moremeshsubs.o parallel.o parsing.o precision.o |
3185 | dhscf.o: rhofft.o rhoofd.o siesta_options.o units.o vmat.o |
3186 | diag.o: alloc.o diag_option.o local_sys.o parallel.o precision.o |
3187 | -diag2g.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
3188 | +diag2g.o: fermid.o intrinsic_missing.o local_sys.o parallel.o parallelsubs.o |
3189 | +diag2g.o: precision.o |
3190 | diag2k.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
3191 | -diag3g.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
3192 | +diag3g.o: fermid.o intrinsic_missing.o local_sys.o parallel.o parallelsubs.o |
3193 | +diag3g.o: precision.o |
3194 | diag3k.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
3195 | diag_option.o: parallel.o precision.o |
3196 | -diagg.o: alloc.o fermid.o local_sys.o m_spin.o parallel.o parallelsubs.o |
3197 | -diagg.o: precision.o writewave.o |
3198 | +diagg.o: alloc.o fermid.o intrinsic_missing.o local_sys.o m_spin.o parallel.o |
3199 | +diagg.o: parallelsubs.o precision.o writewave.o |
3200 | diagk.o: compute_norm.o fermid.o local_sys.o m_spin.o parallel.o parallelsubs.o |
3201 | diagk.o: precision.o writewave.o |
3202 | diagk_file.o: fermid.o iowfs_netcdf.o local_sys.o parallel.o parallelsubs.o |
3203 | @@ -503,11 +505,11 @@ |
3204 | fft1d.o: local_sys.o parallel.o precision.o |
3205 | final_H_f_stress.o: alloc.o atomlist.o class_SpData2D.o compute_max_diff.o |
3206 | final_H_f_stress.o: dnaefs.o files.o grdsam.o kinefsm.o ldau.o ldau_specs.o |
3207 | -final_H_f_stress.o: local_sys.o m_dipol.o m_energies.o m_forces.o m_gamma.o |
3208 | -final_H_f_stress.o: m_hsx.o m_mpi_utils.o m_ncdf_siesta.o m_ntm.o m_spin.o |
3209 | -final_H_f_stress.o: m_stress.o m_ts_io.o m_ts_kpoints.o m_ts_options.o |
3210 | -final_H_f_stress.o: metaforce.o molecularmechanics.o naefs.o nlefsm.o overfsm.o |
3211 | -final_H_f_stress.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
3212 | +final_H_f_stress.o: local_sys.o m_dipol.o m_energies.o m_forces.o m_hsx.o |
3213 | +final_H_f_stress.o: m_mpi_utils.o m_ncdf_siesta.o m_ntm.o m_spin.o m_stress.o |
3214 | +final_H_f_stress.o: m_ts_io.o m_ts_kpoints.o m_ts_options.o metaforce.o |
3215 | +final_H_f_stress.o: molecularmechanics.o naefs.o nlefsm.o overfsm.o parallel.o |
3216 | +final_H_f_stress.o: siesta_geom.o siesta_options.o sparse_matrices.o |
3217 | final_H_f_stress.o: spinorbit.o units.o |
3218 | find_kgrid.o: alloc.o minvec.o parallel.o precision.o units.o |
3219 | fire_optim.o: alloc.o m_fire.o m_mpi_utils.o parallel.o precision.o |
3220 | @@ -576,8 +578,8 @@ |
3221 | ldau_specs.o: parallel.o precision.o pseudopotential.o radial.o units.o |
3222 | listsc.o: alloc.o |
3223 | local_DOS.o: atomlist.o dhscf.o diagon.o files.o kpoint_grid.o local_sys.o |
3224 | -local_DOS.o: m_energies.o m_eo.o m_forces.o m_gamma.o m_ntm.o m_spin.o |
3225 | -local_DOS.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
3226 | +local_DOS.o: m_energies.o m_eo.o m_forces.o m_ntm.o m_spin.o parallel.o |
3227 | +local_DOS.o: siesta_geom.o siesta_options.o sparse_matrices.o |
3228 | m_broyddj.o: alloc.o local_sys.o m_mpi_utils.o parallel.o precision.o |
3229 | m_broyddj_nocomm.o: alloc.o local_sys.o parallel.o precision.o |
3230 | m_broyden_mixing.o: alloc.o m_broyddj.o m_mpi_utils.o parallel.o precision.o |
3231 | @@ -646,10 +648,10 @@ |
3232 | m_ncdf_io.o: class_OrbitalDistribution.o class_SpData1D.o class_SpData2D.o |
3233 | m_ncdf_io.o: class_Sparsity.o m_io_s.o parallel.o precision.o |
3234 | m_ncdf_siesta.o: atm_types.o atmparams.o atomlist.o class_Sparsity.o files.o |
3235 | -m_ncdf_siesta.o: kpoint_grid.o m_energies.o m_forces.o m_gamma.o m_kinetic.o |
3236 | -m_ncdf_siesta.o: m_ncdf_io.o m_ntm.o m_spin.o m_stress.o m_ts_electype.o |
3237 | -m_ncdf_siesta.o: m_ts_kpoints.o m_ts_options.o parallel.o precision.o radial.o |
3238 | -m_ncdf_siesta.o: siesta_geom.o siesta_options.o sparse_matrices.o timestamp.o |
3239 | +m_ncdf_siesta.o: kpoint_grid.o m_energies.o m_forces.o m_kinetic.o m_ncdf_io.o |
3240 | +m_ncdf_siesta.o: m_ntm.o m_spin.o m_stress.o m_ts_electype.o m_ts_kpoints.o |
3241 | +m_ncdf_siesta.o: m_ts_options.o parallel.o precision.o radial.o siesta_geom.o |
3242 | +m_ncdf_siesta.o: siesta_options.o sparse_matrices.o timestamp.o |
3243 | m_new_dm.o: alloc.o atomlist.o class_Data2D.o class_Fstack_Data1D.o |
3244 | m_new_dm.o: class_Fstack_Pair_Geometry_SpData2D.o class_Geometry.o |
3245 | m_new_dm.o: class_OrbitalDistribution.o class_Pair_Geometry_SpData2D.o |
3246 | @@ -753,7 +755,7 @@ |
3247 | m_ts_electrode.o: parallel.o precision.o units.o |
3248 | m_ts_electype.o: class_OrbitalDistribution.o class_SpData1D.o class_SpData2D.o |
3249 | m_ts_electype.o: class_Sparsity.o create_Sparsity_SC.o geom_helper.o |
3250 | -m_ts_electype.o: intrinsic_missing.o m_geom_box.o m_geom_plane.o |
3251 | +m_ts_electype.o: intrinsic_missing.o m_char.o m_geom_box.o m_geom_plane.o |
3252 | m_ts_electype.o: m_handle_sparse.o m_iodm.o m_os.o m_region.o m_ts_chem_pot.o |
3253 | m_ts_electype.o: m_ts_io.o m_ts_io_ctype.o m_ts_iodm.o parallel.o precision.o |
3254 | m_ts_electype.o: units.o |
3255 | @@ -946,14 +948,13 @@ |
3256 | post_scf_work.o: atomlist.o class_Fstack_Pair_Geometry_SpData2D.o |
3257 | post_scf_work.o: class_Geometry.o class_Pair_Geometry_SpData2D.o compute_dm.o |
3258 | post_scf_work.o: diagon.o final_H_f_stress.o kpoint_grid.o m_dminim.o |
3259 | -post_scf_work.o: m_energies.o m_eo.o m_gamma.o m_spin.o m_steps.o m_zminim.o |
3260 | -post_scf_work.o: mneighb.o parallel.o siesta_geom.o siesta_options.o |
3261 | -post_scf_work.o: sparse_matrices.o |
3262 | +post_scf_work.o: m_energies.o m_eo.o m_spin.o m_steps.o m_zminim.o mneighb.o |
3263 | +post_scf_work.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
3264 | print_spin.o: atomlist.o m_mpi_utils.o m_spin.o parallel.o precision.o |
3265 | print_spin.o: siesta_cml.o sparse_matrices.o |
3266 | printmatrix.o: alloc.o |
3267 | projected_DOS.o: alloc.o atomlist.o kpoint_grid.o kpoint_pdos.o local_sys.o |
3268 | -projected_DOS.o: m_eo.o m_gamma.o m_spin.o parallel.o precision.o siesta_geom.o |
3269 | +projected_DOS.o: m_eo.o m_spin.o parallel.o precision.o siesta_geom.o |
3270 | projected_DOS.o: siesta_options.o sparse_matrices.o units.o |
3271 | propor.o: local_sys.o precision.o |
3272 | proximity_check.o: chemical.o m_ts_global_vars.o mneighb.o parallel.o |
3273 | @@ -1003,11 +1004,10 @@ |
3274 | setup_H0.o: siesta_geom.o siesta_options.o sparse_matrices.o spinorbit.o |
3275 | setup_hamiltonian.o: alloc.o atmfuncs.o atomlist.o class_SpData1D.o |
3276 | setup_hamiltonian.o: class_SpData2D.o dhscf.o files.o ldau.o ldau_specs.o |
3277 | -setup_hamiltonian.o: local_sys.o m_dipol.o m_energies.o m_gamma.o m_hsx.o |
3278 | -setup_hamiltonian.o: m_mpi_utils.o m_ntm.o m_partial_charges.o m_rhog.o |
3279 | -setup_hamiltonian.o: m_spin.o m_steps.o m_stress.o metaforce.o |
3280 | -setup_hamiltonian.o: molecularmechanics.o parallel.o siesta_geom.o |
3281 | -setup_hamiltonian.o: siesta_options.o sparse_matrices.o |
3282 | +setup_hamiltonian.o: local_sys.o m_dipol.o m_energies.o m_hsx.o m_mpi_utils.o |
3283 | +setup_hamiltonian.o: m_ntm.o m_partial_charges.o m_rhog.o m_spin.o m_steps.o |
3284 | +setup_hamiltonian.o: m_stress.o metaforce.o molecularmechanics.o parallel.o |
3285 | +setup_hamiltonian.o: siesta_geom.o siesta_options.o sparse_matrices.o |
3286 | setup_ordern_indexes.o: alloc.o domain_decom.o parallel.o spatial.o |
3287 | shaper.o: atmfuncs.o mneighb.o precision.o |
3288 | show_distribution.o: atomlist.o local_sys.o parallel.o parallelsubs.o |
3289 | @@ -1020,10 +1020,10 @@ |
3290 | siesta2wannier90.o: siesta_options.o |
3291 | siesta_analysis.o: alloc.o atomlist.o bands.o basis_enthalpy.o dhscf.o files.o |
3292 | siesta_analysis.o: flook_siesta.o kpoint_grid.o ksv.o ksvinit.o local_DOS.o |
3293 | -siesta_analysis.o: m_dipol.o m_energies.o m_eo.o m_forces.o m_gamma.o |
3294 | -siesta_analysis.o: m_iodm_old.o m_mpi_utils.o m_ntm.o m_partial_charges.o |
3295 | -siesta_analysis.o: m_pexsi_dos.o m_pexsi_local_dos.o m_spin.o m_steps.o |
3296 | -siesta_analysis.o: parallel.o projected_DOS.o siesta2wannier90.o siesta_cml.o |
3297 | +siesta_analysis.o: m_dipol.o m_energies.o m_eo.o m_forces.o m_iodm_old.o |
3298 | +siesta_analysis.o: m_mpi_utils.o m_ntm.o m_partial_charges.o m_pexsi_dos.o |
3299 | +siesta_analysis.o: m_pexsi_local_dos.o m_spin.o m_steps.o parallel.o |
3300 | +siesta_analysis.o: projected_DOS.o siesta2wannier90.o siesta_cml.o |
3301 | siesta_analysis.o: siesta_geom.o siesta_options.o sparse_matrices.o units.o |
3302 | siesta_analysis.o: write_subs.o writewave.o zmatrix.o |
3303 | siesta_cmlsubs.o: files.o m_uuid.o parallel.o siesta_cml.o timestamp.o |
3304 | @@ -1054,7 +1054,7 @@ |
3305 | siesta_init.o: class_Fstack_Pair_Geometry_SpData2D.o densematrix.o |
3306 | siesta_init.o: diag_option.o files.o flook_siesta.o ioxv.o kpoint_grid.o |
3307 | siesta_init.o: kpoint_pdos.o ksvinit.o local_sys.o m_check_walltime.o m_cite.o |
3308 | -siesta_init.o: m_energies.o m_eo.o m_fixed.o m_forces.o m_gamma.o m_iostruct.o |
3309 | +siesta_init.o: m_energies.o m_eo.o m_fixed.o m_forces.o m_iostruct.o |
3310 | siesta_init.o: m_mpi_utils.o m_new_dm.o m_rmaxh.o m_spin.o m_steps.o |
3311 | siesta_init.o: m_supercell.o m_timer.o m_wallclock.o metaforce.o |
3312 | siesta_init.o: molecularmechanics.o object_debug.o parallel.o parallelsubs.o |
3313 | @@ -1086,14 +1086,14 @@ |
3314 | state_init.o: class_SpData2D.o class_Sparsity.o create_Sparsity_SC.o |
3315 | state_init.o: domain_decom.o files.o hsparse.o iodm_netcdf.o iodmhs_netcdf.o |
3316 | state_init.o: ioxv.o kpoint_grid.o ldau_specs.o local_sys.o m_energies.o m_eo.o |
3317 | -state_init.o: m_gamma.o m_mixing.o m_mixing_scf.o m_mpi_utils.o m_new_dm.o |
3318 | -state_init.o: m_os.o m_pivot_methods.o m_rmaxh.o m_sparse.o |
3319 | -state_init.o: m_sparsity_handling.o m_spin.o m_steps.o m_supercell.o |
3320 | -state_init.o: m_test_io.o m_ts_charge.o m_ts_electype.o m_ts_global_vars.o |
3321 | -state_init.o: m_ts_io.o m_ts_kpoints.o m_ts_options.o m_ts_sparse.o |
3322 | -state_init.o: m_ts_tri_init.o normalize_dm.o overlap.o parallel.o |
3323 | -state_init.o: proximity_check.o siesta_cml.o siesta_dicts.o siesta_geom.o |
3324 | -state_init.o: siesta_options.o sparse_matrices.o units.o write_subs.o zmatrix.o |
3325 | +state_init.o: m_mixing.o m_mixing_scf.o m_mpi_utils.o m_new_dm.o m_os.o |
3326 | +state_init.o: m_pivot_methods.o m_rmaxh.o m_sparse.o m_sparsity_handling.o |
3327 | +state_init.o: m_spin.o m_steps.o m_supercell.o m_test_io.o m_ts_charge.o |
3328 | +state_init.o: m_ts_electype.o m_ts_global_vars.o m_ts_io.o m_ts_kpoints.o |
3329 | +state_init.o: m_ts_options.o m_ts_sparse.o m_ts_tri_init.o normalize_dm.o |
3330 | +state_init.o: overlap.o parallel.o proximity_check.o siesta_cml.o |
3331 | +state_init.o: siesta_dicts.o siesta_geom.o siesta_options.o sparse_matrices.o |
3332 | +state_init.o: units.o write_subs.o zmatrix.o |
3333 | struct_init.o: alloc.o atmfuncs.o atomlist.o files.o ioxv.o m_exp_coord.o |
3334 | struct_init.o: m_iostruct.o m_mpi_utils.o m_steps.o parallel.o periodic_table.o |
3335 | struct_init.o: siesta_cml.o siesta_geom.o siesta_master.o siesta_options.o |
3336 | |
3337 | === modified file 'Util/TS/ts2ts/Makefile' |
3338 | --- Util/TS/ts2ts/Makefile 2018-06-08 09:23:57 +0000 |
3339 | +++ Util/TS/ts2ts/Makefile 2018-06-26 07:59:48 +0000 |
3340 | @@ -92,7 +92,7 @@ |
3341 | atomlwf.o: spatial.o |
3342 | automatic_cell.o: atm_types.o atmfuncs.o parallel.o precision.o units.o |
3343 | bands.o: alloc.o atmfuncs.o atomlist.o densematrix.o diag.o diag_option.o |
3344 | -bands.o: files.o get_kpoints_scale.o local_sys.o m_gamma.o m_spin.o parallel.o |
3345 | +bands.o: files.o get_kpoints_scale.o local_sys.o m_spin.o parallel.o |
3346 | bands.o: parallelsubs.o precision.o siesta_geom.o writewave.o |
3347 | basis_enthalpy.o: atmfuncs.o atomlist.o precision.o siesta_geom.o units.o |
3348 | basis_io.o: atm_types.o atmparams.o atom_options.o basis_types.o chemical.o |
3349 | @@ -149,10 +149,10 @@ |
3350 | coceri.o: files.o periodic_table.o precision.o units.o |
3351 | compute_dm.o: atomlist.o class_SpData1D.o compute_ebs_shift.o diagon.o |
3352 | compute_dm.o: iodmhs_netcdf.o kpoint_grid.o local_sys.o m_dminim.o m_energies.o |
3353 | -compute_dm.o: m_eo.o m_gamma.o m_hsx.o m_pexsi_driver.o m_rmaxh.o m_spin.o |
3354 | -compute_dm.o: m_steps.o m_transiesta.o m_ts_global_vars.o m_zminim.o |
3355 | -compute_dm.o: normalize_dm.o ordern.o parallel.o precision.o siesta_geom.o |
3356 | -compute_dm.o: siesta_options.o sparse_matrices.o units.o |
3357 | +compute_dm.o: m_eo.o m_hsx.o m_pexsi_driver.o m_rmaxh.o m_spin.o m_steps.o |
3358 | +compute_dm.o: m_transiesta.o m_ts_global_vars.o m_zminim.o normalize_dm.o |
3359 | +compute_dm.o: ordern.o parallel.o precision.o siesta_geom.o siesta_options.o |
3360 | +compute_dm.o: sparse_matrices.o units.o |
3361 | compute_ebs_shift.o: m_mpi_utils.o parallel.o precision.o |
3362 | compute_energies.o: atomlist.o class_SpData1D.o class_SpData2D.o dhscf.o |
3363 | compute_energies.o: files.o m_dipol.o m_energies.o m_mpi_utils.o m_ntm.o |
3364 | @@ -164,8 +164,8 @@ |
3365 | compute_pw_matrix.o: parallel.o precision.o siesta2wannier90.o |
3366 | compute_pw_matrix.o: sparse_matrices.o |
3367 | compute_rhog.o: alloc.o atomlist.o dhscf.o files.o m_dipol.o m_energies.o |
3368 | -compute_rhog.o: m_gamma.o m_ntm.o m_spin.o m_stress.o siesta_geom.o |
3369 | -compute_rhog.o: siesta_options.o sparse_matrices.o |
3370 | +compute_rhog.o: m_ntm.o m_spin.o m_stress.o siesta_geom.o siesta_options.o |
3371 | +compute_rhog.o: sparse_matrices.o |
3372 | conjgr.o: precision.o |
3373 | conjgr_old.o: precision.o |
3374 | coor.o: alloc.o local_sys.o parallel.o precision.o siesta_geom.o units.o |
3375 | @@ -192,13 +192,15 @@ |
3376 | dhscf.o: meshdscf.o meshsubs.o moremeshsubs.o parallel.o parsing.o precision.o |
3377 | dhscf.o: rhofft.o rhoofd.o siesta_options.o units.o vmat.o |
3378 | diag.o: alloc.o diag_option.o local_sys.o parallel.o precision.o |
3379 | -diag2g.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
3380 | +diag2g.o: fermid.o intrinsic_missing.o local_sys.o parallel.o parallelsubs.o |
3381 | +diag2g.o: precision.o |
3382 | diag2k.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
3383 | -diag3g.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
3384 | +diag3g.o: fermid.o intrinsic_missing.o local_sys.o parallel.o parallelsubs.o |
3385 | +diag3g.o: precision.o |
3386 | diag3k.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
3387 | diag_option.o: parallel.o precision.o |
3388 | -diagg.o: alloc.o fermid.o local_sys.o m_spin.o parallel.o parallelsubs.o |
3389 | -diagg.o: precision.o writewave.o |
3390 | +diagg.o: alloc.o fermid.o intrinsic_missing.o local_sys.o m_spin.o parallel.o |
3391 | +diagg.o: parallelsubs.o precision.o writewave.o |
3392 | diagk.o: compute_norm.o fermid.o local_sys.o m_spin.o parallel.o parallelsubs.o |
3393 | diagk.o: precision.o writewave.o |
3394 | diagk_file.o: fermid.o iowfs_netcdf.o local_sys.o parallel.o parallelsubs.o |
3395 | @@ -240,11 +242,11 @@ |
3396 | fft1d.o: local_sys.o parallel.o precision.o |
3397 | final_H_f_stress.o: alloc.o atomlist.o class_SpData2D.o compute_max_diff.o |
3398 | final_H_f_stress.o: dnaefs.o files.o grdsam.o kinefsm.o ldau.o ldau_specs.o |
3399 | -final_H_f_stress.o: local_sys.o m_dipol.o m_energies.o m_forces.o m_gamma.o |
3400 | -final_H_f_stress.o: m_hsx.o m_mpi_utils.o m_ncdf_siesta.o m_ntm.o m_spin.o |
3401 | -final_H_f_stress.o: m_stress.o m_ts_io.o m_ts_kpoints.o m_ts_options.o |
3402 | -final_H_f_stress.o: metaforce.o molecularmechanics.o naefs.o nlefsm.o overfsm.o |
3403 | -final_H_f_stress.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
3404 | +final_H_f_stress.o: local_sys.o m_dipol.o m_energies.o m_forces.o m_hsx.o |
3405 | +final_H_f_stress.o: m_mpi_utils.o m_ncdf_siesta.o m_ntm.o m_spin.o m_stress.o |
3406 | +final_H_f_stress.o: m_ts_io.o m_ts_kpoints.o m_ts_options.o metaforce.o |
3407 | +final_H_f_stress.o: molecularmechanics.o naefs.o nlefsm.o overfsm.o parallel.o |
3408 | +final_H_f_stress.o: siesta_geom.o siesta_options.o sparse_matrices.o |
3409 | final_H_f_stress.o: spinorbit.o units.o |
3410 | find_kgrid.o: alloc.o minvec.o parallel.o precision.o units.o |
3411 | fire_optim.o: alloc.o m_fire.o m_mpi_utils.o parallel.o precision.o |
3412 | @@ -313,8 +315,8 @@ |
3413 | ldau_specs.o: parallel.o precision.o pseudopotential.o radial.o units.o |
3414 | listsc.o: alloc.o |
3415 | local_DOS.o: atomlist.o dhscf.o diagon.o files.o kpoint_grid.o local_sys.o |
3416 | -local_DOS.o: m_energies.o m_eo.o m_forces.o m_gamma.o m_ntm.o m_spin.o |
3417 | -local_DOS.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
3418 | +local_DOS.o: m_energies.o m_eo.o m_forces.o m_ntm.o m_spin.o parallel.o |
3419 | +local_DOS.o: siesta_geom.o siesta_options.o sparse_matrices.o |
3420 | m_broyddj.o: alloc.o local_sys.o m_mpi_utils.o parallel.o precision.o |
3421 | m_broyddj_nocomm.o: alloc.o local_sys.o parallel.o precision.o |
3422 | m_broyden_mixing.o: alloc.o m_broyddj.o m_mpi_utils.o parallel.o precision.o |
3423 | @@ -383,10 +385,10 @@ |
3424 | m_ncdf_io.o: class_OrbitalDistribution.o class_SpData1D.o class_SpData2D.o |
3425 | m_ncdf_io.o: class_Sparsity.o m_io_s.o parallel.o precision.o |
3426 | m_ncdf_siesta.o: atm_types.o atmparams.o atomlist.o class_Sparsity.o files.o |
3427 | -m_ncdf_siesta.o: kpoint_grid.o m_energies.o m_forces.o m_gamma.o m_kinetic.o |
3428 | -m_ncdf_siesta.o: m_ncdf_io.o m_ntm.o m_spin.o m_stress.o m_ts_electype.o |
3429 | -m_ncdf_siesta.o: m_ts_kpoints.o m_ts_options.o parallel.o precision.o radial.o |
3430 | -m_ncdf_siesta.o: siesta_geom.o siesta_options.o sparse_matrices.o timestamp.o |
3431 | +m_ncdf_siesta.o: kpoint_grid.o m_energies.o m_forces.o m_kinetic.o m_ncdf_io.o |
3432 | +m_ncdf_siesta.o: m_ntm.o m_spin.o m_stress.o m_ts_electype.o m_ts_kpoints.o |
3433 | +m_ncdf_siesta.o: m_ts_options.o parallel.o precision.o radial.o siesta_geom.o |
3434 | +m_ncdf_siesta.o: siesta_options.o sparse_matrices.o timestamp.o |
3435 | m_new_dm.o: alloc.o atomlist.o class_Data2D.o class_Fstack_Data1D.o |
3436 | m_new_dm.o: class_Fstack_Pair_Geometry_SpData2D.o class_Geometry.o |
3437 | m_new_dm.o: class_OrbitalDistribution.o class_Pair_Geometry_SpData2D.o |
3438 | @@ -490,7 +492,7 @@ |
3439 | m_ts_electrode.o: parallel.o precision.o units.o |
3440 | m_ts_electype.o: class_OrbitalDistribution.o class_SpData1D.o class_SpData2D.o |
3441 | m_ts_electype.o: class_Sparsity.o create_Sparsity_SC.o geom_helper.o |
3442 | -m_ts_electype.o: intrinsic_missing.o m_geom_box.o m_geom_plane.o |
3443 | +m_ts_electype.o: intrinsic_missing.o m_char.o m_geom_box.o m_geom_plane.o |
3444 | m_ts_electype.o: m_handle_sparse.o m_iodm.o m_os.o m_region.o m_ts_chem_pot.o |
3445 | m_ts_electype.o: m_ts_io.o m_ts_io_ctype.o m_ts_iodm.o parallel.o precision.o |
3446 | m_ts_electype.o: units.o |
3447 | @@ -683,14 +685,13 @@ |
3448 | post_scf_work.o: atomlist.o class_Fstack_Pair_Geometry_SpData2D.o |
3449 | post_scf_work.o: class_Geometry.o class_Pair_Geometry_SpData2D.o compute_dm.o |
3450 | post_scf_work.o: diagon.o final_H_f_stress.o kpoint_grid.o m_dminim.o |
3451 | -post_scf_work.o: m_energies.o m_eo.o m_gamma.o m_spin.o m_steps.o m_zminim.o |
3452 | -post_scf_work.o: mneighb.o parallel.o siesta_geom.o siesta_options.o |
3453 | -post_scf_work.o: sparse_matrices.o |
3454 | +post_scf_work.o: m_energies.o m_eo.o m_spin.o m_steps.o m_zminim.o mneighb.o |
3455 | +post_scf_work.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
3456 | print_spin.o: atomlist.o m_mpi_utils.o m_spin.o parallel.o precision.o |
3457 | print_spin.o: siesta_cml.o sparse_matrices.o |
3458 | printmatrix.o: alloc.o |
3459 | projected_DOS.o: alloc.o atomlist.o kpoint_grid.o kpoint_pdos.o local_sys.o |
3460 | -projected_DOS.o: m_eo.o m_gamma.o m_spin.o parallel.o precision.o siesta_geom.o |
3461 | +projected_DOS.o: m_eo.o m_spin.o parallel.o precision.o siesta_geom.o |
3462 | projected_DOS.o: siesta_options.o sparse_matrices.o units.o |
3463 | propor.o: local_sys.o precision.o |
3464 | proximity_check.o: chemical.o m_ts_global_vars.o mneighb.o parallel.o |
3465 | @@ -740,11 +741,10 @@ |
3466 | setup_H0.o: siesta_geom.o siesta_options.o sparse_matrices.o spinorbit.o |
3467 | setup_hamiltonian.o: alloc.o atmfuncs.o atomlist.o class_SpData1D.o |
3468 | setup_hamiltonian.o: class_SpData2D.o dhscf.o files.o ldau.o ldau_specs.o |
3469 | -setup_hamiltonian.o: local_sys.o m_dipol.o m_energies.o m_gamma.o m_hsx.o |
3470 | -setup_hamiltonian.o: m_mpi_utils.o m_ntm.o m_partial_charges.o m_rhog.o |
3471 | -setup_hamiltonian.o: m_spin.o m_steps.o m_stress.o metaforce.o |
3472 | -setup_hamiltonian.o: molecularmechanics.o parallel.o siesta_geom.o |
3473 | -setup_hamiltonian.o: siesta_options.o sparse_matrices.o |
3474 | +setup_hamiltonian.o: local_sys.o m_dipol.o m_energies.o m_hsx.o m_mpi_utils.o |
3475 | +setup_hamiltonian.o: m_ntm.o m_partial_charges.o m_rhog.o m_spin.o m_steps.o |
3476 | +setup_hamiltonian.o: m_stress.o metaforce.o molecularmechanics.o parallel.o |
3477 | +setup_hamiltonian.o: siesta_geom.o siesta_options.o sparse_matrices.o |
3478 | setup_ordern_indexes.o: alloc.o domain_decom.o parallel.o spatial.o |
3479 | shaper.o: atmfuncs.o mneighb.o precision.o |
3480 | show_distribution.o: atomlist.o local_sys.o parallel.o parallelsubs.o |
3481 | @@ -757,10 +757,10 @@ |
3482 | siesta2wannier90.o: siesta_options.o |
3483 | siesta_analysis.o: alloc.o atomlist.o bands.o basis_enthalpy.o dhscf.o files.o |
3484 | siesta_analysis.o: flook_siesta.o kpoint_grid.o ksv.o ksvinit.o local_DOS.o |
3485 | -siesta_analysis.o: m_dipol.o m_energies.o m_eo.o m_forces.o m_gamma.o |
3486 | -siesta_analysis.o: m_iodm_old.o m_mpi_utils.o m_ntm.o m_partial_charges.o |
3487 | -siesta_analysis.o: m_pexsi_dos.o m_pexsi_local_dos.o m_spin.o m_steps.o |
3488 | -siesta_analysis.o: parallel.o projected_DOS.o siesta2wannier90.o siesta_cml.o |
3489 | +siesta_analysis.o: m_dipol.o m_energies.o m_eo.o m_forces.o m_iodm_old.o |
3490 | +siesta_analysis.o: m_mpi_utils.o m_ntm.o m_partial_charges.o m_pexsi_dos.o |
3491 | +siesta_analysis.o: m_pexsi_local_dos.o m_spin.o m_steps.o parallel.o |
3492 | +siesta_analysis.o: projected_DOS.o siesta2wannier90.o siesta_cml.o |
3493 | siesta_analysis.o: siesta_geom.o siesta_options.o sparse_matrices.o units.o |
3494 | siesta_analysis.o: write_subs.o writewave.o zmatrix.o |
3495 | siesta_cmlsubs.o: files.o m_uuid.o parallel.o siesta_cml.o timestamp.o |
3496 | @@ -791,7 +791,7 @@ |
3497 | siesta_init.o: class_Fstack_Pair_Geometry_SpData2D.o densematrix.o |
3498 | siesta_init.o: diag_option.o files.o flook_siesta.o ioxv.o kpoint_grid.o |
3499 | siesta_init.o: kpoint_pdos.o ksvinit.o local_sys.o m_check_walltime.o m_cite.o |
3500 | -siesta_init.o: m_energies.o m_eo.o m_fixed.o m_forces.o m_gamma.o m_iostruct.o |
3501 | +siesta_init.o: m_energies.o m_eo.o m_fixed.o m_forces.o m_iostruct.o |
3502 | siesta_init.o: m_mpi_utils.o m_new_dm.o m_rmaxh.o m_spin.o m_steps.o |
3503 | siesta_init.o: m_supercell.o m_timer.o m_wallclock.o metaforce.o |
3504 | siesta_init.o: molecularmechanics.o object_debug.o parallel.o parallelsubs.o |
3505 | @@ -823,14 +823,14 @@ |
3506 | state_init.o: class_SpData2D.o class_Sparsity.o create_Sparsity_SC.o |
3507 | state_init.o: domain_decom.o files.o hsparse.o iodm_netcdf.o iodmhs_netcdf.o |
3508 | state_init.o: ioxv.o kpoint_grid.o ldau_specs.o local_sys.o m_energies.o m_eo.o |
3509 | -state_init.o: m_gamma.o m_mixing.o m_mixing_scf.o m_mpi_utils.o m_new_dm.o |
3510 | -state_init.o: m_os.o m_pivot_methods.o m_rmaxh.o m_sparse.o |
3511 | -state_init.o: m_sparsity_handling.o m_spin.o m_steps.o m_supercell.o |
3512 | -state_init.o: m_test_io.o m_ts_charge.o m_ts_electype.o m_ts_global_vars.o |
3513 | -state_init.o: m_ts_io.o m_ts_kpoints.o m_ts_options.o m_ts_sparse.o |
3514 | -state_init.o: m_ts_tri_init.o normalize_dm.o overlap.o parallel.o |
3515 | -state_init.o: proximity_check.o siesta_cml.o siesta_dicts.o siesta_geom.o |
3516 | -state_init.o: siesta_options.o sparse_matrices.o units.o write_subs.o zmatrix.o |
3517 | +state_init.o: m_mixing.o m_mixing_scf.o m_mpi_utils.o m_new_dm.o m_os.o |
3518 | +state_init.o: m_pivot_methods.o m_rmaxh.o m_sparse.o m_sparsity_handling.o |
3519 | +state_init.o: m_spin.o m_steps.o m_supercell.o m_test_io.o m_ts_charge.o |
3520 | +state_init.o: m_ts_electype.o m_ts_global_vars.o m_ts_io.o m_ts_kpoints.o |
3521 | +state_init.o: m_ts_options.o m_ts_sparse.o m_ts_tri_init.o normalize_dm.o |
3522 | +state_init.o: overlap.o parallel.o proximity_check.o siesta_cml.o |
3523 | +state_init.o: siesta_dicts.o siesta_geom.o siesta_options.o sparse_matrices.o |
3524 | +state_init.o: units.o write_subs.o zmatrix.o |
3525 | struct_init.o: alloc.o atmfuncs.o atomlist.o files.o ioxv.o m_exp_coord.o |
3526 | struct_init.o: m_iostruct.o m_mpi_utils.o m_steps.o parallel.o periodic_table.o |
3527 | struct_init.o: siesta_cml.o siesta_geom.o siesta_master.o siesta_options.o |
3528 | |
3529 | === modified file 'Util/TS/tshs2tshs/Makefile' |
3530 | --- Util/TS/tshs2tshs/Makefile 2018-06-08 09:23:57 +0000 |
3531 | +++ Util/TS/tshs2tshs/Makefile 2018-06-26 07:59:48 +0000 |
3532 | @@ -158,7 +158,7 @@ |
3533 | atomlwf.o: spatial.o |
3534 | automatic_cell.o: atm_types.o atmfuncs.o parallel.o precision.o units.o |
3535 | bands.o: alloc.o atmfuncs.o atomlist.o densematrix.o diag.o diag_option.o |
3536 | -bands.o: files.o get_kpoints_scale.o local_sys.o m_gamma.o m_spin.o parallel.o |
3537 | +bands.o: files.o get_kpoints_scale.o local_sys.o m_spin.o parallel.o |
3538 | bands.o: parallelsubs.o precision.o siesta_geom.o writewave.o |
3539 | basis_enthalpy.o: atmfuncs.o atomlist.o precision.o siesta_geom.o units.o |
3540 | basis_io.o: atm_types.o atmparams.o atom_options.o basis_types.o chemical.o |
3541 | @@ -215,10 +215,10 @@ |
3542 | coceri.o: files.o periodic_table.o precision.o units.o |
3543 | compute_dm.o: atomlist.o class_SpData1D.o compute_ebs_shift.o diagon.o |
3544 | compute_dm.o: iodmhs_netcdf.o kpoint_grid.o local_sys.o m_dminim.o m_energies.o |
3545 | -compute_dm.o: m_eo.o m_gamma.o m_hsx.o m_pexsi_driver.o m_rmaxh.o m_spin.o |
3546 | -compute_dm.o: m_steps.o m_transiesta.o m_ts_global_vars.o m_zminim.o |
3547 | -compute_dm.o: normalize_dm.o ordern.o parallel.o precision.o siesta_geom.o |
3548 | -compute_dm.o: siesta_options.o sparse_matrices.o units.o |
3549 | +compute_dm.o: m_eo.o m_hsx.o m_pexsi_driver.o m_rmaxh.o m_spin.o m_steps.o |
3550 | +compute_dm.o: m_transiesta.o m_ts_global_vars.o m_zminim.o normalize_dm.o |
3551 | +compute_dm.o: ordern.o parallel.o precision.o siesta_geom.o siesta_options.o |
3552 | +compute_dm.o: sparse_matrices.o units.o |
3553 | compute_ebs_shift.o: m_mpi_utils.o parallel.o precision.o |
3554 | compute_energies.o: atomlist.o class_SpData1D.o class_SpData2D.o dhscf.o |
3555 | compute_energies.o: files.o m_dipol.o m_energies.o m_mpi_utils.o m_ntm.o |
3556 | @@ -230,8 +230,8 @@ |
3557 | compute_pw_matrix.o: parallel.o precision.o siesta2wannier90.o |
3558 | compute_pw_matrix.o: sparse_matrices.o |
3559 | compute_rhog.o: alloc.o atomlist.o dhscf.o files.o m_dipol.o m_energies.o |
3560 | -compute_rhog.o: m_gamma.o m_ntm.o m_spin.o m_stress.o siesta_geom.o |
3561 | -compute_rhog.o: siesta_options.o sparse_matrices.o |
3562 | +compute_rhog.o: m_ntm.o m_spin.o m_stress.o siesta_geom.o siesta_options.o |
3563 | +compute_rhog.o: sparse_matrices.o |
3564 | conjgr.o: precision.o |
3565 | conjgr_old.o: precision.o |
3566 | coor.o: alloc.o local_sys.o parallel.o precision.o siesta_geom.o units.o |
3567 | @@ -258,13 +258,15 @@ |
3568 | dhscf.o: meshdscf.o meshsubs.o moremeshsubs.o parallel.o parsing.o precision.o |
3569 | dhscf.o: rhofft.o rhoofd.o siesta_options.o units.o vmat.o |
3570 | diag.o: alloc.o diag_option.o local_sys.o parallel.o precision.o |
3571 | -diag2g.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
3572 | +diag2g.o: fermid.o intrinsic_missing.o local_sys.o parallel.o parallelsubs.o |
3573 | +diag2g.o: precision.o |
3574 | diag2k.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
3575 | -diag3g.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
3576 | +diag3g.o: fermid.o intrinsic_missing.o local_sys.o parallel.o parallelsubs.o |
3577 | +diag3g.o: precision.o |
3578 | diag3k.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
3579 | diag_option.o: parallel.o precision.o |
3580 | -diagg.o: alloc.o fermid.o local_sys.o m_spin.o parallel.o parallelsubs.o |
3581 | -diagg.o: precision.o writewave.o |
3582 | +diagg.o: alloc.o fermid.o intrinsic_missing.o local_sys.o m_spin.o parallel.o |
3583 | +diagg.o: parallelsubs.o precision.o writewave.o |
3584 | diagk.o: compute_norm.o fermid.o local_sys.o m_spin.o parallel.o parallelsubs.o |
3585 | diagk.o: precision.o writewave.o |
3586 | diagk_file.o: fermid.o iowfs_netcdf.o local_sys.o parallel.o parallelsubs.o |
3587 | @@ -306,11 +308,11 @@ |
3588 | fft1d.o: local_sys.o parallel.o precision.o |
3589 | final_H_f_stress.o: alloc.o atomlist.o class_SpData2D.o compute_max_diff.o |
3590 | final_H_f_stress.o: dnaefs.o files.o grdsam.o kinefsm.o ldau.o ldau_specs.o |
3591 | -final_H_f_stress.o: local_sys.o m_dipol.o m_energies.o m_forces.o m_gamma.o |
3592 | -final_H_f_stress.o: m_hsx.o m_mpi_utils.o m_ncdf_siesta.o m_ntm.o m_spin.o |
3593 | -final_H_f_stress.o: m_stress.o m_ts_io.o m_ts_kpoints.o m_ts_options.o |
3594 | -final_H_f_stress.o: metaforce.o molecularmechanics.o naefs.o nlefsm.o overfsm.o |
3595 | -final_H_f_stress.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
3596 | +final_H_f_stress.o: local_sys.o m_dipol.o m_energies.o m_forces.o m_hsx.o |
3597 | +final_H_f_stress.o: m_mpi_utils.o m_ncdf_siesta.o m_ntm.o m_spin.o m_stress.o |
3598 | +final_H_f_stress.o: m_ts_io.o m_ts_kpoints.o m_ts_options.o metaforce.o |
3599 | +final_H_f_stress.o: molecularmechanics.o naefs.o nlefsm.o overfsm.o parallel.o |
3600 | +final_H_f_stress.o: siesta_geom.o siesta_options.o sparse_matrices.o |
3601 | final_H_f_stress.o: spinorbit.o units.o |
3602 | find_kgrid.o: alloc.o minvec.o parallel.o precision.o units.o |
3603 | fire_optim.o: alloc.o m_fire.o m_mpi_utils.o parallel.o precision.o |
3604 | @@ -379,8 +381,8 @@ |
3605 | ldau_specs.o: parallel.o precision.o pseudopotential.o radial.o units.o |
3606 | listsc.o: alloc.o |
3607 | local_DOS.o: atomlist.o dhscf.o diagon.o files.o kpoint_grid.o local_sys.o |
3608 | -local_DOS.o: m_energies.o m_eo.o m_forces.o m_gamma.o m_ntm.o m_spin.o |
3609 | -local_DOS.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
3610 | +local_DOS.o: m_energies.o m_eo.o m_forces.o m_ntm.o m_spin.o parallel.o |
3611 | +local_DOS.o: siesta_geom.o siesta_options.o sparse_matrices.o |
3612 | m_broyddj.o: alloc.o local_sys.o m_mpi_utils.o parallel.o precision.o |
3613 | m_broyddj_nocomm.o: alloc.o local_sys.o parallel.o precision.o |
3614 | m_broyden_mixing.o: alloc.o m_broyddj.o m_mpi_utils.o parallel.o precision.o |
3615 | @@ -449,10 +451,10 @@ |
3616 | m_ncdf_io.o: class_OrbitalDistribution.o class_SpData1D.o class_SpData2D.o |
3617 | m_ncdf_io.o: class_Sparsity.o m_io_s.o parallel.o precision.o |
3618 | m_ncdf_siesta.o: atm_types.o atmparams.o atomlist.o class_Sparsity.o files.o |
3619 | -m_ncdf_siesta.o: kpoint_grid.o m_energies.o m_forces.o m_gamma.o m_kinetic.o |
3620 | -m_ncdf_siesta.o: m_ncdf_io.o m_ntm.o m_spin.o m_stress.o m_ts_electype.o |
3621 | -m_ncdf_siesta.o: m_ts_kpoints.o m_ts_options.o parallel.o precision.o radial.o |
3622 | -m_ncdf_siesta.o: siesta_geom.o siesta_options.o sparse_matrices.o timestamp.o |
3623 | +m_ncdf_siesta.o: kpoint_grid.o m_energies.o m_forces.o m_kinetic.o m_ncdf_io.o |
3624 | +m_ncdf_siesta.o: m_ntm.o m_spin.o m_stress.o m_ts_electype.o m_ts_kpoints.o |
3625 | +m_ncdf_siesta.o: m_ts_options.o parallel.o precision.o radial.o siesta_geom.o |
3626 | +m_ncdf_siesta.o: siesta_options.o sparse_matrices.o timestamp.o |
3627 | m_new_dm.o: alloc.o atomlist.o class_Data2D.o class_Fstack_Data1D.o |
3628 | m_new_dm.o: class_Fstack_Pair_Geometry_SpData2D.o class_Geometry.o |
3629 | m_new_dm.o: class_OrbitalDistribution.o class_Pair_Geometry_SpData2D.o |
3630 | @@ -556,7 +558,7 @@ |
3631 | m_ts_electrode.o: parallel.o precision.o units.o |
3632 | m_ts_electype.o: class_OrbitalDistribution.o class_SpData1D.o class_SpData2D.o |
3633 | m_ts_electype.o: class_Sparsity.o create_Sparsity_SC.o geom_helper.o |
3634 | -m_ts_electype.o: intrinsic_missing.o m_geom_box.o m_geom_plane.o |
3635 | +m_ts_electype.o: intrinsic_missing.o m_char.o m_geom_box.o m_geom_plane.o |
3636 | m_ts_electype.o: m_handle_sparse.o m_iodm.o m_os.o m_region.o m_ts_chem_pot.o |
3637 | m_ts_electype.o: m_ts_io.o m_ts_io_ctype.o m_ts_iodm.o parallel.o precision.o |
3638 | m_ts_electype.o: units.o |
3639 | @@ -749,14 +751,13 @@ |
3640 | post_scf_work.o: atomlist.o class_Fstack_Pair_Geometry_SpData2D.o |
3641 | post_scf_work.o: class_Geometry.o class_Pair_Geometry_SpData2D.o compute_dm.o |
3642 | post_scf_work.o: diagon.o final_H_f_stress.o kpoint_grid.o m_dminim.o |
3643 | -post_scf_work.o: m_energies.o m_eo.o m_gamma.o m_spin.o m_steps.o m_zminim.o |
3644 | -post_scf_work.o: mneighb.o parallel.o siesta_geom.o siesta_options.o |
3645 | -post_scf_work.o: sparse_matrices.o |
3646 | +post_scf_work.o: m_energies.o m_eo.o m_spin.o m_steps.o m_zminim.o mneighb.o |
3647 | +post_scf_work.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
3648 | print_spin.o: atomlist.o m_mpi_utils.o m_spin.o parallel.o precision.o |
3649 | print_spin.o: siesta_cml.o sparse_matrices.o |
3650 | printmatrix.o: alloc.o |
3651 | projected_DOS.o: alloc.o atomlist.o kpoint_grid.o kpoint_pdos.o local_sys.o |
3652 | -projected_DOS.o: m_eo.o m_gamma.o m_spin.o parallel.o precision.o siesta_geom.o |
3653 | +projected_DOS.o: m_eo.o m_spin.o parallel.o precision.o siesta_geom.o |
3654 | projected_DOS.o: siesta_options.o sparse_matrices.o units.o |
3655 | propor.o: local_sys.o precision.o |
3656 | proximity_check.o: chemical.o m_ts_global_vars.o mneighb.o parallel.o |
3657 | @@ -806,11 +807,10 @@ |
3658 | setup_H0.o: siesta_geom.o siesta_options.o sparse_matrices.o spinorbit.o |
3659 | setup_hamiltonian.o: alloc.o atmfuncs.o atomlist.o class_SpData1D.o |
3660 | setup_hamiltonian.o: class_SpData2D.o dhscf.o files.o ldau.o ldau_specs.o |
3661 | -setup_hamiltonian.o: local_sys.o m_dipol.o m_energies.o m_gamma.o m_hsx.o |
3662 | -setup_hamiltonian.o: m_mpi_utils.o m_ntm.o m_partial_charges.o m_rhog.o |
3663 | -setup_hamiltonian.o: m_spin.o m_steps.o m_stress.o metaforce.o |
3664 | -setup_hamiltonian.o: molecularmechanics.o parallel.o siesta_geom.o |
3665 | -setup_hamiltonian.o: siesta_options.o sparse_matrices.o |
3666 | +setup_hamiltonian.o: local_sys.o m_dipol.o m_energies.o m_hsx.o m_mpi_utils.o |
3667 | +setup_hamiltonian.o: m_ntm.o m_partial_charges.o m_rhog.o m_spin.o m_steps.o |
3668 | +setup_hamiltonian.o: m_stress.o metaforce.o molecularmechanics.o parallel.o |
3669 | +setup_hamiltonian.o: siesta_geom.o siesta_options.o sparse_matrices.o |
3670 | setup_ordern_indexes.o: alloc.o domain_decom.o parallel.o spatial.o |
3671 | shaper.o: atmfuncs.o mneighb.o precision.o |
3672 | show_distribution.o: atomlist.o local_sys.o parallel.o parallelsubs.o |
3673 | @@ -823,10 +823,10 @@ |
3674 | siesta2wannier90.o: siesta_options.o |
3675 | siesta_analysis.o: alloc.o atomlist.o bands.o basis_enthalpy.o dhscf.o files.o |
3676 | siesta_analysis.o: flook_siesta.o kpoint_grid.o ksv.o ksvinit.o local_DOS.o |
3677 | -siesta_analysis.o: m_dipol.o m_energies.o m_eo.o m_forces.o m_gamma.o |
3678 | -siesta_analysis.o: m_iodm_old.o m_mpi_utils.o m_ntm.o m_partial_charges.o |
3679 | -siesta_analysis.o: m_pexsi_dos.o m_pexsi_local_dos.o m_spin.o m_steps.o |
3680 | -siesta_analysis.o: parallel.o projected_DOS.o siesta2wannier90.o siesta_cml.o |
3681 | +siesta_analysis.o: m_dipol.o m_energies.o m_eo.o m_forces.o m_iodm_old.o |
3682 | +siesta_analysis.o: m_mpi_utils.o m_ntm.o m_partial_charges.o m_pexsi_dos.o |
3683 | +siesta_analysis.o: m_pexsi_local_dos.o m_spin.o m_steps.o parallel.o |
3684 | +siesta_analysis.o: projected_DOS.o siesta2wannier90.o siesta_cml.o |
3685 | siesta_analysis.o: siesta_geom.o siesta_options.o sparse_matrices.o units.o |
3686 | siesta_analysis.o: write_subs.o writewave.o zmatrix.o |
3687 | siesta_cmlsubs.o: files.o m_uuid.o parallel.o siesta_cml.o timestamp.o |
3688 | @@ -857,7 +857,7 @@ |
3689 | siesta_init.o: class_Fstack_Pair_Geometry_SpData2D.o densematrix.o |
3690 | siesta_init.o: diag_option.o files.o flook_siesta.o ioxv.o kpoint_grid.o |
3691 | siesta_init.o: kpoint_pdos.o ksvinit.o local_sys.o m_check_walltime.o m_cite.o |
3692 | -siesta_init.o: m_energies.o m_eo.o m_fixed.o m_forces.o m_gamma.o m_iostruct.o |
3693 | +siesta_init.o: m_energies.o m_eo.o m_fixed.o m_forces.o m_iostruct.o |
3694 | siesta_init.o: m_mpi_utils.o m_new_dm.o m_rmaxh.o m_spin.o m_steps.o |
3695 | siesta_init.o: m_supercell.o m_timer.o m_wallclock.o metaforce.o |
3696 | siesta_init.o: molecularmechanics.o object_debug.o parallel.o parallelsubs.o |
3697 | @@ -889,14 +889,14 @@ |
3698 | state_init.o: class_SpData2D.o class_Sparsity.o create_Sparsity_SC.o |
3699 | state_init.o: domain_decom.o files.o hsparse.o iodm_netcdf.o iodmhs_netcdf.o |
3700 | state_init.o: ioxv.o kpoint_grid.o ldau_specs.o local_sys.o m_energies.o m_eo.o |
3701 | -state_init.o: m_gamma.o m_mixing.o m_mixing_scf.o m_mpi_utils.o m_new_dm.o |
3702 | -state_init.o: m_os.o m_pivot_methods.o m_rmaxh.o m_sparse.o |
3703 | -state_init.o: m_sparsity_handling.o m_spin.o m_steps.o m_supercell.o |
3704 | -state_init.o: m_test_io.o m_ts_charge.o m_ts_electype.o m_ts_global_vars.o |
3705 | -state_init.o: m_ts_io.o m_ts_kpoints.o m_ts_options.o m_ts_sparse.o |
3706 | -state_init.o: m_ts_tri_init.o normalize_dm.o overlap.o parallel.o |
3707 | -state_init.o: proximity_check.o siesta_cml.o siesta_dicts.o siesta_geom.o |
3708 | -state_init.o: siesta_options.o sparse_matrices.o units.o write_subs.o zmatrix.o |
3709 | +state_init.o: m_mixing.o m_mixing_scf.o m_mpi_utils.o m_new_dm.o m_os.o |
3710 | +state_init.o: m_pivot_methods.o m_rmaxh.o m_sparse.o m_sparsity_handling.o |
3711 | +state_init.o: m_spin.o m_steps.o m_supercell.o m_test_io.o m_ts_charge.o |
3712 | +state_init.o: m_ts_electype.o m_ts_global_vars.o m_ts_io.o m_ts_kpoints.o |
3713 | +state_init.o: m_ts_options.o m_ts_sparse.o m_ts_tri_init.o normalize_dm.o |
3714 | +state_init.o: overlap.o parallel.o proximity_check.o siesta_cml.o |
3715 | +state_init.o: siesta_dicts.o siesta_geom.o siesta_options.o sparse_matrices.o |
3716 | +state_init.o: units.o write_subs.o zmatrix.o |
3717 | struct_init.o: alloc.o atmfuncs.o atomlist.o files.o ioxv.o m_exp_coord.o |
3718 | struct_init.o: m_iostruct.o m_mpi_utils.o m_steps.o parallel.o periodic_table.o |
3719 | struct_init.o: siesta_cml.o siesta_geom.o siesta_master.o siesta_options.o |
3720 | |
3721 | === modified file 'Util/VCA/Makefile' |
3722 | --- Util/VCA/Makefile 2018-06-08 09:23:57 +0000 |
3723 | +++ Util/VCA/Makefile 2018-06-26 07:59:48 +0000 |
3724 | @@ -123,7 +123,7 @@ |
3725 | atomlwf.o: spatial.o |
3726 | automatic_cell.o: atm_types.o atmfuncs.o parallel.o precision.o units.o |
3727 | bands.o: alloc.o atmfuncs.o atomlist.o densematrix.o diag.o diag_option.o |
3728 | -bands.o: files.o get_kpoints_scale.o local_sys.o m_gamma.o m_spin.o parallel.o |
3729 | +bands.o: files.o get_kpoints_scale.o local_sys.o m_spin.o parallel.o |
3730 | bands.o: parallelsubs.o precision.o siesta_geom.o writewave.o |
3731 | basis_enthalpy.o: atmfuncs.o atomlist.o precision.o siesta_geom.o units.o |
3732 | basis_io.o: atm_types.o atmparams.o atom_options.o basis_types.o chemical.o |
3733 | @@ -175,10 +175,10 @@ |
3734 | coceri.o: files.o periodic_table.o precision.o units.o |
3735 | compute_dm.o: atomlist.o class_SpData1D.o compute_ebs_shift.o diagon.o |
3736 | compute_dm.o: iodmhs_netcdf.o kpoint_grid.o local_sys.o m_dminim.o m_energies.o |
3737 | -compute_dm.o: m_eo.o m_gamma.o m_hsx.o m_pexsi_driver.o m_rmaxh.o m_spin.o |
3738 | -compute_dm.o: m_steps.o m_transiesta.o m_ts_global_vars.o m_zminim.o |
3739 | -compute_dm.o: normalize_dm.o ordern.o parallel.o precision.o siesta_geom.o |
3740 | -compute_dm.o: siesta_options.o sparse_matrices.o units.o |
3741 | +compute_dm.o: m_eo.o m_hsx.o m_pexsi_driver.o m_rmaxh.o m_spin.o m_steps.o |
3742 | +compute_dm.o: m_transiesta.o m_ts_global_vars.o m_zminim.o normalize_dm.o |
3743 | +compute_dm.o: ordern.o parallel.o precision.o siesta_geom.o siesta_options.o |
3744 | +compute_dm.o: sparse_matrices.o units.o |
3745 | compute_ebs_shift.o: m_mpi_utils.o parallel.o precision.o |
3746 | compute_energies.o: atomlist.o class_SpData1D.o class_SpData2D.o dhscf.o |
3747 | compute_energies.o: files.o m_dipol.o m_energies.o m_mpi_utils.o m_ntm.o |
3748 | @@ -190,8 +190,8 @@ |
3749 | compute_pw_matrix.o: parallel.o precision.o siesta2wannier90.o |
3750 | compute_pw_matrix.o: sparse_matrices.o |
3751 | compute_rhog.o: alloc.o atomlist.o dhscf.o files.o m_dipol.o m_energies.o |
3752 | -compute_rhog.o: m_gamma.o m_ntm.o m_spin.o m_stress.o siesta_geom.o |
3753 | -compute_rhog.o: siesta_options.o sparse_matrices.o |
3754 | +compute_rhog.o: m_ntm.o m_spin.o m_stress.o siesta_geom.o siesta_options.o |
3755 | +compute_rhog.o: sparse_matrices.o |
3756 | conjgr.o: precision.o |
3757 | conjgr_old.o: precision.o |
3758 | coor.o: alloc.o local_sys.o parallel.o precision.o siesta_geom.o units.o |
3759 | @@ -218,13 +218,15 @@ |
3760 | dhscf.o: meshdscf.o meshsubs.o moremeshsubs.o parallel.o parsing.o precision.o |
3761 | dhscf.o: rhofft.o rhoofd.o siesta_options.o units.o vmat.o |
3762 | diag.o: alloc.o diag_option.o local_sys.o parallel.o precision.o |
3763 | -diag2g.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
3764 | +diag2g.o: fermid.o intrinsic_missing.o local_sys.o parallel.o parallelsubs.o |
3765 | +diag2g.o: precision.o |
3766 | diag2k.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
3767 | -diag3g.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
3768 | +diag3g.o: fermid.o intrinsic_missing.o local_sys.o parallel.o parallelsubs.o |
3769 | +diag3g.o: precision.o |
3770 | diag3k.o: fermid.o local_sys.o parallel.o parallelsubs.o precision.o |
3771 | diag_option.o: parallel.o precision.o |
3772 | -diagg.o: alloc.o fermid.o local_sys.o m_spin.o parallel.o parallelsubs.o |
3773 | -diagg.o: precision.o writewave.o |
3774 | +diagg.o: alloc.o fermid.o intrinsic_missing.o local_sys.o m_spin.o parallel.o |
3775 | +diagg.o: parallelsubs.o precision.o writewave.o |
3776 | diagk.o: compute_norm.o fermid.o local_sys.o m_spin.o parallel.o parallelsubs.o |
3777 | diagk.o: precision.o writewave.o |
3778 | diagk_file.o: fermid.o iowfs_netcdf.o local_sys.o parallel.o parallelsubs.o |
3779 | @@ -266,11 +268,11 @@ |
3780 | fft1d.o: local_sys.o parallel.o precision.o |
3781 | final_H_f_stress.o: alloc.o atomlist.o class_SpData2D.o compute_max_diff.o |
3782 | final_H_f_stress.o: dnaefs.o files.o grdsam.o kinefsm.o ldau.o ldau_specs.o |
3783 | -final_H_f_stress.o: local_sys.o m_dipol.o m_energies.o m_forces.o m_gamma.o |
3784 | -final_H_f_stress.o: m_hsx.o m_mpi_utils.o m_ncdf_siesta.o m_ntm.o m_spin.o |
3785 | -final_H_f_stress.o: m_stress.o m_ts_io.o m_ts_kpoints.o m_ts_options.o |
3786 | -final_H_f_stress.o: metaforce.o molecularmechanics.o naefs.o nlefsm.o overfsm.o |
3787 | -final_H_f_stress.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
3788 | +final_H_f_stress.o: local_sys.o m_dipol.o m_energies.o m_forces.o m_hsx.o |
3789 | +final_H_f_stress.o: m_mpi_utils.o m_ncdf_siesta.o m_ntm.o m_spin.o m_stress.o |
3790 | +final_H_f_stress.o: m_ts_io.o m_ts_kpoints.o m_ts_options.o metaforce.o |
3791 | +final_H_f_stress.o: molecularmechanics.o naefs.o nlefsm.o overfsm.o parallel.o |
3792 | +final_H_f_stress.o: siesta_geom.o siesta_options.o sparse_matrices.o |
3793 | final_H_f_stress.o: spinorbit.o units.o |
3794 | find_kgrid.o: alloc.o minvec.o parallel.o precision.o units.o |
3795 | fire_optim.o: alloc.o m_fire.o m_mpi_utils.o parallel.o precision.o |
3796 | @@ -339,8 +341,8 @@ |
3797 | ldau_specs.o: parallel.o precision.o pseudopotential.o radial.o units.o |
3798 | listsc.o: alloc.o |
3799 | local_DOS.o: atomlist.o dhscf.o diagon.o files.o kpoint_grid.o local_sys.o |
3800 | -local_DOS.o: m_energies.o m_eo.o m_forces.o m_gamma.o m_ntm.o m_spin.o |
3801 | -local_DOS.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
3802 | +local_DOS.o: m_energies.o m_eo.o m_forces.o m_ntm.o m_spin.o parallel.o |
3803 | +local_DOS.o: siesta_geom.o siesta_options.o sparse_matrices.o |
3804 | m_broyddj.o: alloc.o local_sys.o m_mpi_utils.o parallel.o precision.o |
3805 | m_broyddj_nocomm.o: alloc.o local_sys.o parallel.o precision.o |
3806 | m_broyden_mixing.o: alloc.o m_broyddj.o m_mpi_utils.o parallel.o precision.o |
3807 | @@ -409,10 +411,10 @@ |
3808 | m_ncdf_io.o: class_OrbitalDistribution.o class_SpData1D.o class_SpData2D.o |
3809 | m_ncdf_io.o: class_Sparsity.o m_io_s.o parallel.o precision.o |
3810 | m_ncdf_siesta.o: atm_types.o atmparams.o atomlist.o class_Sparsity.o files.o |
3811 | -m_ncdf_siesta.o: kpoint_grid.o m_energies.o m_forces.o m_gamma.o m_kinetic.o |
3812 | -m_ncdf_siesta.o: m_ncdf_io.o m_ntm.o m_spin.o m_stress.o m_ts_electype.o |
3813 | -m_ncdf_siesta.o: m_ts_kpoints.o m_ts_options.o parallel.o precision.o radial.o |
3814 | -m_ncdf_siesta.o: siesta_geom.o siesta_options.o sparse_matrices.o timestamp.o |
3815 | +m_ncdf_siesta.o: kpoint_grid.o m_energies.o m_forces.o m_kinetic.o m_ncdf_io.o |
3816 | +m_ncdf_siesta.o: m_ntm.o m_spin.o m_stress.o m_ts_electype.o m_ts_kpoints.o |
3817 | +m_ncdf_siesta.o: m_ts_options.o parallel.o precision.o radial.o siesta_geom.o |
3818 | +m_ncdf_siesta.o: siesta_options.o sparse_matrices.o timestamp.o |
3819 | m_new_dm.o: alloc.o atomlist.o class_Data2D.o class_Fstack_Data1D.o |
3820 | m_new_dm.o: class_Fstack_Pair_Geometry_SpData2D.o class_Geometry.o |
3821 | m_new_dm.o: class_OrbitalDistribution.o class_Pair_Geometry_SpData2D.o |
3822 | @@ -516,7 +518,7 @@ |
3823 | m_ts_electrode.o: parallel.o precision.o units.o |
3824 | m_ts_electype.o: class_OrbitalDistribution.o class_SpData1D.o class_SpData2D.o |
3825 | m_ts_electype.o: class_Sparsity.o create_Sparsity_SC.o geom_helper.o |
3826 | -m_ts_electype.o: intrinsic_missing.o m_geom_box.o m_geom_plane.o |
3827 | +m_ts_electype.o: intrinsic_missing.o m_char.o m_geom_box.o m_geom_plane.o |
3828 | m_ts_electype.o: m_handle_sparse.o m_iodm.o m_os.o m_region.o m_ts_chem_pot.o |
3829 | m_ts_electype.o: m_ts_io.o m_ts_io_ctype.o m_ts_iodm.o parallel.o precision.o |
3830 | m_ts_electype.o: units.o |
3831 | @@ -709,14 +711,13 @@ |
3832 | post_scf_work.o: atomlist.o class_Fstack_Pair_Geometry_SpData2D.o |
3833 | post_scf_work.o: class_Geometry.o class_Pair_Geometry_SpData2D.o compute_dm.o |
3834 | post_scf_work.o: diagon.o final_H_f_stress.o kpoint_grid.o m_dminim.o |
3835 | -post_scf_work.o: m_energies.o m_eo.o m_gamma.o m_spin.o m_steps.o m_zminim.o |
3836 | -post_scf_work.o: mneighb.o parallel.o siesta_geom.o siesta_options.o |
3837 | -post_scf_work.o: sparse_matrices.o |
3838 | +post_scf_work.o: m_energies.o m_eo.o m_spin.o m_steps.o m_zminim.o mneighb.o |
3839 | +post_scf_work.o: parallel.o siesta_geom.o siesta_options.o sparse_matrices.o |
3840 | print_spin.o: atomlist.o m_mpi_utils.o m_spin.o parallel.o precision.o |
3841 | print_spin.o: siesta_cml.o sparse_matrices.o |
3842 | printmatrix.o: alloc.o |
3843 | projected_DOS.o: alloc.o atomlist.o kpoint_grid.o kpoint_pdos.o local_sys.o |
3844 | -projected_DOS.o: m_eo.o m_gamma.o m_spin.o parallel.o precision.o siesta_geom.o |
3845 | +projected_DOS.o: m_eo.o m_spin.o parallel.o precision.o siesta_geom.o |
3846 | projected_DOS.o: siesta_options.o sparse_matrices.o units.o |
3847 | propor.o: local_sys.o precision.o |
3848 | proximity_check.o: chemical.o m_ts_global_vars.o mneighb.o parallel.o |
3849 | @@ -766,11 +767,10 @@ |
3850 | setup_H0.o: siesta_geom.o siesta_options.o sparse_matrices.o spinorbit.o |
3851 | setup_hamiltonian.o: alloc.o atmfuncs.o atomlist.o class_SpData1D.o |
3852 | setup_hamiltonian.o: class_SpData2D.o dhscf.o files.o ldau.o ldau_specs.o |
3853 | -setup_hamiltonian.o: local_sys.o m_dipol.o m_energies.o m_gamma.o m_hsx.o |
3854 | -setup_hamiltonian.o: m_mpi_utils.o m_ntm.o m_partial_charges.o m_rhog.o |
3855 | -setup_hamiltonian.o: m_spin.o m_steps.o m_stress.o metaforce.o |
3856 | -setup_hamiltonian.o: molecularmechanics.o parallel.o siesta_geom.o |
3857 | -setup_hamiltonian.o: siesta_options.o sparse_matrices.o |
3858 | +setup_hamiltonian.o: local_sys.o m_dipol.o m_energies.o m_hsx.o m_mpi_utils.o |
3859 | +setup_hamiltonian.o: m_ntm.o m_partial_charges.o m_rhog.o m_spin.o m_steps.o |
3860 | +setup_hamiltonian.o: m_stress.o metaforce.o molecularmechanics.o parallel.o |
3861 | +setup_hamiltonian.o: siesta_geom.o siesta_options.o sparse_matrices.o |
3862 | setup_ordern_indexes.o: alloc.o domain_decom.o parallel.o spatial.o |
3863 | shaper.o: atmfuncs.o mneighb.o precision.o |
3864 | show_distribution.o: atomlist.o local_sys.o parallel.o parallelsubs.o |
3865 | @@ -783,10 +783,10 @@ |
3866 | siesta2wannier90.o: siesta_options.o |
3867 | siesta_analysis.o: alloc.o atomlist.o bands.o basis_enthalpy.o dhscf.o files.o |
3868 | siesta_analysis.o: flook_siesta.o kpoint_grid.o ksv.o ksvinit.o local_DOS.o |
3869 | -siesta_analysis.o: m_dipol.o m_energies.o m_eo.o m_forces.o m_gamma.o |
3870 | -siesta_analysis.o: m_iodm_old.o m_mpi_utils.o m_ntm.o m_partial_charges.o |
3871 | -siesta_analysis.o: m_pexsi_dos.o m_pexsi_local_dos.o m_spin.o m_steps.o |
3872 | -siesta_analysis.o: parallel.o projected_DOS.o siesta2wannier90.o siesta_cml.o |
3873 | +siesta_analysis.o: m_dipol.o m_energies.o m_eo.o m_forces.o m_iodm_old.o |
3874 | +siesta_analysis.o: m_mpi_utils.o m_ntm.o m_partial_charges.o m_pexsi_dos.o |
3875 | +siesta_analysis.o: m_pexsi_local_dos.o m_spin.o m_steps.o parallel.o |
3876 | +siesta_analysis.o: projected_DOS.o siesta2wannier90.o siesta_cml.o |
3877 | siesta_analysis.o: siesta_geom.o siesta_options.o sparse_matrices.o units.o |
3878 | siesta_analysis.o: write_subs.o writewave.o zmatrix.o |
3879 | siesta_cmlsubs.o: files.o m_uuid.o parallel.o siesta_cml.o timestamp.o |
3880 | @@ -817,7 +817,7 @@ |
3881 | siesta_init.o: class_Fstack_Pair_Geometry_SpData2D.o densematrix.o |
3882 | siesta_init.o: diag_option.o files.o flook_siesta.o ioxv.o kpoint_grid.o |
3883 | siesta_init.o: kpoint_pdos.o ksvinit.o local_sys.o m_check_walltime.o m_cite.o |
3884 | -siesta_init.o: m_energies.o m_eo.o m_fixed.o m_forces.o m_gamma.o m_iostruct.o |
3885 | +siesta_init.o: m_energies.o m_eo.o m_fixed.o m_forces.o m_iostruct.o |
3886 | siesta_init.o: m_mpi_utils.o m_new_dm.o m_rmaxh.o m_spin.o m_steps.o |
3887 | siesta_init.o: m_supercell.o m_timer.o m_wallclock.o metaforce.o |
3888 | siesta_init.o: molecularmechanics.o object_debug.o parallel.o parallelsubs.o |
3889 | @@ -849,14 +849,14 @@ |
3890 | state_init.o: class_SpData2D.o class_Sparsity.o create_Sparsity_SC.o |
3891 | state_init.o: domain_decom.o files.o hsparse.o iodm_netcdf.o iodmhs_netcdf.o |
3892 | state_init.o: ioxv.o kpoint_grid.o ldau_specs.o local_sys.o m_energies.o m_eo.o |
3893 | -state_init.o: m_gamma.o m_mixing.o m_mixing_scf.o m_mpi_utils.o m_new_dm.o |
3894 | -state_init.o: m_os.o m_pivot_methods.o m_rmaxh.o m_sparse.o |
3895 | -state_init.o: m_sparsity_handling.o m_spin.o m_steps.o m_supercell.o |
3896 | -state_init.o: m_test_io.o m_ts_charge.o m_ts_electype.o m_ts_global_vars.o |
3897 | -state_init.o: m_ts_io.o m_ts_kpoints.o m_ts_options.o m_ts_sparse.o |
3898 | -state_init.o: m_ts_tri_init.o normalize_dm.o overlap.o parallel.o |
3899 | -state_init.o: proximity_check.o siesta_cml.o siesta_dicts.o siesta_geom.o |
3900 | -state_init.o: siesta_options.o sparse_matrices.o units.o write_subs.o zmatrix.o |
3901 | +state_init.o: m_mixing.o m_mixing_scf.o m_mpi_utils.o m_new_dm.o m_os.o |
3902 | +state_init.o: m_pivot_methods.o m_rmaxh.o m_sparse.o m_sparsity_handling.o |
3903 | +state_init.o: m_spin.o m_steps.o m_supercell.o m_test_io.o m_ts_charge.o |
3904 | +state_init.o: m_ts_electype.o m_ts_global_vars.o m_ts_io.o m_ts_kpoints.o |
3905 | +state_init.o: m_ts_options.o m_ts_sparse.o m_ts_tri_init.o normalize_dm.o |
3906 | +state_init.o: overlap.o parallel.o proximity_check.o siesta_cml.o |
3907 | +state_init.o: siesta_dicts.o siesta_geom.o siesta_options.o sparse_matrices.o |
3908 | +state_init.o: units.o write_subs.o zmatrix.o |
3909 | struct_init.o: alloc.o atmfuncs.o atomlist.o files.o ioxv.o m_exp_coord.o |
3910 | struct_init.o: m_iostruct.o m_mpi_utils.o m_steps.o parallel.o periodic_table.o |
3911 | struct_init.o: siesta_cml.o siesta_geom.o siesta_master.o siesta_options.o |
3912 | |
3913 | === modified file 'version.info' |
3914 | --- version.info 2018-06-19 11:00:00 +0000 |
3915 | +++ version.info 2018-06-26 07:59:48 +0000 |
3916 | @@ -1,1 +1,1 @@ |
3917 | -siesta-4.1--933 |
3918 | +siesta-4.1--933--gamma-932 |