Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/Makefile.Objects
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ VPATH=./src_global:\
./module_hsolver/module_pexsi:\
./module_elecstate:\
./module_elecstate/kernels:\
./module_elecstate/potentials:\
./module_elecstate/module_pot:\
./module_elecstate/module_charge:\
./module_elecstate/module_dm:\
./module_psi:\
Expand Down
18 changes: 9 additions & 9 deletions source/module_elecstate/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ list(APPEND objects
elecstate_pw.cpp
elecstate_pw_sdft.cpp
elecstate_pw_cal_tau.cpp
potentials/gatefield.cpp
potentials/efield.cpp
potentials/H_Hartree_pw.cpp
potentials/pot_xc.cpp
potentials/pot_local.cpp
potentials/pot_local_paw.cpp
potentials/potential_new.cpp
potentials/potential_types.cpp
module_pot/gatefield.cpp
module_pot/efield.cpp
module_pot/H_Hartree_pw.cpp
module_pot/pot_xc.cpp
module_pot/pot_local.cpp
module_pot/pot_local_paw.cpp
module_pot/potential_new.cpp
module_pot/potential_types.cpp
module_charge/charge.cpp
module_charge/charge_init.cpp
module_charge/charge_mpi.cpp
Expand All @@ -42,7 +42,7 @@ if(ENABLE_LCAO)
list(APPEND objects
elecstate_lcao.cpp
elecstate_lcao_cal_tau.cpp
potentials/H_TDDFT_pw.cpp
module_pot/H_TDDFT_pw.cpp
module_dm/density_matrix.cpp
module_dm/density_matrix_io.cpp
module_dm/cal_dm_psi.cpp
Expand Down
2 changes: 1 addition & 1 deletion source/module_elecstate/elecstate.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "module_elecstate/module_charge/charge.h"
#include "module_parameter/parameter.h"
#include "module_psi/psi.h"
#include "potentials/potential_new.h"
#include "module_pot/potential_new.h"

namespace elecstate
{
Expand Down
6 changes: 3 additions & 3 deletions source/module_elecstate/elecstate_energy_terms.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "elecstate.h"
#include "module_elecstate/potentials/H_Hartree_pw.h"
#include "module_elecstate/potentials/efield.h"
#include "module_elecstate/potentials/gatefield.h"
#include "module_elecstate/module_pot/H_Hartree_pw.h"
#include "module_elecstate/module_pot/efield.h"
#include "module_elecstate/module_pot/gatefield.h"
#include "module_hamilt_lcao/module_deepks/LCAO_deepks.h"
#include "module_hamilt_lcao/module_deltaspin/spin_constrain.h"
#include "module_hamilt_lcao/module_dftu/dftu.h"
Expand Down
6 changes: 3 additions & 3 deletions source/module_elecstate/elecstate_print.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
#include "module_base/formatter.h"
#include "module_base/global_variable.h"
#include "module_base/parallel_common.h"
#include "module_elecstate/potentials/H_Hartree_pw.h"
#include "module_elecstate/potentials/efield.h"
#include "module_elecstate/potentials/gatefield.h"
#include "module_elecstate/module_pot/H_Hartree_pw.h"
#include "module_elecstate/module_pot/efield.h"
#include "module_elecstate/module_pot/gatefield.h"
#include "module_hamilt_general/module_xc/xc_functional.h"
#include "module_hamilt_lcao/module_deepks/LCAO_deepks.h"
#include "module_parameter/parameter.h"
Expand Down
2 changes: 1 addition & 1 deletion source/module_elecstate/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ AddTest(
AddTest(
TARGET potentials_new
LIBS parameter ${math_libs} base device planewave_serial
SOURCES potential_new_test.cpp ../potentials/potential_new.cpp
SOURCES potential_new_test.cpp ../module_pot/potential_new.cpp
)

AddTest(
Expand Down
4 changes: 2 additions & 2 deletions source/module_elecstate/test/elecstate_print_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#include "module_cell/klist.h"
#include "module_elecstate/elecstate.h"
#include "module_elecstate/module_charge/charge.h"
#include "module_elecstate/potentials/efield.h"
#include "module_elecstate/potentials/gatefield.h"
#include "module_elecstate/module_pot/efield.h"
#include "module_elecstate/module_pot/gatefield.h"
#include "module_hamilt_general/module_xc/xc_functional.h"
#include "module_parameter/parameter.h"
#include "module_elecstate/elecstate_print.h"
Expand Down
2 changes: 1 addition & 1 deletion source/module_elecstate/test/potential_new_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include <vector>

#define private public
#include "module_elecstate/potentials/potential_new.h"
#include "module_elecstate/module_pot/potential_new.h"
#include "module_hamilt_general/module_xc/xc_functional.h"
#include "module_parameter/parameter.h"
// mock functions
Expand Down
2 changes: 1 addition & 1 deletion source/module_elecstate/test/potentials_base_test.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "gtest/gtest.h"
#include "module_elecstate/potentials/pot_base.h"
#include "module_elecstate/module_pot/pot_base.h"

ModuleBase::matrix::~matrix(){}

Expand Down
4 changes: 2 additions & 2 deletions source/module_esolver/esolver_of_tool.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include "esolver_of.h"
#include "module_base/formatter.h"
#include "module_base/memory.h"
#include "module_elecstate/potentials/efield.h"
#include "module_elecstate/potentials/gatefield.h"
#include "module_elecstate/module_pot/efield.h"
#include "module_elecstate/module_pot/gatefield.h"
#include "module_hamilt_pw/hamilt_pwdft/global.h"
#include "module_parameter/parameter.h"
#include "module_elecstate/cal_ux.h"
Expand Down
2 changes: 1 addition & 1 deletion source/module_hamilt_lcao/hamilt_lcaodft/FORCE.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "module_basis/module_nao/two_center_bundle.h"
#include "module_elecstate/elecstate.h"
#include "module_elecstate/module_dm/density_matrix.h"
#include "module_elecstate/potentials/potential_new.h"
#include "module_elecstate/module_pot/potential_new.h"
#include "module_hamilt_lcao/hamilt_lcaodft/force_stress_arrays.h"
#include "module_hamilt_lcao/module_deepks/LCAO_deepks.h"
#include "module_hamilt_lcao/module_gint/gint_gamma.h"
Expand Down
6 changes: 3 additions & 3 deletions source/module_hamilt_lcao/hamilt_lcaodft/FORCE_STRESS.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
#include "module_base/timer.h"
#include "module_cell/module_neighbor/sltk_grid_driver.h"
#include "module_elecstate/elecstate_lcao.h"
#include "module_elecstate/potentials/H_TDDFT_pw.h" // Taoni add 2025-02-20
#include "module_elecstate/potentials/efield.h" // liuyu add 2022-05-18
#include "module_elecstate/potentials/gatefield.h" // liuyu add 2022-09-13
#include "module_elecstate/module_pot/H_TDDFT_pw.h" // Taoni add 2025-02-20
#include "module_elecstate/module_pot/efield.h" // liuyu add 2022-05-18
#include "module_elecstate/module_pot/gatefield.h" // liuyu add 2022-09-13
#include "module_hamilt_general/module_surchem/surchem.h" //sunml add 2022-08-10
#include "module_hamilt_general/module_vdw/vdw.h"
#include "module_parameter/parameter.h"
Expand Down
2 changes: 1 addition & 1 deletion source/module_hamilt_lcao/hamilt_lcaodft/hamilt_lcao.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "module_hsolver/diago_elpa.h"
#endif

#include "module_elecstate/potentials/H_TDDFT_pw.h"
#include "module_elecstate/module_pot/H_TDDFT_pw.h"
#include "module_hamilt_general/module_xc/xc_functional.h"
#include "module_hamilt_lcao/module_deltaspin/spin_constrain.h"
#include "module_hamilt_lcao/module_hcontainer/hcontainer_funcs.h"
Expand Down
2 changes: 1 addition & 1 deletion source/module_hamilt_lcao/hamilt_lcaodft/hamilt_lcao.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "module_cell/klist.h"
#include "module_cell/module_neighbor/sltk_atom_arrange.h"
#include "module_elecstate/module_dm/density_matrix.h"
#include "module_elecstate/potentials/potential_new.h"
#include "module_elecstate/module_pot/potential_new.h"
#include "module_hamilt_general/hamilt.h"
#include "module_hamilt_lcao/hamilt_lcaodft/hs_matrix_k.hpp"
#include "module_hamilt_lcao/module_gint/gint_gamma.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "module_base/timer.h"
#include "module_base/tool_title.h"
#include "module_cell/module_neighbor/sltk_grid_driver.h"
#include "module_elecstate/potentials/H_TDDFT_pw.h"
#include "module_elecstate/module_pot/H_TDDFT_pw.h"
#include "module_hamilt_lcao/hamilt_lcaodft/center2_orb-orb11.h"
#include "module_hamilt_lcao/hamilt_lcaodft/spar_hsr.h"
#include "module_hamilt_lcao/module_hcontainer/hcontainer_funcs.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "module_basis/module_ao/parallel_orbitals.h"
#include "module_cell/module_neighbor/sltk_grid_driver.h"
#include "module_cell/unitcell.h"
#include "module_elecstate/potentials/H_TDDFT_pw.h"
#include "module_elecstate/module_pot/H_TDDFT_pw.h"
#include "module_hamilt_lcao/hamilt_lcaodft/operator_lcao/operator_lcao.h"
#include "module_hamilt_lcao/module_hcontainer/hcontainer.h"
#include "module_hamilt_lcao/module_tddft/td_velocity.h"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef VEFFLCAO_H
#define VEFFLCAO_H
#include "module_base/timer.h"
#include "module_elecstate/potentials/potential_new.h"
#include "module_elecstate/module_pot/potential_new.h"
#include "module_hamilt_lcao/module_gint/gint_gamma.h"
#include "module_hamilt_lcao/module_gint/gint_k.h"
#include "operator_lcao.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "module_elecstate/module_dm/density_matrix.h"
#include "module_hamilt_lcao/module_gint/gint_gamma.h"
#include "module_hamilt_lcao/module_gint/gint_k.h"
#include "module_elecstate/potentials/potential_new.h"
#include "module_elecstate/module_pot/potential_new.h"
#include "module_cell/unitcell.h"
#include "module_hamilt_lcao/hamilt_lcaodft/stress_tools.h"
#ifndef TGINT_H
Expand Down
2 changes: 1 addition & 1 deletion source/module_hamilt_lcao/module_tddft/td_velocity.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "td_velocity.h"

#include "module_elecstate/potentials/H_TDDFT_pw.h"
#include "module_elecstate/module_pot/H_TDDFT_pw.h"
#include "module_parameter/parameter.h"

bool TD_Velocity::tddft_velocity = false;
Expand Down
4 changes: 2 additions & 2 deletions source/module_hamilt_pw/hamilt_pwdft/forces.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#include "module_base/mathzone.h"
#include "module_base/timer.h"
#include "module_base/tool_threading.h"
#include "module_elecstate/potentials/efield.h"
#include "module_elecstate/potentials/gatefield.h"
#include "module_elecstate/module_pot/efield.h"
#include "module_elecstate/module_pot/gatefield.h"
#include "module_hamilt_general/module_ewald/H_Ewald_pw.h"
#include "module_hamilt_general/module_surchem/surchem.h"
#include "module_hamilt_general/module_vdw/vdw.h"
Expand Down
4 changes: 2 additions & 2 deletions source/module_hamilt_pw/hamilt_pwdft/forces_cc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#include "module_base/timer.h"
#include "module_base/tool_threading.h"
#include "module_elecstate/cal_ux.h"
#include "module_elecstate/potentials/efield.h"
#include "module_elecstate/potentials/gatefield.h"
#include "module_elecstate/module_pot/efield.h"
#include "module_elecstate/module_pot/gatefield.h"
#include "module_hamilt_general/module_ewald/H_Ewald_pw.h"
#include "module_hamilt_general/module_surchem/surchem.h"
#include "module_hamilt_general/module_vdw/vdw.h"
Expand Down
4 changes: 2 additions & 2 deletions source/module_hamilt_pw/hamilt_pwdft/forces_scc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#include "module_base/mathzone.h"
#include "module_base/timer.h"
#include "module_base/tool_threading.h"
#include "module_elecstate/potentials/efield.h"
#include "module_elecstate/potentials/gatefield.h"
#include "module_elecstate/module_pot/efield.h"
#include "module_elecstate/module_pot/gatefield.h"
#include "module_hamilt_general/module_ewald/H_Ewald_pw.h"
#include "module_hamilt_general/module_surchem/surchem.h"
#include "module_hamilt_general/module_vdw/vdw.h"
Expand Down
2 changes: 1 addition & 1 deletion source/module_hamilt_pw/hamilt_pwdft/hamilt_pw.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "module_base/macros.h"
#include "module_cell/klist.h"
#include "module_elecstate/potentials/potential_new.h"
#include "module_elecstate/module_pot/potential_new.h"
#include "module_esolver/esolver_ks_pw.h"
#include "module_hamilt_general/hamilt.h"
#include "module_hamilt_pw/hamilt_pwdft/VNL_in_pw.h"
Expand Down
2 changes: 1 addition & 1 deletion source/module_hamilt_pw/hamilt_pwdft/stress_func_har.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "stress_func.h"
#include "module_elecstate/potentials/H_Hartree_pw.h"
#include "module_elecstate/module_pot/H_Hartree_pw.h"
#include "module_parameter/parameter.h"
#include "module_base/timer.h"
#include "module_hamilt_pw/hamilt_pwdft/global.h"
Expand Down
4 changes: 2 additions & 2 deletions source/module_hamilt_pw/hamilt_stodft/sto_forces.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#include "module_base/mathzone.h"
#include "module_cell/module_symmetry/symmetry.h"
#include "module_elecstate/elecstate.h"
#include "module_elecstate/potentials/efield.h"
#include "module_elecstate/potentials/gatefield.h"
#include "module_elecstate/module_pot/efield.h"
#include "module_elecstate/module_pot/gatefield.h"
#include "module_hamilt_pw/hamilt_pwdft/global.h"
#include "module_io/output_log.h"
#include "module_parameter/parameter.h"
Expand Down
6 changes: 3 additions & 3 deletions source/module_io/input_conv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "module_hamilt_lcao/module_dftu/dftu.h"
#ifdef __LCAO
#include "module_basis/module_ao/ORB_read.h"
#include "module_elecstate/potentials/H_TDDFT_pw.h"
#include "module_elecstate/module_pot/H_TDDFT_pw.h"
#include "module_hamilt_lcao/hamilt_lcaodft/FORCE_STRESS.h"
#include "module_hamilt_lcao/module_tddft/evolve_elec.h"
#include "module_hamilt_lcao/module_tddft/td_velocity.h"
Expand All @@ -37,8 +37,8 @@
#include "module_base/module_device/device.h"
#include "module_base/timer.h"
#include "module_elecstate/elecstate_lcao.h"
#include "module_elecstate/potentials/efield.h"
#include "module_elecstate/potentials/gatefield.h"
#include "module_elecstate/module_pot/efield.h"
#include "module_elecstate/module_pot/gatefield.h"
#include "module_hsolver/hsolver_lcao.h"
#include "module_hsolver/hsolver_pw.h"
#include "module_md/md_func.h"
Expand Down
2 changes: 1 addition & 1 deletion source/module_io/td_current_io.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "module_base/tool_threading.h"
#include "module_base/vector3.h"
#include "module_elecstate/module_dm/cal_dm_psi.h"
#include "module_elecstate/potentials/H_TDDFT_pw.h"
#include "module_elecstate/module_pot/H_TDDFT_pw.h"
#include "module_hamilt_lcao/hamilt_lcaodft/LCAO_domain.h"
#include "module_hamilt_lcao/module_tddft/td_current.h"
#include "module_hamilt_lcao/module_tddft/td_velocity.h"
Expand Down
6 changes: 3 additions & 3 deletions source/module_io/test/for_testing_input_conv.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
#include "module_elecstate/elecstate_lcao.h"
#include "module_elecstate/module_charge/charge_mixing.h"
#include "module_elecstate/occupy.h"
#include "module_elecstate/potentials/H_TDDFT_pw.h"
#include "module_elecstate/potentials/efield.h"
#include "module_elecstate/potentials/gatefield.h"
#include "module_elecstate/module_pot/H_TDDFT_pw.h"
#include "module_elecstate/module_pot/efield.h"
#include "module_elecstate/module_pot/gatefield.h"
#include "module_hamilt_lcao/hamilt_lcaodft/FORCE_STRESS.h"
#include "module_hamilt_lcao/module_dftu/dftu.h"
#include "module_hamilt_lcao/module_tddft/evolve_elec.h"
Expand Down
4 changes: 2 additions & 2 deletions source/module_io/write_elecstat_pot.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include "module_base/element_name.h"
#include "module_base/timer.h"
#include "module_parameter/parameter.h"
#include "module_elecstate/potentials/H_Hartree_pw.h"
#include "module_elecstate/potentials/efield.h"
#include "module_elecstate/module_pot/H_Hartree_pw.h"
#include "module_elecstate/module_pot/efield.h"
#include "module_hamilt_pw/hamilt_pwdft/global.h"
#include "module_io/cube_io.h"
#include "module_io/output_log.h"
Expand Down
2 changes: 1 addition & 1 deletion source/module_io/write_vxc_lip.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "module_psi/psi.h"
#include "module_cell/unitcell.h"
#include "module_cell/klist.h"
#include "module_elecstate/potentials/potential_new.h"
#include "module_elecstate/module_pot/potential_new.h"
#include "module_io/write_HS.h"
#include <type_traits>

Expand Down
2 changes: 1 addition & 1 deletion source/module_lr/potentials/pot_hxc_lrtd.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "pot_hxc_lrtd.h"
#include "module_parameter/parameter.h"
#include "module_elecstate/potentials/H_Hartree_pw.h"
#include "module_elecstate/module_pot/H_Hartree_pw.h"
#include "module_base/timer.h"
#include "module_hamilt_general/module_xc/xc_functional.h"
#include <set>
Expand Down
2 changes: 1 addition & 1 deletion source/module_lr/potentials/pot_hxc_lrtd.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include "module_elecstate/potentials/H_Hartree_pw.h"
#include "module_elecstate/module_pot/H_Hartree_pw.h"
#include "xc_kernel.h"
#include <unordered_map>
#include <memory>
Expand Down
6 changes: 3 additions & 3 deletions source/module_rdmft/rdmft_tools.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
#include "module_base/tool_title.h"
#include "module_base/timer.h"
#include "module_hamilt_general/module_xc/xc_functional.h"
#include "module_elecstate/potentials/H_Hartree_pw.h"
#include "module_elecstate/potentials/pot_local.h"
#include "module_elecstate/potentials/pot_xc.h"
#include "module_elecstate/module_pot/H_Hartree_pw.h"
#include "module_elecstate/module_pot/pot_local.h"
#include "module_elecstate/module_pot/pot_xc.h"
#include "module_hamilt_pw/hamilt_pwdft/structure_factor.h"

#include <iostream>
Expand Down
2 changes: 1 addition & 1 deletion source/module_rdmft/rdmft_tools.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "module_cell/unitcell.h"
#include "module_hamilt_lcao/module_gint/gint_gamma.h"
#include "module_hamilt_lcao/module_gint/gint_k.h"
#include "module_elecstate/potentials/potential_new.h"
#include "module_elecstate/module_pot/potential_new.h"
#include "module_base/blas_connector.h"
#include "module_base/scalapack_connector.h"
#include "module_base/parallel_2d.h"
Expand Down