Skip to content

Commit 6bb6adf

Browse files
committed
the functions turn normal, reconstruction finished
1 parent 07c7f40 commit 6bb6adf

File tree

2 files changed

+4
-62
lines changed

2 files changed

+4
-62
lines changed

source/module_esolver/lcao_after_scf.cpp

Lines changed: 3 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,5 @@
11
#include "esolver_ks_lcao.h"
2-
3-
#include "module_base/formatter.h"
4-
#include "module_base/global_variable.h"
5-
#include "module_base/tool_title.h"
6-
#include "module_elecstate/module_dm/cal_dm_psi.h"
7-
#include "module_hamilt_lcao/module_dftu/dftu.h"
8-
#include "module_io/cube_io.h"
9-
#include "module_io/nscf_band.h"
10-
#include "module_io/output_log.h"
11-
#include "module_io/output_sk.h"
12-
#include "module_io/write_elecstat_pot.h"
13-
#include "module_parameter/parameter.h"
14-
#include "module_base/global_function.h"
15-
#include "module_cell/module_neighbor/sltk_grid_driver.h"
16-
#include "module_elecstate/cal_ux.h"
17-
#include "module_elecstate/module_charge/symmetry_rho.h"
18-
#include "module_elecstate/occupy.h"
19-
#include "module_io/print_info.h"
20-
21-
#include <memory>
22-
23-
//-----force& stress-------------------
24-
#include "module_hamilt_lcao/hamilt_lcaodft/FORCE_STRESS.h"
25-
26-
//-----HSolver ElecState Hamilt--------
27-
#include "module_elecstate/elecstate_lcao.h"
28-
#include "module_hamilt_lcao/hamilt_lcaodft/hamilt_lcao.h"
29-
#include "module_hsolver/hsolver_lcao.h"
30-
31-
// 2025-06-04
322
#include "module_io/ctrl_output_lcao.h"
33-
#include <iostream>
34-
35-
#include "module_elecstate/elecstate_lcao.h" // use elecstate::ElecState
36-
#include "module_io/ctrl_output_lcao.h" // use ctrl_output_lcao()
37-
#include "module_hamilt_lcao/hamilt_lcaodft/hamilt_lcao.h" // use hamilt::HamiltLCAO<TK, TR>
38-
#include "module_hamilt_general/hamilt.h" // use Hamilt<T>
39-
40-
#include "module_io/write_dmr.h" // use ModuleIO::write_dmr()
41-
#include "module_io/io_dmk.h" // use ModuleIO::write_dmk()
42-
#include "module_io/write_HS.h" // use ModuleIO::write_hsk()
43-
#include "module_io/write_wfc_nao.h" // use ModuleIO::write_wfc_nao()
44-
#include "module_io/output_mat_sparse.h" // use ModuleIO::output_mat_sparse()
45-
#include "module_io/output_mulliken.h" // use cal_mag()
46-
#include "module_hamilt_lcao/hamilt_lcaodft/operator_lcao/ekinetic_new.h" // use hamilt::EkineticNew
47-
#include "module_io/cal_pLpR.h" // use AngularMomentumCalculator()
48-
#include "module_hamilt_lcao/module_deltaspin/spin_constrain.h" // use spinconstrain::SpinConstrain<TK>
49-
#include "module_io/berryphase.h" // use berryphase
50-
#include "module_io/to_wannier90_lcao.h" // use toWannier90_LCAO
51-
#include "module_io/to_wannier90_lcao_in_pw.h" // use toWannier90_LCAO_IN_PW
52-
#ifdef __EXX
53-
//#include "module_io/restart_exx_csr.h"
54-
#include "module_ri/RPA_LRI.h" // use RPA code
55-
#endif
56-
#include "module_rdmft/rdmft.h" // use RDMFT codes
57-
#include "module_io/to_qo.h" // use toQO
58-
59-
60-
61-
623

634
namespace ModuleESolver
645
{
@@ -77,8 +18,8 @@ void ESolver_KS_LCAO<TK, TR>::after_scf(UnitCell& ucell, const int istep, const
7718
//------------------------------------------------------------------
7819
//! 2) output of lcao every few ionic steps
7920
//------------------------------------------------------------------
80-
const auto* estate = dynamic_cast<const elecstate::ElecStateLCAO<TK>*>(this->pelec);
81-
const auto* hamilt_lcao = dynamic_cast<const hamilt::HamiltLCAO<TK, TR>*>(this->p_hamilt);
21+
auto* estate = dynamic_cast<elecstate::ElecStateLCAO<TK>*>(this->pelec);
22+
auto* hamilt_lcao = dynamic_cast<hamilt::HamiltLCAO<TK, TR>*>(this->p_hamilt);
8223

8324
if(!estate)
8425
{
@@ -87,6 +28,7 @@ void ESolver_KS_LCAO<TK, TR>::after_scf(UnitCell& ucell, const int istep, const
8728

8829
if(istep % PARAM.inp.out_interval == 0)
8930
{
31+
9032
ModuleIO::ctrl_output_lcao<TK, TR>(ucell,
9133
this->kv,
9234
estate,

source/module_io/ctrl_output_lcao.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ void ctrl_output_lcao(UnitCell& ucell,
401401
ModuleBase::timer::tick("ModuleIO", "ctrl_output_lcao");
402402
}
403403

404-
}
404+
} // End ModuleIO
405405

406406

407407
// For gamma only

0 commit comments

Comments
 (0)