Skip to content

[Refactor] Rename module_esolver to source_esolver #6300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 17, 2025
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 docs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ For those who are interested in the source code, the following figure shows the
|-- module_elecstate The module for defining the electronic state and its operations.
| |-- module_charge The module for calculating the charge density, charge mixing
| |-- potentials The module for calculating the potentials, including Hartree, exchange-correlation, local pseudopotential, etc.
|-- module_esolver The module defining task-specific driver of corresponding workflow for evaluating energies, forces, etc., including lj, dp, ks, sdft, ofdft, etc.
|-- source_esolver The module defining task-specific driver of corresponding workflow for evaluating energies, forces, etc., including lj, dp, ks, sdft, ofdft, etc.
| | TDDFT, Orbital-free DFT, etc.
|-- module_hamilt_general The module for defining general Hamiltonian that can be used both in PW and LCAO calculations.
| |-- module_ewald The module for calculating the Ewald summation.
Expand Down
2 changes: 1 addition & 1 deletion source/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ add_subdirectory(module_basis/module_ao)
add_subdirectory(module_basis/module_nao)
add_subdirectory(module_md)
add_subdirectory(module_basis/module_pw)
add_subdirectory(module_esolver)
add_subdirectory(source_esolver)
add_subdirectory(module_hamilt_lcao/module_gint)
add_subdirectory(module_io)
add_subdirectory(module_relax)
Expand Down
2 changes: 1 addition & 1 deletion source/Makefile.Objects
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ VPATH=./src_global:\
./module_md:\
./module_basis/module_pw:\
./module_basis/module_pw/module_fft:\
./module_esolver:\
./source_esolver:\
./module_hsolver:\
./module_hsolver/kernels:\
./module_hsolver/genelpa:\
Expand Down
2 changes: 1 addition & 1 deletion source/module_base/module_device/device.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ namespace information

/**
* @brief Get the device info object
* for module_esolver
* for source_esolver
*/
std::string get_device_info(std::string device_flag);

Expand Down
4 changes: 2 additions & 2 deletions source/module_hamilt_lcao/module_tddft/evolve_elec.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#include "module_base/module_device/device.h" // base_device
#include "module_base/module_device/memory_op.h" // memory operations
#include "module_base/scalapack_connector.h" // Cpxgemr2d
#include "module_esolver/esolver_ks_lcao.h"
#include "module_esolver/esolver_ks_lcao_tddft.h"
#include "source_esolver/esolver_ks_lcao.h"
#include "source_esolver/esolver_ks_lcao_tddft.h"
#include "module_hamilt_lcao/hamilt_lcaodft/hamilt_lcao.h"
#include "module_psi/psi.h"

Expand Down
2 changes: 1 addition & 1 deletion source/module_hamilt_lcao/module_tddft/evolve_psi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "module_base/module_container/ATen/kernels/blas.h" // cuBLAS handle
#include "module_base/module_container/ATen/kernels/lapack.h" // cuSOLVER handle
#include "module_base/scalapack_connector.h"
#include "module_esolver/esolver_ks_lcao_tddft.h" // use gatherMatrix
#include "source_esolver/esolver_ks_lcao_tddft.h" // use gatherMatrix
#include "module_hamilt_lcao/hamilt_lcaodft/hamilt_lcao.h"
#include "module_hamilt_pw/hamilt_pwdft/global.h"
#include "module_parameter/parameter.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 @@ -4,7 +4,7 @@
#include "module_base/macros.h"
#include "module_cell/klist.h"
#include "module_elecstate/module_pot/potential_new.h"
#include "module_esolver/esolver_ks_pw.h"
#include "source_esolver/esolver_ks_pw.h"
#include "module_hamilt_general/hamilt.h"
#include "module_hamilt_pw/hamilt_pwdft/VNL_in_pw.h"
#include "module_base/kernels/math_kernel_op.h"
Expand Down
4 changes: 2 additions & 2 deletions source/module_lr/esolver_lrtd_lcao.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include "module_esolver/esolver_fp.h"
#include "source_esolver/esolver_fp.h"
#include "module_parameter/input_parameter.h"
#include "module_cell/unitcell.h"
#include "module_hamilt_general/hamilt.h"
Expand All @@ -10,7 +10,7 @@
#include <vector> //future tensor
#include <memory>

