Skip to content

Commit a05c14a

Browse files
authored
Reconstruct the LCAO codes for the parameter 'PARAM.inp.out_interval', enable a unified control of output information every few ionic steps. (#6272)
* begin changing the output file names of out_mat_hs * update output vxc an output tk * Fix example 006_NO_GO_OH in 02_NAO_Gamma * fix a bug * fix 17_NO_KP_OH example in 03_NAO_multik * partly update the 19_NO_KP_OH_nscf exxample and related codes * partly update 20_NO_KP_OHS_S4 * fix the example 20_NO_KP_OHS_S4 * print out the information for H(R), S(R), H(k) and S(k) * update 08_EXX examples * update output filenames related to dH, dS, rR * update documents * add ctrl_output_lcao.h and ctrl_output_lcao.cpp files * update ctrl_output_lcao function * add more function in ctrl_output_lcao * update ctrl_output_lcao * update the output_mat_sparse function * update p_hamilt class without the Device parameter * add back functions in ctrl_output_lcao * add back berry phase in ctrl_output_lcao * add back wannier90 * add back rdmft * update lcao_after_scf, this is before using ctrl_outut_lcao in lcao_after_scf * update * the functions turn normal, reconstruction finished * merge * fix bug related to deepks and exc * update input-main.md * fix exx codes
1 parent 2b1e662 commit a05c14a

File tree

15 files changed

+646
-527
lines changed

15 files changed

+646
-527
lines changed

docs/advanced/input_files/input-main.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@
156156
- [out\_mat\_xc2](#out_mat_xc2)
157157
- [out\_mat\_l](#out_mat_l)
158158
- [out\_eband\_terms](#out_eband_terms)
159-
- [out\_hr\_npz/out\_dm\_npz](#out_hr_npzout_dm_npz)
160159
- [dm\_to\_rho](#dm_to_rho)
161160
- [out\_mul](#out_mul)
162161
- [out\_app\_flag](#out_app_flag)
@@ -1876,13 +1875,6 @@ These variables are used to control the output of properties.
18761875
- **Description**: Whether to print the band energy terms separately in the file `OUT.${suffix}/${term}_out.dat`. The terms include the kinetic, pseudopotential (local + nonlocal), Hartree and exchange-correlation (including exact exchange if calculated).
18771876
- **Default**: False
18781877

1879-
### out_hr_npz/out_dm_npz (Under Development Feature)
1880-
1881-
- **Type**: Boolean
1882-
- **Availability**: Numerical atomic orbital basis
1883-
- **Description**: Whether to print Hamiltonian matrices $H(R)$/density matrics $DM(R)$ in npz format. This feature does not work for gamma-only calculations.
1884-
- **Default**: False
1885-
18861878
### dm_to_rho (Under Development Feature)
18871879

18881880
- **Type**: Boolean
@@ -1914,7 +1906,7 @@ These variables are used to control the output of properties.
19141906
### out_interval
19151907

19161908
- **Type**: Integer
1917-
- **Description**: Control the interval for printing charge density, local potential, electrostatic potential, Mulliken population analysis, $r(R)$, $H(R)$, $S(R)$, $T(R)$, $dH(R)$, $H(k)$, $S(k)$ and $\psi(k)$ matrices during molecular dynamics calculations. Check input parameters [out_chg](#out_chg), [out_pot](#out_pot), [out_mul](#out_mul), [out_mat_r](#out_mat_r), [out_mat_hs2](#out_mat_hs2), [out_mat_t](#out_mat_t), [out_mat_dh](#out_mat_dh), [out_mat_hs](#out_mat_hs) and [out_wfc_lcao](#out_wfc_lcao) for more information, respectively.
1909+
- **Description**: After self-consistent-field calculations, control the interval of ionic movements for printing properties. These properties cover charge density, local potential, electrostatic potential, Hamiltonian matrix, overlap matrix, density matrix, Mulliken population analysis and so on.
19181910
- **Default**: 1
19191911

19201912
### out_element_info

source/Makefile.Objects

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,7 @@ OBJS_IO=input_conv.o\
537537
write_wfc_r.o\
538538
output_log.o\
539539
output_mat_sparse.o\
540+
ctrl_output_lcao.o\
540541
para_json.o\
541542
abacusjson.o\
542543
general_info.o\

source/module_elecstate/elecstate.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#ifndef ELECSTATE_H
22
#define ELECSTATE_H
3+
34
#include "fp_energy.h"
45
#include "module_cell/klist.h"
56
#include "module_elecstate/module_charge/charge.h"
@@ -169,8 +170,6 @@ class ElecState
169170

170171
bool skip_weights = false;
171172
};
172-
173-
174173

175174
} // namespace elecstate
176175
#endif

source/module_elecstate/elecstate_lcao.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef W_ABACUS_DEVELOP_ABACUS_DEVELOP_SOURCE_MODULE_ELECSTATE_ELECSTATE_LCAO_H
2-
#define W_ABACUS_DEVELOP_ABACUS_DEVELOP_SOURCE_MODULE_ELECSTATE_ELECSTATE_LCAO_H
1+
#ifndef ELECSTATE_LCAO_H
2+
#define ELECSTATE_LCAO_H
33

44
#include "elecstate.h"
55
#include "module_elecstate/module_dm/density_matrix.h"

0 commit comments

Comments
 (0)