Commit 1778e90
Reorganize the source_psi and source_io directories (#6923)
* Refactor: Encapsulate timer functionality in timer_wrapper.h
* Refactor timer code and clean_esolver function
1. Remove #ifdef __MPI from timer code, encapsulate in timer_wrapper.h
2. Move ESolver clean logic to after_all_runners method
3. Replace clean_esolver calls with direct delete p_esolver
4. Remove #ifdef __MPI from delete p_esolver
5. Add Cblacs_exit(1) in after_all_runners for LCAO calculations
* move exx_helper to module_pwdft
* rename pw files
* Refactor: Move and rename nonlocal_pw files to module_pwdft directory
* Refactor: Move and rename velocity_pw, veff_pw, and meta_pw files to module_pwdft directory
* Refactor: Move and rename all operator_pw files to module_pwdft directory and clean up
* Refactor: Rename stress_func_xxx files to stress_xxx by removing _func suffix
* Rename V*_in_pw files to more concise names and update references
This commit includes:
1. Renamed files in module_pwdft directory:
- VL_in_pw.cpp/h → vl_pw.cpp/h
- VNL_in_pw.cpp/h → vnl_pw.cpp/h
- VNL_grad_pw.cpp → vnl_pw_grad.cpp
- VSep_in_pw.cpp/h → vsep_pw.cpp/h
2. Updated CMakeLists.txt and Makefile.Objects to use new filenames
3. Updated include paths in 41 files across the codebase:
- source_cell/test/klist_test.cpp and klist_test_para.cpp
- source_esolver/esolver_fp.h, esolver_ks_pw.cpp, esolver_ks_pw.h
- source_estate/module_pot/pot_sep.h, potential_new.h, setup_estate_pw.h
- source_estate/test/elecstate_pw_test.cpp
- source_io/test/for_testing_input_conv.h, for_testing_klist.h
- source_lcao/LCAO_set.h
- source_psi/psi_initializer.h and related files
- source_pw/module_ofdft/of_stress_pw.h
- source_pw/module_pwdft/* (multiple files)
- source_pw/module_stodft/sto_stress_pw.h
4. Verified compilation success with make -j30
The renaming follows consistent naming conventions and makes filenames more concise.
* fix Makefile.Objects
* Fix CI/CD error: Update operator_pw paths to new op_pw locations
This commit fixes the CI/CD build error by updating references to the old operator_pw directory structure:
1. Updated source/source_hsolver/test/CMakeLists.txt:
- Changed all 7 references from '../../source_pw/module_pwdft/operator_pw/operator_pw.cpp' to '../../source_pw/module_pwdft/op_pw.cpp'
2. Updated source/source_hsolver/test/diago_mock.h:
- Changed '#include "source_pw/module_pwdft/operator_pw/operator_pw.h"' to '#include "source_pw/module_pwdft/op_pw.h"'
The operator_pw directory has been renamed and its files moved to the module_pwdft root directory with op_pw_ prefixes, so these path updates are necessary to ensure CI/CD builds succeed.
* Rename psi_initializer* files to psi_init* and psi_init* to psi_prepare*
This commit includes:
1. Renamed psi_initializer* files to psi_init*:
- psi_initializer_atomic.cpp/h → psi_init_atomic.cpp/h
- psi_initializer_atomic_random.cpp/h → psi_init_atomic_random.cpp/h
- psi_initializer_file.cpp/h → psi_init_file.cpp/h
- psi_initializer_nao.cpp/h → psi_init_nao.cpp/h
- psi_initializer_nao_random.cpp/h → psi_init_nao_random.cpp/h
- psi_initializer_random.cpp/h → psi_init_random.cpp/h
2. Renamed psi_init* files to psi_prepare*:
- psi_init.cpp → psi_prepare.cpp
- psi_init.h → psi_prepare.h
3. Updated all references to the renamed files:
- Updated include directives in all affected files
- Updated class names and constructor names
- Updated template instantiations
- Updated inheritance relationships
- Updated CMakeLists.txt to use new filenames
- Updated Makefile.Objects to use new filenames
- Updated to_wannier90_lcao_in_pw.cpp to use new filenames
4. Fixed compilation errors and ensured CPU version builds successfully
The changes follow consistent naming conventions and improve code organization.
* Move to_wannier90 files to module_wannier directory
This commit includes the following changes:
1. Moved to_wannier90 files from source_io to module_wannier directory:
- source/source_io/to_wannier90.cpp -> source/source_io/module_wannier/to_wannier90.cpp
- source/source_io/to_wannier90.h -> source/source_io/module_wannier/to_wannier90.h
- source/source_io/to_wannier90_lcao.cpp -> source/source_io/module_wannier/to_wannier90_lcao.cpp
- source/source_io/to_wannier90_lcao.h -> source/source_io/module_wannier/to_wannier90_lcao.h
- source/source_io/to_wannier90_lcao_in_pw.cpp -> source/source_io/module_wannier/to_wannier90_lcao_in_pw.cpp
- source/source_io/to_wannier90_lcao_in_pw.h -> source/source_io/module_wannier/to_wannier90_lcao_in_pw.h
- source/source_io/to_wannier90_pw.cpp -> source/source_io/module_wannier/to_wannier90_pw.cpp
- source/source_io/to_wannier90_pw.h -> source/source_io/module_wannier/to_wannier90_pw.h
2. Updated include directives in affected files:
- source/source_io/ctrl_scf_lcao.cpp: Updated to_wannier90_lcao.h include path
- source/source_esolver/esolver_ks_lcaopw.cpp: Updated to_wannier90_lcao_in_pw.h include path
- source/source_io/ctrl_output_pw.cpp: Updated to_wannier90_pw.h include path
- Updated include paths in all moved files to use relative paths
3. Updated build system files:
- source/source_io/CMakeLists.txt: Added module_wannier/to_wannier90* files
- source/Makefile.Objects: Updated paths for all moved files
4. Fixed relative path issues in module_wannier files:
- Updated binstream.h include to use ../binstream.h
- Updated other relative include paths as needed
All changes have been verified by compiling the CPU version successfully.
* Move read_input files to module_parameter directory
This commit includes the following changes:
1. Moved read_input files from source_io to module_parameter directory:
- source/source_io/read_input.cpp -> source/source_io/module_parameter/read_input.cpp
- source/source_io/read_input.h -> source/source_io/module_parameter/read_input.h
- source/source_io/read_input_item_deepks.cpp -> source/source_io/module_parameter/read_input_item_deepks.cpp
- source/source_io/read_input_item_elec_stru.cpp -> source/source_io/module_parameter/read_input_item_elec_stru.cpp
- source/source_io/read_input_item_exx_dftu.cpp -> source/source_io/module_parameter/read_input_item_exx_dftu.cpp
- source/source_io/read_input_item_md.cpp -> source/source_io/module_parameter/read_input_item_md.cpp
- source/source_io/read_input_item_model.cpp -> source/source_io/module_parameter/read_input_item_model.cpp
- source/source_io/read_input_item_ofdft.cpp -> source/source_io/module_parameter/read_input_item_ofdft.cpp
- source/source_io/read_input_item_other.cpp -> source/source_io/module_parameter/read_input_item_other.cpp
- source/source_io/read_input_item_output.cpp -> source/source_io/module_parameter/read_input_item_output.cpp
- source/source_io/read_input_item_postprocess.cpp -> source/source_io/module_parameter/read_input_item_postprocess.cpp
- source/source_io/read_input_item_relax.cpp -> source/source_io/module_parameter/read_input_item_relax.cpp
- source/source_io/read_input_item_sdft.cpp -> source/source_io/module_parameter/read_input_item_sdft.cpp
- source/source_io/read_input_item_system.cpp -> source/source_io/module_parameter/read_input_item_system.cpp
- source/source_io/read_input_item_tddft.cpp -> source/source_io/module_parameter/read_input_item_tddft.cpp
- source/source_io/read_input_tool.h -> source/source_io/module_parameter/read_input_tool.h
2. Updated include directives in affected files:
- source/source_io/module_parameter/read_input.h: Updated input_item.h include path to use ../input_item.h
- source/source_main/driver.cpp: Updated read_input.h include path to use source_io/module_parameter/read_input.h
- source/source_io/parse_args.cpp: Updated read_input.h include path to use module_parameter/read_input.h
- source/source_io/read_set_globalv.cpp: Updated read_input.h and read_input_tool.h include paths
3. Updated build system files:
- source/source_io/CMakeLists.txt: Updated read_input files paths to use module_parameter/ prefix
- source/Makefile.Objects: Updated read_input files paths to use module_parameter/ prefix
4. Fixed relative path issues in module_parameter files:
- Updated input_item.h include to use ../input_item.h
- Updated other relative include paths as needed
All changes have been verified by compiling the CPU version successfully.
* Move berryphase and unk files to module_unk directory
This commit includes the following changes:
1. Moved berryphase and unk files from source_io to module_unk directory:
- source/source_io/berryphase.cpp -> source/source_io/module_unk/berryphase.cpp
- source/source_io/berryphase.h -> source/source_io/module_unk/berryphase.h
- source/source_io/unk_overlap_lcao.cpp -> source/source_io/module_unk/unk_overlap_lcao.cpp
- source/source_io/unk_overlap_lcao.h -> source/source_io/module_unk/unk_overlap_lcao.h
- source/source_io/unk_overlap_pw.cpp -> source/source_io/module_unk/unk_overlap_pw.cpp
- source/source_io/unk_overlap_pw.h -> source/source_io/module_unk/unk_overlap_pw.h
2. Updated include directives in affected files:
- source/source_cell/klist.cpp: Updated berryphase.h include path to use source_io/module_unk/berryphase.h
- source/source_esolver/esolver_ks_lcaopw.cpp: Updated berryphase.h include path to use source_io/module_unk/berryphase.h
- source/source_esolver/lcao_others.cpp: Updated berryphase.h include path to use source_io/module_unk/berryphase.h
- source/source_io/ctrl_output_pw.cpp: Updated berryphase.h include path to use module_unk/berryphase.h
- source/source_io/ctrl_scf_lcao.cpp: Updated berryphase.h include path to use module_unk/berryphase.h
- source/source_io/input_conv.cpp: Updated berryphase.h include path to use module_unk/berryphase.h
- source/source_io/module_unk/berryphase.cpp: Updated complexmatrix.h include path to use ../../source_base/complexmatrix.h
3. Updated build system files:
- source/source_io/CMakeLists.txt: Updated berryphase.cpp and unk_overlap_*.cpp paths to use module_unk/ prefix
- source/Makefile.Objects: Updated berryphase.o and unk_overlap_*.o paths to use module_unk/ prefix
All changes have been verified by compiling the CPU version successfully.
* Move input_conv and input_item files to module_parameter directory
This commit includes the following changes:
1. Moved input_conv and input_item files from source_io to module_parameter directory:
- source/source_io/input_conv.cpp -> source/source_io/module_parameter/input_conv.cpp
- source/source_io/input_conv.h -> source/source_io/module_parameter/input_conv.h
- source/source_io/input_item.h -> source/source_io/module_parameter/input_item.h
2. Updated include directives in affected files:
- source/source_main/driver.cpp: Updated input_conv.h include path to use source_io/module_parameter/input_conv.h
- source/source_esolver/esolver_ks_lcaopw.cpp: Updated input_conv.h include path to use source_io/module_parameter/input_conv.h
- source/source_estate/module_pot/H_TDDFT_pw.h: Updated input_conv.h include path to use source_io/module_parameter/input_conv.h
- source/source_estate/module_pot/H_TDDFT_pw.cpp: Updated input_conv.h include path to use source_io/module_parameter/input_conv.h
- source/source_lcao/FORCE_STRESS.h: Updated input_conv.h include path to use source_io/module_parameter/input_conv.h
- source/source_io/module_parameter/input_conv.cpp: Updated input_conv.h include path to use input_conv.h and berryphase.h include path to use ../module_unk/berryphase.h
- source/source_io/module_parameter/read_input.h: Updated input_item.h include path to use input_item.h
3. Updated build system files:
- source/source_io/CMakeLists.txt: Updated input_conv.cpp path to use module_parameter/input_conv.cpp
- source/Makefile.Objects: Updated input_conv.o path to use module_parameter/input_conv.o
All changes have been verified by compiling the CPU version successfully.
* Move DOS-related files to module_dos directory
This commit includes the following changes:
1. Moved DOS-related files from source_io to module_dos directory:
- source/source_io/cal_dos.cpp -> source/source_io/module_dos/cal_dos.cpp
- source/source_io/cal_dos.h -> source/source_io/module_dos/cal_dos.h
- source/source_io/cal_ldos.cpp -> source/source_io/module_dos/cal_ldos.cpp
- source/source_io/cal_ldos.h -> source/source_io/module_dos/cal_ldos.h
- source/source_io/cal_pdos_gamma.cpp -> source/source_io/module_dos/cal_pdos_gamma.cpp
- source/source_io/cal_pdos_gamma.h -> source/source_io/module_dos/cal_pdos_gamma.h
- source/source_io/cal_pdos_multik.cpp -> source/source_io/module_dos/cal_pdos_multik.cpp
- source/source_io/cal_pdos_multik.h -> source/source_io/module_dos/cal_pdos_multik.h
- source/source_io/write_dos_lcao.cpp -> source/source_io/module_dos/write_dos_lcao.cpp
- source/source_io/write_dos_lcao.h -> source/source_io/module_dos/write_dos_lcao.h
- source/source_io/write_dos_pw.cpp -> source/source_io/module_dos/write_dos_pw.cpp
- source/source_io/write_dos_pw.h -> source/source_io/module_dos/write_dos_pw.h
2. Updated include directives in affected files:
- source/source_io/ctrl_scf_lcao.cpp: Updated write_dos_lcao.h include path to use module_dos/write_dos_lcao.h
- source/source_io/ctrl_runner_lcao.cpp: Updated cal_ldos.h include path to use module_dos/cal_ldos.h
- source/source_io/ctrl_output_pw.cpp: Updated write_dos_pw.h and cal_ldos.h include paths to use module_dos/ prefix
- source/source_io/module_dos/cal_ldos.cpp: Updated cube_io.h include path to use ../cube_io.h
- source/source_io/module_dos/cal_pdos_gamma.cpp: Updated write_orb_info.h include path to use ../write_orb_info.h
- source/source_io/module_dos/cal_pdos_multik.cpp: Updated write_orb_info.h include path to use ../write_orb_info.h
- source/source_io/module_dos/write_dos_lcao.cpp: Updated nscf_fermi_surf.h include path to use ../nscf_fermi_surf.h
- source/source_io/module_dos/write_dos_pw.cpp: Updated nscf_fermi_surf.h include path to use ../nscf_fermi_surf.h
3. Updated build system files:
- source/source_io/CMakeLists.txt: Updated all DOS-related files paths to use module_dos/ prefix
- source/Makefile.Objects: Updated all DOS-related files paths to use module_dos/ prefix
All changes have been verified by compiling the CPU version successfully.
* Move to_qo files to module_qo directory
This commit includes the following changes:
1. Moved to_qo files from source_io to module_qo directory:
- source/source_io/to_qo.h -> source/source_io/module_qo/to_qo.h
- source/source_io/to_qo_kernel.cpp -> source/source_io/module_qo/to_qo_kernel.cpp
- source/source_io/to_qo_mpi.cpp -> source/source_io/module_qo/to_qo_mpi.cpp
- source/source_io/to_qo_structures.cpp -> source/source_io/module_qo/to_qo_structures.cpp
2. Updated include directives in affected files:
- source/source_io/ctrl_scf_lcao.cpp: Updated to_qo.h include path to use module_qo/to_qo.h
- source/source_io/test/to_qo_test.cpp: Updated to_qo.h include path to use module_qo/to_qo.h
- source/source_io/module_qo/to_qo_kernel.cpp: Updated to_qo.h include path to use to_qo.h (relative path)
- source/source_io/module_qo/to_qo_mpi.cpp: Updated to_qo.h and parallel_common.h include paths to use to_qo.h and ../../source_base/parallel_common.h (relative paths)
- source/source_io/module_qo/to_qo_structures.cpp: Updated to_qo.h and parallel_common.h include paths to use to_qo.h and ../../source_base/parallel_common.h (relative paths)
3. Updated build system files:
- source/source_io/CMakeLists.txt: Updated to_qo files paths to use module_qo/ prefix
- source/Makefile.Objects: Updated to_qo files paths to use module_qo/ prefix
All changes have been verified by compiling the CPU version successfully.
* Move mlkedf and npz files to module_ml directory
This commit includes the following changes:
1. Moved mlkedf and npz files from source_io to module_ml directory:
- source/source_io/cal_mlkedf_descriptors.cpp -> source/source_io/module_ml/cal_mlkedf_descriptors.cpp
- source/source_io/cal_mlkedf_descriptors.h -> source/source_io/module_ml/cal_mlkedf_descriptors.h
- source/source_io/write_mlkedf_descriptors.cpp -> source/source_io/module_ml/write_mlkedf_descriptors.cpp
- source/source_io/write_mlkedf_descriptors.h -> source/source_io/module_ml/write_mlkedf_descriptors.h
- source/source_io/io_npz.cpp -> source/source_io/module_ml/io_npz.cpp
- source/source_io/io_npz.h -> source/source_io/module_ml/io_npz.h
2. Updated include directives in affected files:
- source/source_estate/module_pot/pot_ml_exx.h: Updated cal_mlkedf_descriptors.h include path to use source_io/module_ml/cal_mlkedf_descriptors.h
- source/source_pw/module_ofdft/ml_base.h: Updated cal_mlkedf_descriptors.h include path to use source_io/module_ml/cal_mlkedf_descriptors.h
- source/source_io/ctrl_output_pw.cpp: Updated write_mlkedf_descriptors.h include path to use module_ml/write_mlkedf_descriptors.h
- source/source_esolver/esolver_dm2rho.cpp: Updated io_npz.h include path to use ../source_io/module_ml/io_npz.h
- source/source_io/module_ml/write_mlkedf_descriptors.h: Updated cal_mlkedf_descriptors.h include path to use cal_mlkedf_descriptors.h (relative path)
3. Updated build system files:
- source/source_io/CMakeLists.txt: Updated mlkedf and npz files paths to use module_ml/ prefix
- source/Makefile.Objects: Updated io_npz.o path to use module_ml/io_npz.o
All changes have been verified by compiling the CPU version successfully.
* Move ctrl files to module_ctrl directory
This commit includes the following changes:
1. Moved ctrl files from source_io to module_ctrl directory:
- source/source_io/ctrl_output_pw.cpp -> source/source_io/module_ctrl/ctrl_output_pw.cpp
- source/source_io/ctrl_output_pw.h -> source/source_io/module_ctrl/ctrl_output_pw.h
- source/source_io/ctrl_output_fp.cpp -> source/source_io/module_ctrl/ctrl_output_fp.cpp
- source/source_io/ctrl_output_fp.h -> source/source_io/module_ctrl/ctrl_output_fp.h
- source/source_io/ctrl_output_td.cpp -> source/source_io/module_ctrl/ctrl_output_td.cpp
- source/source_io/ctrl_output_td.h -> source/source_io/module_ctrl/ctrl_output_td.h
- source/source_io/ctrl_scf_lcao.cpp -> source/source_io/module_ctrl/ctrl_scf_lcao.cpp
- source/source_io/ctrl_scf_lcao.h -> source/source_io/module_ctrl/ctrl_scf_lcao.h
- source/source_io/ctrl_runner_lcao.cpp -> source/source_io/module_ctrl/ctrl_runner_lcao.cpp
- source/source_io/ctrl_runner_lcao.h -> source/source_io/module_ctrl/ctrl_runner_lcao.h
- source/source_io/ctrl_iter_lcao.cpp -> source/source_io/module_ctrl/ctrl_iter_lcao.cpp
- source/source_io/ctrl_iter_lcao.h -> source/source_io/module_ctrl/ctrl_iter_lcao.h
2. Updated include directives in affected files:
- source/source_esolver/esolver_fp.cpp: Updated ctrl_output_fp.h include path to use source_io/module_ctrl/ctrl_output_fp.h
- source/source_esolver/esolver_ks_lcao.cpp: Updated ctrl_runner_lcao.h, ctrl_iter_lcao.h, ctrl_scf_lcao.h include paths to use source_io/module_ctrl/
- source/source_esolver/esolver_ks_pw.cpp: Updated ctrl_output_pw.h include path to use source_io/module_ctrl/ctrl_output_pw.h
- source/source_esolver/esolver_ks_lcao_tddft.cpp: Updated ctrl_output_td.h include path to use source_io/module_ctrl/ctrl_output_td.h
- source/source_io/module_ctrl/ctrl_output_pw.cpp: Updated include paths to use relative paths
- source/source_io/module_ctrl/ctrl_output_fp.cpp: Updated include paths to use relative paths
- source/source_io/module_ctrl/ctrl_scf_lcao.cpp: Updated include paths to use relative paths
- source/source_io/module_ctrl/ctrl_runner_lcao.cpp: Updated include paths to use relative paths
- source/source_io/module_ctrl/ctrl_iter_lcao.cpp: Updated include paths to use relative paths
3. Updated build system files:
- source/source_io/CMakeLists.txt: Updated ctrl files paths to use module_ctrl/ prefix
- source/Makefile.Objects: Updated ctrl files paths to use module_ctrl/ prefix
4. Added missing dos-related files to CMakeLists.txt to resolve link errors:
- module_dos/cal_dos.cpp
- module_dos/cal_ldos.cpp
- module_dos/cal_pdos_gamma.cpp
- module_dos/cal_pdos_multik.cpp
- module_dos/write_dos_lcao.cpp
All changes have been verified by compiling the CPU version successfully.
* Move bessel and numerical_ files to module_bessel directory
This commit includes the following changes:
1. Moved bessel and numerical_ files from source_io to module_bessel directory:
- source/source_io/bessel_basis.cpp -> source/source_io/module_bessel/bessel_basis.cpp
- source/source_io/bessel_basis.h -> source/source_io/module_bessel/bessel_basis.h
- source/source_io/numerical_basis.cpp -> source/source_io/module_bessel/numerical_basis.cpp
- source/source_io/numerical_basis.h -> source/source_io/module_bessel/numerical_basis.h
- source/source_io/numerical_basis_jyjy.cpp -> source/source_io/module_bessel/numerical_basis_jyjy.cpp
- source/source_io/numerical_basis_jyjy.h -> source/source_io/module_bessel/numerical_basis_jyjy.h
- source/source_io/numerical_descriptor.cpp -> source/source_io/module_bessel/numerical_descriptor.cpp
- source/source_io/numerical_descriptor.h -> source/source_io/module_bessel/numerical_descriptor.h
2. Updated include directives in affected files:
- source/source_esolver/esolver_ks_lcaopw.cpp: Updated numerical_basis.h and numerical_descriptor.h include paths to use source_io/module_bessel/
- source/source_esolver/pw_others.cpp: Updated numerical_basis.h and numerical_descriptor.h include paths to use source_io/module_bessel/
- source/source_io/module_ctrl/ctrl_output_pw.cpp: Updated numerical_basis.h and numerical_descriptor.h include paths to use ../module_bessel/
- source/source_io/test/bessel_basis_test.cpp: Updated bessel_basis.h include path to use ../module_bessel/bessel_basis.h
- source/source_io/test/numerical_basis_test.cpp: Updated numerical_basis_jyjy.h include path to use source_io/module_bessel/numerical_basis_jyjy.h
- source/source_io/module_bessel/bessel_basis.h: Updated include paths to use ../../source_base/ and ../../source_cell/
- source/source_io/module_bessel/numerical_basis.cpp: Updated numerical_basis_jyjy.h include path to use numerical_basis_jyjy.h (relative path)
- source/source_io/module_bessel/numerical_basis.h: Updated include paths to use ../../source_base/ and ../../source_cell/
- source/source_io/module_bessel/numerical_basis_jyjy.cpp: Updated numerical_basis_jyjy.h include path to use numerical_basis_jyjy.h (relative path)
- source/source_io/module_bessel/numerical_basis_jyjy.h: Updated include paths to use ../../source_base/
- source/source_io/module_bessel/numerical_descriptor.h: Updated include paths to use ../../source_base/ and ../../source_psi/
3. Updated build system files:
- source/source_io/CMakeLists.txt: Updated bessel and numerical_ files paths to use module_bessel/ prefix
- source/Makefile.Objects: Updated bessel and numerical_ files paths to use module_bessel/ prefix
All changes have been verified by compiling the CPU version successfully.
* Organize HS and SK files into module_hs directory
* Organize DM files into module_dm directory
This commit moves all density matrix (DM) related files to the dedicated module_dm directory for better code organization:
Moved files:
- source/source_io/output_dmk.cpp -> source/source_io/module_dm/output_dmk.cpp
- source/source_io/write_dmk.cpp -> source/source_io/module_dm/write_dmk.cpp
- source/source_io/write_dmk.h -> source/source_io/module_dm/write_dmk.h
- source/source_io/write_dmr.cpp -> source/source_io/module_dm/write_dmr.cpp
- source/source_io/write_dmr.h -> source/source_io/module_dm/write_dmr.h
- source/source_io/test/write_dmk_test.cpp -> source/source_io/module_dm/test/write_dmk_test.cpp
Updated build system files:
- source/source_io/CMakeLists.txt: Updated paths for output_dmk.cpp, write_dmk.cpp, write_dmr.cpp
- source/Makefile.Objects: Updated paths for output_dmk.o, write_dmk.o, write_dmr.o
- source/source_io/test/CMakeLists.txt: Updated path for write_dmk_test.cpp
Updated include paths in:
- source/source_io/module_ctrl/ctrl_scf_lcao.cpp
- source/source_io/module_dm/write_dmk.cpp
The changes ensure all DM related functionality is consolidated in one directory, improving code maintainability and organization.
* Move output_dmk.h to module_dm directory
This commit moves output_dmk.h to the module_dm directory for better code organization:
Moved file:
- source/source_io/output_dmk.h -> source/source_io/module_dm/output_dmk.h
Updated include paths in:
- source/source_io/module_dm/output_dmk.cpp
- source/source_io/output_mulliken.h
The changes ensure all DM related files are consolidated in the module_dm directory.
* Consolidate Mulliken-related files into module_mulliken directory
This commit moves all Mulliken population analysis related files to the dedicated module_mulliken directory for better code organization:
Moved files:
- source/source_io/output_mulliken.cpp -> source/source_io/module_mulliken/output_mulliken.cpp
- source/source_io/output_mulliken.h -> source/source_io/module_mulliken/output_mulliken.h
- source/source_io/module_hs/output_sk.cpp -> source/source_io/module_mulliken/output_sk.cpp
- source/source_io/module_hs/output_sk.h -> source/source_io/module_mulliken/output_sk.h
- source/source_io/module_dm/output_dmk.cpp -> source/source_io/module_mulliken/output_dmk.cpp
- source/source_io/module_dm/output_dmk.h -> source/source_io/module_mulliken/output_dmk.h
Updated build system files:
- source/source_io/CMakeLists.txt: Updated paths for output_mulliken.cpp, output_sk.cpp, output_dmk.cpp
- source/Makefile.Objects: Updated paths for output_mulliken.o, output_sk.o, output_dmk.o
Updated include paths in:
- source/source_io/module_ctrl/ctrl_scf_lcao.cpp
- source/source_io/module_mulliken/output_dmk.cpp
- source/source_io/module_mulliken/output_mulliken.cpp
- source/source_io/module_mulliken/output_mulliken.h
The changes ensure all Mulliken population analysis related functionality is consolidated in one directory, improving code maintainability and organization.
* Move ELF-related files to module_elf directory
This commit moves ELF (Electron Localization Function) related files to the dedicated module_elf directory for better code organization:
Moved files:
- source/source_io/write_elf.cpp -> source/source_io/module_elf/write_elf.cpp
- source/source_io/write_elf.h -> source/source_io/module_elf/write_elf.h
Updated build system files:
- source/source_io/CMakeLists.txt: Updated path for write_elf.cpp
Updated include paths in:
- source/source_io/module_ctrl/ctrl_output_fp.cpp
The changes ensure all ELF-related functionality is consolidated in one directory, improving code maintainability and organization.
* Move TD current-related files to module_current directory
This commit moves time-dependent current (TD current) related files to the dedicated module_current directory for better code organization:
Moved files:
- source/source_io/td_current_io.cpp -> source/source_io/module_current/td_current_io.cpp
- source/source_io/td_current_io.h -> source/source_io/module_current/td_current_io.h
- source/source_io/td_current_io_comm.cpp -> source/source_io/module_current/td_current_io_comm.cpp
Updated build system files:
- source/source_io/CMakeLists.txt: Updated paths for td_current_io.cpp, td_current_io_comm.cpp
Updated include paths in:
- source/source_io/module_ctrl/ctrl_output_td.cpp
- source/source_esolver/esolver_ks_lcao_tddft.cpp
The changes ensure all TD current-related functionality is consolidated in one directory, improving code maintainability and organization.
* Consolidate output-related files into module_output directory
This commit moves output-related files to the dedicated module_output directory for better code organization:
Moved files:
- source/source_io/filename.cpp/h -> source/source_io/module_output/filename.cpp/h
- source/source_io/output.cpp/h -> source/source_io/module_output/output.cpp/h
- source/source_io/output_log.cpp/h -> source/source_io/module_output/output_log.cpp/h
- source/source_io/print_info.cpp/h -> source/source_io/module_output/print_info.cpp/h
- source/source_io/write_pao.cpp/h -> source/source_io/module_output/write_pao.cpp/h
Updated build system files:
- source/source_io/CMakeLists.txt: Updated paths for all moved files
Updated include paths in:
- All files that include output.h, output_log.h, print_info.h, write_pao.h, and filename.h
- Updated relative include paths in output.h for files in module_output
The changes ensure all output-related functionality is consolidated in one directory, improving code maintainability and organization.
* Fix include paths for filename.h
Fixed remaining include path issues after moving files to module_output directory:
- source/source_io/write_wfc_nao.cpp: Updated include path from "filename.h" to "source_io/module_output/filename.h"
- source/source_io/module_output/filename.cpp: Updated include path from "filename.h" to "source_io/module_output/filename.h"
* Fix hybrid functional compilation errors
This commit fixes compilation errors when building ABACUS with hybrid functional support (ENABLE_LIBRI=ON):
1. Fixed include path issues:
- source/source_io/restart_exx_csr.hpp: Updated include path from "source_io/write_HS_sparse.h" to "source_io/module_hs/write_HS_sparse.h"
- source/source_lcao/module_ri/Exx_LRI_interface.hpp: Updated the same include path
2. Fixed header file name change:
- source/source_lcao/module_ri/exx_lip.hpp: Updated include path from "source_psi/psi_init.h" to "source_psi/psi_initializer.h" (header file was renamed)
These changes ensure that ABACUS can be successfully compiled with hybrid functional support enabled, allowing users to perform calculations with hybrid functionals like HSE06, PBE0, etc.
The fix was necessary because:
- The write_HS_sparse.h file was moved to the module_hs directory in a previous refactoring
- The psi_init.h header file was renamed to psi_initializer.h
With these fixes, the hybrid functional version of ABACUS compiles successfully.
* Fix CICD errors: Update output-related paths in CMakeLists.txt
This commit fixes CICD build errors by updating paths to output-related files that were moved to the module_output directory:
Updated paths in test directory CMakeLists.txt files:
- source_io/output.cpp -> source_io/module_output/output.cpp
- source_io/print_info.cpp -> source_io/module_output/print_info.cpp
- source_io/output_log.cpp -> source_io/module_output/output_log.cpp
Modified files:
- source/source_cell/module_neighbor/test/CMakeLists.txt
- source/source_cell/test/CMakeLists.txt
- source/source_cell/test_pw/CMakeLists.txt
- source/source_esolver/test/CMakeLists.txt
- source/source_estate/module_dm/test/CMakeLists.txt
- source/source_estate/test/CMakeLists.txt
- source/source_lcao/module_deepks/test/CMakeLists.txt
- source/source_lcao/module_hcontainer/test/CMakeLists.txt
- source/source_lcao/module_ri/module_exx_symmetry/test/CMakeLists.txt
- source/source_md/test/CMakeLists.txt
- source/source_pw/module_pwdft/test/CMakeLists.txt
- source/source_relax/test/CMakeLists.txt
These changes ensure that the CICD build system can correctly find the output-related files after they were reorganized into the module_output directory.
* fix bugs
* fix tests
* fix
* fix
* fix
* fix
* fix
* fix
* fix
* fix
* Fix unit test compilation errors by updating include paths
This commit fixes multiple compilation errors in the unit tests by updating include paths to reflect the new directory structure:
1. source/source_io/test/write_wfc_nao_test.cpp:
- Updated ../filename.h to ../module_output/filename.h
2. source/source_io/test/cal_dos_test.cpp:
- Updated source_io/cal_dos.h to source_io/module_dos/cal_dos.h
3. source/source_io/test/write_dos_pw_test.cpp:
- Updated source_io/write_dos_pw.h to source_io/module_dos/write_dos_pw.h
4. source/source_io/test/print_info_test.cpp:
- Updated source_io/berryphase.h to source_io/module_unk/berryphase.h
5. source/source_io/test/to_qo_test.cpp:
- Updated module_qo/to_qo.h to source_io/module_qo/to_qo.h
6. source/source_io/test/output_mulliken_test.cpp:
- Updated ../output_mulliken.h to ../module_mulliken/output_mulliken.h
- Updated source_io/module_dm/output_dmk.h to source_io/module_mulliken/output_dmk.h
- Updated source_io/module_sk/output_sk.h to source_io/module_mulliken/output_sk.h
7. source/source_io/test/output_mulliken_mock.cpp:
- Updated source_io/output_dmk.h to source_io/module_dm/output_dmk.h
- Updated source_io/module_dm/output_dmk.h to source_io/module_mulliken/output_dmk.h
- Updated source_io/module_sk/output_sk.h to source_io/module_mulliken/output_sk.h
8. source/source_io/test/output_test.cpp:
- Updated ../output.h to ../module_output/output.h
9. source/source_io/test/for_testing_klist.h:
- Updated source_io/berryphase.h to source_io/module_unk/berryphase.h
10. source/source_io/module_dm/test/write_dmk_test.cpp:
- Updated prepare_unitcell.h to ../../test/prepare_unitcell.h
11. source/source_io/test_serial/read_input_item_test.cpp:
- Updated source_io/input_item.h to source_io/module_parameter/input_item.h
12. source/source_io/test_serial/io_system_variable_test.cpp:
- Updated source_io/input_item.h to source_io/module_parameter/input_item.h
These changes ensure that all unit tests compile successfully with the new directory structure, enabling the complete test suite to be built and run.
* Move files to module directories and update paths
* Move wave function related files to module_wf directory and update include paths
This commit:
1. Moves wave function related files to module_wf directory:
- get_wf_lcao.cpp/h
- get_wf_pw.h
- read_wf2rho_pw.cpp/h
- read_wfc_nao.cpp/h
- read_wfc_pw.cpp/h
- write_wfc_nao.cpp/h
- write_wfc_pw.cpp/h
2. Updates include paths in affected files:
- source_esolver/esolver_ks_lcao_tddft.cpp
- source_esolver/lcao_others.cpp
- source_estate/module_charge/charge_init.cpp
- source_io/CMakeLists.txt
- source_io/module_ctrl/ctrl_output_pw.cpp
- source_io/module_ctrl/ctrl_scf_lcao.cpp
- source_io/module_wf/get_wf_lcao.cpp
- source_io/module_wf/read_wfc_nao.cpp
- source_io/module_wf/read_wfc_pw.cpp
- source_io/module_wf/write_wfc_nao.cpp
- source_io/module_wf/write_wfc_pw.cpp
- source_io/test/CMakeLists.txt
- source_io/test/read_wf2rho_pw_test.cpp
- source_io/test/read_wfc_nao_test.cpp
- source_io/test/read_wfc_pw_test.cpp
- source_io/test/write_wfc_nao_test.cpp
- source_lcao/LCAO_set.cpp
- source_lcao/module_lr/esolver_lrtd_lcao.cpp
- source_psi/psi_init_file.cpp
- source_psi/test/CMakeLists.txt
3. Ensures all unit tests compile successfully with the new directory structure
The codebase now has a more organized structure with wave function related functionality grouped under module_wf.
* Move restart related files to module_restart directory and update include paths
This commit:
1. Moves restart related files to module_restart directory:
- restart.cpp
- restart.h
- restart_exx_csr.h
- restart_exx_csr.hpp
2. Updates include paths in affected files:
- source_estate/module_charge/charge_init.cpp
- source_io/CMakeLists.txt
- source_io/module_ctrl/ctrl_iter_lcao.h
- source_io/module_parameter/input_conv.cpp
- source_io/test/for_testing_input_conv.h
- source_lcao/module_operator_lcao/op_exx_lcao.hpp
- source_lcao/module_ri/Exx_LRI_interface.hpp
3. Ensures all unit tests compile successfully with the new directory structure
The codebase now has a more organized structure with restart related functionality grouped under module_restart.
* Move read_set_globalv.cpp to module_parameter directory and update include paths
This commit:
1. Moves read_set_globalv.cpp from source_io directory to module_parameter directory
2. Updates include paths and file references in affected files:
- source_io/CMakeLists.txt: Updated file path for read_set_globalv.cpp
- source_io/test_serial/CMakeLists.txt: Updated file path for read_set_globalv.cpp
- source/Makefile.Objects: Updated file path for read_set_globalv.o
- source_io/module_parameter/read_set_globalv.cpp: Updated internal include paths to use relative paths within module_parameter
3. Ensures all unit tests compile successfully with the new directory structure
The codebase now has a more organized structure with parameter-related functionality grouped under module_parameter.
* fix exx
* fix
* fix psi_init_file.cpp
* fix Makefile.Objects
* remove two tests in 11_PW_GPU, the two tests have some issues that need to be fixed later
* fix psi_random
* fix CASES_GPU.txt
---------
Co-authored-by: abacus_fixer <mohanchen@pku.eud.cn>1 parent 5e17d47 commit 1778e90
255 files changed
Lines changed: 650 additions & 657 deletions
File tree
- source
- source_cell
- module_neighbor/test
- module_symmetry
- test_pw
- test
- source_esolver
- test
- source_estate
- module_charge
- module_dm/test
- module_pot
- test
- source_io
- json_output/test
- module_bessel
- module_chgpot
- module_ctrl
- module_current
- module_dm
- test
- module_dos
- module_elf
- module_hs
- module_ml
- module_mulliken
- module_output
- module_parameter
- module_qo
- module_restart
- module_unk
- module_wannier
- module_wf
- test_serial
- test
- source_lcao
- module_deepks/test
- module_hcontainer/test
- module_lr
- module_operator_lcao
- module_ri
- module_exx_symmetry/test
- source_main
- source_md
- test
- source_psi
- test
- source_pw
- module_ofdft
- module_pwdft
- test
- module_stodft
- source_relax
- test
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
434 | 434 | | |
435 | 435 | | |
436 | 436 | | |
437 | | - | |
438 | | - | |
439 | | - | |
440 | | - | |
441 | | - | |
442 | | - | |
| 437 | + | |
| 438 | + | |
| 439 | + | |
| 440 | + | |
| 441 | + | |
| 442 | + | |
443 | 443 | | |
444 | 444 | | |
445 | 445 | | |
| |||
513 | 513 | | |
514 | 514 | | |
515 | 515 | | |
516 | | - | |
517 | | - | |
518 | | - | |
| 516 | + | |
| 517 | + | |
| 518 | + | |
519 | 519 | | |
520 | | - | |
| 520 | + | |
521 | 521 | | |
522 | 522 | | |
523 | | - | |
524 | | - | |
525 | | - | |
526 | | - | |
| 523 | + | |
| 524 | + | |
| 525 | + | |
| 526 | + | |
527 | 527 | | |
528 | | - | |
529 | | - | |
530 | | - | |
| 528 | + | |
| 529 | + | |
| 530 | + | |
531 | 531 | | |
532 | 532 | | |
533 | 533 | | |
| |||
537 | 537 | | |
538 | 538 | | |
539 | 539 | | |
540 | | - | |
541 | | - | |
542 | | - | |
543 | | - | |
544 | | - | |
545 | | - | |
546 | | - | |
| 540 | + | |
| 541 | + | |
| 542 | + | |
| 543 | + | |
| 544 | + | |
| 545 | + | |
| 546 | + | |
547 | 547 | | |
548 | | - | |
| 548 | + | |
549 | 549 | | |
550 | 550 | | |
551 | 551 | | |
| |||
558 | 558 | | |
559 | 559 | | |
560 | 560 | | |
561 | | - | |
562 | | - | |
563 | | - | |
564 | | - | |
565 | | - | |
566 | | - | |
| 561 | + | |
| 562 | + | |
| 563 | + | |
| 564 | + | |
| 565 | + | |
| 566 | + | |
567 | 567 | | |
568 | 568 | | |
569 | 569 | | |
570 | 570 | | |
571 | 571 | | |
572 | 572 | | |
573 | 573 | | |
574 | | - | |
575 | | - | |
576 | | - | |
577 | | - | |
578 | | - | |
579 | | - | |
580 | | - | |
581 | | - | |
582 | | - | |
583 | | - | |
584 | | - | |
585 | | - | |
586 | | - | |
587 | | - | |
588 | | - | |
| 574 | + | |
| 575 | + | |
| 576 | + | |
| 577 | + | |
| 578 | + | |
| 579 | + | |
| 580 | + | |
| 581 | + | |
| 582 | + | |
| 583 | + | |
| 584 | + | |
| 585 | + | |
| 586 | + | |
| 587 | + | |
| 588 | + | |
589 | 589 | | |
590 | 590 | | |
591 | 591 | | |
| |||
597 | 597 | | |
598 | 598 | | |
599 | 599 | | |
600 | | - | |
601 | | - | |
| 600 | + | |
| 601 | + | |
602 | 602 | | |
603 | 603 | | |
604 | | - | |
| 604 | + | |
605 | 605 | | |
606 | | - | |
607 | | - | |
| 606 | + | |
| 607 | + | |
608 | 608 | | |
609 | | - | |
610 | | - | |
611 | | - | |
612 | | - | |
| 609 | + | |
| 610 | + | |
| 611 | + | |
| 612 | + | |
613 | 613 | | |
614 | 614 | | |
615 | 615 | | |
| |||
746 | 746 | | |
747 | 747 | | |
748 | 748 | | |
749 | | - | |
| 749 | + | |
750 | 750 | | |
751 | 751 | | |
752 | 752 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
| 10 | + | |
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
| 16 | + | |
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
25 | 25 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
| 9 | + | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
49 | | - | |
| 49 | + | |
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
56 | | - | |
| 56 | + | |
57 | 57 | | |
58 | 58 | | |
59 | 59 | | |
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
63 | | - | |
| 63 | + | |
64 | 64 | | |
65 | 65 | | |
66 | 66 | | |
67 | 67 | | |
68 | 68 | | |
69 | 69 | | |
70 | | - | |
| 70 | + | |
71 | 71 | | |
72 | 72 | | |
73 | 73 | | |
74 | 74 | | |
75 | 75 | | |
76 | | - | |
| 76 | + | |
77 | 77 | | |
78 | 78 | | |
79 | 79 | | |
80 | 80 | | |
81 | 81 | | |
82 | | - | |
| 82 | + | |
83 | 83 | | |
84 | 84 | | |
85 | 85 | | |
| |||
139 | 139 | | |
140 | 140 | | |
141 | 141 | | |
142 | | - | |
| 142 | + | |
143 | 143 | | |
144 | 144 | | |
145 | 145 | | |
146 | 146 | | |
147 | 147 | | |
148 | 148 | | |
149 | | - | |
| 149 | + | |
150 | 150 | | |
151 | 151 | | |
152 | 152 | | |
153 | 153 | | |
154 | 154 | | |
155 | | - | |
| 155 | + | |
156 | 156 | | |
157 | 157 | | |
158 | 158 | | |
159 | 159 | | |
160 | 160 | | |
161 | | - | |
| 161 | + | |
162 | 162 | | |
163 | 163 | | |
164 | 164 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
| 18 | + | |
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| |||
0 commit comments