#include "module_esolver/esolver_ks_lcao.h" //for the move constructor
#include "source_esolver/esolver_ks_lcao.h" //for the move constructor
#include "module_hamilt_lcao/module_gint/gint_gamma.h"
#include "module_hamilt_lcao/module_gint/gint_k.h"
#include "module_hamilt_lcao/module_gint/grid_technique.h"
Expand Down
2 changes: 1 addition & 1 deletion source/module_md/md_base.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef MD_BASE_H
#define MD_BASE_H

#include "module_esolver/esolver.h"
#include "source_esolver/esolver.h"
#include "module_parameter/parameter.h"

/**
Expand Down
2 changes: 1 addition & 1 deletion source/module_md/md_func.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef MD_FUNC_H
#define MD_FUNC_H

#include "module_esolver/esolver.h"
#include "source_esolver/esolver.h"

#ifdef __MPI
#include <mpi.h> // MPI functions
Expand Down
2 changes: 1 addition & 1 deletion source/module_md/run_md.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef RUN_MD_H
#define RUN_MD_H

#include "module_esolver/esolver.h"
#include "source_esolver/esolver.h"
#include "module_parameter/parameter.h"

/**
Expand Down
2 changes: 1 addition & 1 deletion source/module_md/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ list(APPEND depend_files
../../module_io/output_log.cpp
../../module_io/print_info.cpp
../../module_io/cif_io.cpp
../../module_esolver/esolver_lj.cpp
../../source_esolver/esolver_lj.cpp
../../module_base/parallel_reduce.cpp
../../module_base/parallel_global.cpp
../../module_base/parallel_comm.cpp
Expand Down
2 changes: 1 addition & 1 deletion source/module_md/test/fire_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#undef private
#define private public
#define protected public
#include "module_esolver/esolver_lj.h"
#include "source_esolver/esolver_lj.h"
#include "module_md/fire.h"
#include "setcell.h"
#define doublethreshold 1e-12
Expand Down
2 changes: 1 addition & 1 deletion source/module_md/test/langevin_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#undef private
#define private public
#define protected public
#include "module_esolver/esolver_lj.h"
#include "source_esolver/esolver_lj.h"
#include "module_md/langevin.h"
#include "setcell.h"
#define doublethreshold 1e-12
Expand Down
2 changes: 1 addition & 1 deletion source/module_md/test/lj_pot_test.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "gtest/gtest.h"
#define private public
#include "module_parameter/parameter.h"
#include "module_esolver/esolver_lj.h"
#include "source_esolver/esolver_lj.h"
#include "module_md/md_func.h"
#include "setcell.h"
#undef private
Expand Down
2 changes: 1 addition & 1 deletion source/module_md/test/md_func_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#undef private
#define private public
#define protected public
#include "module_esolver/esolver_lj.h"
#include "source_esolver/esolver_lj.h"
#include "module_md/md_func.h"
#include "setcell.h"

Expand Down
2 changes: 1 addition & 1 deletion source/module_md/test/msst_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#undef private
#define private public
#define protected public
#include "module_esolver/esolver_lj.h"
#include "source_esolver/esolver_lj.h"
#include "module_md/msst.h"
#include "setcell.h"
#define doublethreshold 1e-12
Expand Down
2 changes: 1 addition & 1 deletion source/module_md/test/nhchain_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#undef private
#define private public
#define protected public
#include "module_esolver/esolver_lj.h"
#include "source_esolver/esolver_lj.h"
#include "module_md/nhchain.h"
#include "setcell.h"
#define doublethreshold 1e-12
Expand Down
2 changes: 1 addition & 1 deletion source/module_md/test/verlet_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#undef private
#define private public
#define protected public
#include "module_esolver/esolver_lj.h"
#include "source_esolver/esolver_lj.h"
#include "module_md/verlet.h"
#include "setcell.h"
#define doublethreshold 1e-12
Expand Down
4 changes: 2 additions & 2 deletions source/module_relax/relax_driver.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#define RELAX_DRIVER_H

#include "module_cell/unitcell.h"
#include "module_esolver/esolver.h"
#include "module_esolver/esolver_ks.h"
#include "source_esolver/esolver.h"
#include "source_esolver/esolver_ks.h"
#include "relax_new/relax.h"
#include "relax_old/relax_old.h"
#include "relax_old/bfgs.h"
Expand Down
4 changes: 2 additions & 2 deletions source/module_relax/relax_old/ions_move_methods.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#include "ions_move_sd.h"
#include "bfgs.h"
#include "lbfgs.h"
#include "module_esolver/esolver.h"
#include "module_esolver/esolver_ks.h"
#include "source_esolver/esolver.h"
#include "source_esolver/esolver_ks.h"

class Ions_Move_Methods
{
Expand Down
4 changes: 2 additions & 2 deletions source/module_relax/relax_old/lbfgs.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#include "module_base/matrix.h"
#include "module_base/matrix3.h"
#include "module_cell/unitcell.h"
#include "module_esolver/esolver.h"
#include "module_esolver/esolver_ks.h"
#include "source_esolver/esolver.h"
#include "source_esolver/esolver_ks.h"

/**
* @class LBFGS
Expand Down
4 changes: 2 additions & 2 deletions source/module_relax/relax_old/relax_old.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#include "ions_move_methods.h"
#include "lattice_change_methods.h"
#include "module_cell/unitcell.h"
#include "module_esolver/esolver.h"
#include "module_esolver/esolver_ks.h"
#include "source_esolver/esolver.h"
#include "source_esolver/esolver_ks.h"

class Relax_old
{
Expand Down
2 changes: 1 addition & 1 deletion source/module_ri/RPA_LRI.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#ifndef RPA_LRI_H
#define RPA_LRI_H

#include "module_esolver/esolver_ks_lcao.h"
#include "source_esolver/esolver_ks_lcao.h"
#include "LRI_CV.h"
// #include "module_xc/exx_info.h"
// #include "module_basis/module_ao/ORB_atomic_lm.h"
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef ESOLVER_DM2RHO_H
#define ESOLVER_DM2RHO_H

#include "module_esolver/esolver_ks_lcao.h"
#include "source_esolver/esolver_ks_lcao.h"

#include <memory>

Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "module_basis/module_nao/two_center_bundle.h"
#include "module_cell/unitcell.h"
#include "module_esolver/esolver_ks.h"
#include "source_esolver/esolver_ks.h"

#include <memory>

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#ifndef ESOLVER_KS_LIP_H
#define ESOLVER_KS_LIP_H
#include "module_esolver/esolver_ks_pw.h"
#include "source_esolver/esolver_ks_pw.h"
#include "module_hsolver/hsolver_lcaopw.h"

#ifdef __EXX
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "module_elecstate/module_charge/symmetry_rho.h"
#include "module_esolver/esolver_ks_lcao.h"
#include "source_esolver/esolver_ks_lcao.h"
#include "module_hamilt_lcao/hamilt_lcaodft/hamilt_lcao.h"
#include "module_hamilt_lcao/module_dftu/dftu.h"
#include "module_hamilt_pw/hamilt_pwdft/global.h"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "module_elecstate/cal_ux.h"
#include "module_elecstate/module_charge/symmetry_rho.h"
#include "module_esolver/esolver_ks_lcao.h"
#include "source_esolver/esolver_ks_lcao.h"
#include "module_hamilt_lcao/hamilt_lcaodft/hamilt_lcao.h"
#include "module_hamilt_lcao/module_dftu/dftu.h"
#include "module_hamilt_pw/hamilt_pwdft/global.h"
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion source/source_main/driver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "module_base/global_file.h"
#include "module_base/memory.h"
#include "module_base/timer.h"
#include "module_esolver/esolver.h"
#include "source_esolver/esolver.h"
#include "module_hamilt_pw/hamilt_pwdft/global.h"
#include "module_io/cal_test.h"
#include "module_io/input_conv.h"
Expand Down
2 changes: 1 addition & 1 deletion tests/04_LJ_DP/50_DP_Al/README
Original file line number Diff line number Diff line change
@@ -1 +1 @@
This test is for DP potential in module_esolver
This test is for DP potential in source_esolver
Loading