diff --git a/source/source_base/CMakeLists.txt b/source/source_base/CMakeLists.txt index 2637e3f4412..f940ba77cf1 100644 --- a/source/source_base/CMakeLists.txt +++ b/source/source_base/CMakeLists.txt @@ -40,6 +40,7 @@ add_library( mymath.cpp opt_CG.cpp opt_DCsrch.cpp + output.cpp para_gemm.cpp realarray.cpp sph_bessel_recursive-d1.cpp diff --git a/source/source_io/module_output/output.cpp b/source/source_base/output.cpp similarity index 100% rename from source/source_io/module_output/output.cpp rename to source/source_base/output.cpp diff --git a/source/source_io/module_output/output.h b/source/source_base/output.h similarity index 96% rename from source/source_io/module_output/output.h rename to source/source_base/output.h index 3bc0671dd02..0dbaafbaea9 100644 --- a/source/source_io/module_output/output.h +++ b/source/source_base/output.h @@ -5,10 +5,10 @@ #ifndef OUTPUT_H #define OUTPUT_H -#include "../../source_base/realarray.h" -#include "../../source_base/matrix3.h" -#include "../../source_base/complexmatrix.h" -#include "../../source_base/matrix.h" +#include "realarray.h" +#include "matrix3.h" +#include "complexmatrix.h" +#include "matrix.h" class output { public: diff --git a/source/source_cell/CMakeLists.txt b/source/source_cell/CMakeLists.txt index 3c1741ca2e2..d6de55e0635 100644 --- a/source/source_cell/CMakeLists.txt +++ b/source/source_cell/CMakeLists.txt @@ -23,6 +23,7 @@ add_library( cell_index.cpp check_atomic_stru.cpp update_cell.cpp + magnetism.cpp bcast_cell.cpp read_stru.cpp print_cell.cpp diff --git a/source/source_cell/atom_spec.cpp b/source/source_cell/atom_spec.cpp index 5c989191620..2321934fb95 100644 --- a/source/source_cell/atom_spec.cpp +++ b/source/source_cell/atom_spec.cpp @@ -1,6 +1,6 @@ #include "atom_spec.h" #include "source_io/module_parameter/parameter.h" -#include "source_io/module_output/output.h" +#include "source_base/output.h" #include Atom::Atom() diff --git a/source/source_estate/magnetism.cpp b/source/source_cell/magnetism.cpp similarity index 100% rename from source/source_estate/magnetism.cpp rename to source/source_cell/magnetism.cpp diff --git a/source/source_estate/magnetism.h b/source/source_cell/magnetism.h similarity index 100% rename from source/source_estate/magnetism.h rename to source/source_cell/magnetism.h diff --git a/source/source_cell/module_neighbor/test/CMakeLists.txt b/source/source_cell/module_neighbor/test/CMakeLists.txt index 3d891aa20c3..514476e1d3e 100644 --- a/source/source_cell/module_neighbor/test/CMakeLists.txt +++ b/source/source_cell/module_neighbor/test/CMakeLists.txt @@ -13,7 +13,7 @@ AddTest( TARGET MODULE_CELL_NEIGHBOR_sltk_grid LIBS parameter ${math_libs} base device cell_info SOURCES sltk_grid_test.cpp ../sltk_grid.cpp ../sltk_atom.cpp - ../../../source_io/module_output/output.cpp + ) AddTest( @@ -21,5 +21,5 @@ AddTest( LIBS parameter ${math_libs} base device cell_info SOURCES sltk_atom_arrange_test.cpp ../sltk_atom_arrange.cpp ../sltk_grid_driver.cpp ../sltk_grid.cpp ../sltk_atom.cpp - ../../../source_io/module_output/output.cpp + ) \ No newline at end of file diff --git a/source/source_cell/module_symmetry/symm_analysis.cpp b/source/source_cell/module_symmetry/symm_analysis.cpp index 16bd470ff33..be041f0ffd8 100644 --- a/source/source_cell/module_symmetry/symm_analysis.cpp +++ b/source/source_cell/module_symmetry/symm_analysis.cpp @@ -1,6 +1,6 @@ #include "symmetry.h" #include "source_io/module_parameter/parameter.h" -#include "source_io/module_output/output.h" +#include "source_base/output.h" using namespace ModuleSymmetry; diff --git a/source/source_cell/module_symmetry/test/symmetry_test_analysis.cpp b/source/source_cell/module_symmetry/test/symmetry_test_analysis.cpp index 1ca197c032d..f6ba3cccfa2 100644 --- a/source/source_cell/module_symmetry/test/symmetry_test_analysis.cpp +++ b/source/source_cell/module_symmetry/test/symmetry_test_analysis.cpp @@ -1,5 +1,5 @@ #include "symmetry_test_cases.h" -#include "source_io/module_output/output.h" +#include "source_base/output.h" #include "mpi.h" /************************************************ * unit test of class Symmetry @@ -20,7 +20,6 @@ * is different from its point group. ***********************************************/ // mock the useless functions -void output::printM3(std::ofstream &ofs, const std::string &description, const ModuleBase::Matrix3 &m){} pseudo::pseudo() { } diff --git a/source/source_cell/module_symmetry/test/symmetry_test_symtrz.cpp b/source/source_cell/module_symmetry/test/symmetry_test_symtrz.cpp index 45ea873e3f7..8d5f2985c88 100644 --- a/source/source_cell/module_symmetry/test/symmetry_test_symtrz.cpp +++ b/source/source_cell/module_symmetry/test/symmetry_test_symtrz.cpp @@ -1,5 +1,5 @@ #include "symmetry_test_cases.h" -#include "source_io/module_output/output.h" +#include "source_base/output.h" #include "mpi.h" /************************************************ @@ -9,7 +9,6 @@ * ***********************************************/ // mock the useless functions -void output::printM3(std::ofstream& ofs, const std::string& description, const ModuleBase::Matrix3& m) {} pseudo::pseudo() {} pseudo::~pseudo() {} Atom::Atom() {} diff --git a/source/source_cell/pseudo.cpp b/source/source_cell/pseudo.cpp index 70785839f2d..c9a057e3a71 100644 --- a/source/source_cell/pseudo.cpp +++ b/source/source_cell/pseudo.cpp @@ -1,6 +1,6 @@ #include "pseudo.h" #include "source_base/tool_title.h" -#include "source_io/module_output/output.h" +#include "source_base/output.h" #include pseudo::pseudo() diff --git a/source/source_cell/read_atom_species.cpp b/source/source_cell/read_atom_species.cpp index 4c78551c9bb..0b9d7dcac36 100644 --- a/source/source_cell/read_atom_species.cpp +++ b/source/source_cell/read_atom_species.cpp @@ -1,10 +1,9 @@ #include "read_stru.h" +#include + #include "source_io/module_parameter/parameter.h" #include "source_base/tool_title.h" -#ifdef __EXX -#include "source_lcao/module_ri/serialization_cereal.h" -#endif #include "source_hamilt/module_xc/exx_info.h" // use GlobalC::exx_info namespace unitcell diff --git a/source/source_cell/sep.cpp b/source/source_cell/sep.cpp index bd55f3c06b7..a154f897997 100644 --- a/source/source_cell/sep.cpp +++ b/source/source_cell/sep.cpp @@ -3,7 +3,7 @@ #include "source_base/global_variable.h" #include "source_base/parallel_common.h" #include "source_base/tool_title.h" -#include "source_io/module_output/output.h" +#include "source_base/output.h" #include #include diff --git a/source/source_cell/test/CMakeLists.txt b/source/source_cell/test/CMakeLists.txt index d508a115a2e..2fe067787a4 100644 --- a/source/source_cell/test/CMakeLists.txt +++ b/source/source_cell/test/CMakeLists.txt @@ -46,40 +46,40 @@ AddTest( TARGET MODULE_CELL_read_pp LIBS parameter ${math_libs} base device SOURCES read_pp_test.cpp ../atom_pseudo.cpp ../pseudo.cpp ../read_pp.cpp ../read_pp_complete.cpp ../read_pp_upf201.cpp ../read_pp_upf100.cpp ../read_pp_vwr.cpp ../read_pp_blps.cpp - ../../source_io/module_output/output.cpp + ) AddTest( TARGET MODULE_CELL_pseudo_nc LIBS parameter ${math_libs} base device SOURCES pseudo_nc_test.cpp ../pseudo.cpp ../atom_pseudo.cpp ../read_pp.cpp ../read_pp_complete.cpp ../read_pp_upf201.cpp ../read_pp_upf100.cpp ../read_pp_vwr.cpp - ../read_pp_blps.cpp ../../source_io/module_output/output.cpp + ../read_pp_blps.cpp ) AddTest( TARGET MODULE_CELL_atom_pseudo LIBS parameter ${math_libs} base device SOURCES atom_pseudo_test.cpp ../atom_pseudo.cpp ../pseudo.cpp ../read_pp.cpp ../read_pp_complete.cpp ../read_pp_upf201.cpp ../read_pp_upf100.cpp - ../read_pp_vwr.cpp ../read_pp_blps.cpp ../../source_io/module_output/output.cpp + ../read_pp_vwr.cpp ../read_pp_blps.cpp ) AddTest( TARGET MODULE_CELL_atom_spec LIBS parameter ${math_libs} base device SOURCES atom_spec_test.cpp ../atom_spec.cpp ../atom_pseudo.cpp ../pseudo.cpp ../read_pp.cpp ../read_pp_complete.cpp ../read_pp_upf201.cpp - ../read_pp_upf100.cpp ../read_pp_vwr.cpp ../read_pp_blps.cpp ../../source_io/module_output/output.cpp + ../read_pp_upf100.cpp ../read_pp_vwr.cpp ../read_pp_blps.cpp ) AddTest( TARGET MODULE_CELL_klist_test LIBS parameter ${math_libs} base device symmetry - SOURCES klist_test.cpp ../klist.cpp ../parallel_kpoints.cpp ../../source_io/module_output/output.cpp ../k_vector_utils.cpp + SOURCES klist_test.cpp ../klist.cpp ../parallel_kpoints.cpp ../k_vector_utils.cpp ) AddTest( TARGET MODULE_CELL_klist_test_para1 LIBS parameter ${math_libs} base device symmetry - SOURCES klist_test_para.cpp ../klist.cpp ../parallel_kpoints.cpp ../../source_io/module_output/output.cpp ../k_vector_utils.cpp + SOURCES klist_test_para.cpp ../klist.cpp ../parallel_kpoints.cpp ../k_vector_utils.cpp ) add_test(NAME MODULE_CELL_klist_test_para4 @@ -139,26 +139,26 @@ add_test(NAME MODULE_CELL_parallel_kpoints_test AddTest( TARGET MODULE_CELL_unitcell_test LIBS parameter ${math_libs} base device cell_info symmetry - SOURCES unitcell_test.cpp ../../source_io/module_output/output.cpp ../../source_estate/cal_ux.cpp + SOURCES unitcell_test.cpp ../../source_estate/cal_ux.cpp ) AddTest( TARGET MODULE_CELL_unitcell_test_readpp LIBS parameter ${math_libs} base device cell_info - SOURCES unitcell_test_readpp.cpp ../../source_io/module_output/output.cpp + SOURCES unitcell_test_readpp.cpp ) AddTest( TARGET MODULE_CELL_unitcell_test_para LIBS parameter ${math_libs} base device cell_info - SOURCES unitcell_test_para.cpp ../../source_io/module_output/output.cpp + SOURCES unitcell_test_para.cpp ) AddTest( TARGET MODULE_CELL_unitcell_test_setupcell LIBS parameter ${math_libs} base device cell_info - SOURCES unitcell_test_setupcell.cpp ../../source_io/module_output/output.cpp + SOURCES unitcell_test_setupcell.cpp ) add_test(NAME MODULE_CELL_unitcell_test_parallel diff --git a/source/source_cell/test/klist_test.cpp b/source/source_cell/test/klist_test.cpp index 57b7eac90ad..2644eb9140f 100644 --- a/source/source_cell/test/klist_test.cpp +++ b/source/source_cell/test/klist_test.cpp @@ -11,7 +11,7 @@ #include "source_cell/pseudo.h" #include "source_cell/setup_nonlocal.h" #include "source_cell/unitcell.h" -#include "source_estate/magnetism.h" +#include "source_cell/magnetism.h" #include "source_pw/module_pwdft/vl_pw.h" #include "source_pw/module_pwdft/vnl_pw.h" #include "source_pw/module_pwdft/parallel_grid.h" diff --git a/source/source_cell/test/klist_test_para.cpp b/source/source_cell/test/klist_test_para.cpp index d37d2da5168..1dd36bdfbf0 100644 --- a/source/source_cell/test/klist_test_para.cpp +++ b/source/source_cell/test/klist_test_para.cpp @@ -19,7 +19,7 @@ #include "source_cell/pseudo.h" #include "source_cell/setup_nonlocal.h" #include "source_cell/unitcell.h" -#include "source_estate/magnetism.h" +#include "source_cell/magnetism.h" #include "source_pw/module_pwdft/vl_pw.h" #include "source_pw/module_pwdft/vnl_pw.h" #include "source_pw/module_pwdft/parallel_grid.h" diff --git a/source/source_cell/test/read_atoms_helper_test.cpp b/source/source_cell/test/read_atoms_helper_test.cpp index 39336cd4a0c..f5580f00bd4 100644 --- a/source/source_cell/test/read_atoms_helper_test.cpp +++ b/source/source_cell/test/read_atoms_helper_test.cpp @@ -3,7 +3,7 @@ #include "../read_atoms_helper.h" #include "source_base/vector3.h" #include "source_base/matrix3.h" -#include "source_io/module_output/output.h" +#include "source_base/output.h" #include #include @@ -15,15 +15,6 @@ namespace elecstate { } } -// Mock output class methods -void output::printM3(std::ofstream& ofs, const std::string& description, const ModuleBase::Matrix3& m) { - // Mock implementation -} - -void output::printrm(std::ofstream& ofs, const std::string& description, const ModuleBase::matrix& m, const double& limit) { - // Mock implementation -} - // Mock InfoNonlocal class InfoNonlocal::InfoNonlocal() {} InfoNonlocal::~InfoNonlocal() {} diff --git a/source/source_cell/test_pw/CMakeLists.txt b/source/source_cell/test_pw/CMakeLists.txt index 9bcfd022101..5d2c7196abd 100644 --- a/source/source_cell/test_pw/CMakeLists.txt +++ b/source/source_cell/test_pw/CMakeLists.txt @@ -13,7 +13,7 @@ AddTest( SOURCES unitcell_test_pw.cpp ../unitcell.cpp ../read_atoms.cpp ../read_atoms_helper.cpp ../atom_spec.cpp ../update_cell.cpp ../bcast_cell.cpp ../atom_pseudo.cpp ../pseudo.cpp ../read_pp.cpp ../read_pp_complete.cpp ../read_pp_upf201.cpp ../read_pp_upf100.cpp ../read_stru.cpp ../read_atom_species.cpp - ../read_pp_vwr.cpp ../read_pp_blps.cpp ../../source_io/module_output/output.cpp + ../read_pp_vwr.cpp ../read_pp_blps.cpp ../../source_estate/read_pseudo.cpp ../../source_estate/cal_nelec_nband.cpp ../../source_estate/read_orb.cpp ../print_cell.cpp ../../source_estate/cal_wfc.cpp ../sep.cpp ../sep_cell.cpp diff --git a/source/source_cell/unitcell.cpp b/source/source_cell/unitcell.cpp index f2c15102748..f92b37b1f8d 100644 --- a/source/source_cell/unitcell.cpp +++ b/source/source_cell/unitcell.cpp @@ -7,7 +7,7 @@ #include "unitcell.h" #include "bcast_cell.h" #include "source_base/tool_quit.h" -#include "source_io/module_output/output.h" +#include "source_base/output.h" #include "source_io/module_parameter/parameter.h" #include "source_cell/read_stru.h" #include "source_base/atom_in.h" diff --git a/source/source_cell/unitcell.h b/source/source_cell/unitcell.h index df426712b47..3bdb067b7af 100644 --- a/source/source_cell/unitcell.h +++ b/source/source_cell/unitcell.h @@ -3,7 +3,7 @@ #include "source_base/global_function.h" #include "source_cell/sep_cell.h" -#include "source_estate/magnetism.h" +#include "source_cell/magnetism.h" #include "module_symmetry/symmetry.h" #include "source_cell/module_neighlist/atom_provider.h" diff --git a/source/source_cell/update_cell.cpp b/source/source_cell/update_cell.cpp index 4da4013d6af..0252bdc3b38 100644 --- a/source/source_cell/update_cell.cpp +++ b/source/source_cell/update_cell.cpp @@ -1,7 +1,7 @@ #include "update_cell.h" #include "bcast_cell.h" #include "source_base/global_function.h" -#include "source_io/module_output/output.h" +#include "source_base/output.h" namespace unitcell { diff --git a/source/source_estate/CMakeLists.txt b/source/source_estate/CMakeLists.txt index d360a52c42b..0e2e18f72dc 100644 --- a/source/source_estate/CMakeLists.txt +++ b/source/source_estate/CMakeLists.txt @@ -37,7 +37,6 @@ list(APPEND objects module_charge/symmetry_rho.cpp module_charge/symmetry_rhog.cpp fp_energy.cpp - magnetism.cpp occupy.cpp cal_ux.cpp read_orb.cpp diff --git a/source/source_estate/module_charge/charge.cpp b/source/source_estate/module_charge/charge.cpp index 32d0b4f8356..fbc2c1d503a 100644 --- a/source/source_estate/module_charge/charge.cpp +++ b/source/source_estate/module_charge/charge.cpp @@ -27,7 +27,7 @@ #include "source_base/timer.h" #include "source_base/tool_threading.h" #include "source_cell/unitcell.h" -#include "source_estate/magnetism.h" +#include "source_cell/magnetism.h" #include "source_hamilt/module_xc/xc_functional.h" #include "source_io/module_parameter/parameter.h" diff --git a/source/source_estate/module_charge/charge_init.cpp b/source/source_estate/module_charge/charge_init.cpp index ed3c62b0fc1..470728fb780 100644 --- a/source/source_estate/module_charge/charge_init.cpp +++ b/source/source_estate/module_charge/charge_init.cpp @@ -11,7 +11,7 @@ #include "source_base/parallel_reduce.h" #include "source_base/timer.h" #include "source_base/tool_threading.h" -#include "source_estate/magnetism.h" +#include "source_cell/magnetism.h" #include "source_pw/module_pwdft/parallel_grid.h" #include "source_io/module_output/cube_io.h" #include "source_io/module_chgpot/rhog_io.h" diff --git a/source/source_estate/module_dm/test/CMakeLists.txt b/source/source_estate/module_dm/test/CMakeLists.txt index bb95272936c..d67deb40936 100644 --- a/source/source_estate/module_dm/test/CMakeLists.txt +++ b/source/source_estate/module_dm/test/CMakeLists.txt @@ -16,7 +16,7 @@ AddTest( ${ABACUS_SOURCE_DIR}/source_lcao/module_hcontainer/hcontainer.cpp ${ABACUS_SOURCE_DIR}/source_lcao/module_hcontainer/atom_pair.cpp ${ABACUS_SOURCE_DIR}/source_basis/module_ao/parallel_orbitals.cpp - ${ABACUS_SOURCE_DIR}/source_io/module_output/output.cpp + ) AddTest( diff --git a/source/source_estate/test/CMakeLists.txt b/source/source_estate/test/CMakeLists.txt index 2f9543cae11..7aae00ec1b3 100644 --- a/source/source_estate/test/CMakeLists.txt +++ b/source/source_estate/test/CMakeLists.txt @@ -26,7 +26,7 @@ AddTest( AddTest( TARGET MODULE_ESTATE_elecstate_magnetism LIBS parameter ${math_libs} base device - SOURCES elecstate_magnetism_test.cpp ../magnetism.cpp + SOURCES elecstate_magnetism_test.cpp ../../source_cell/magnetism.cpp ) AddTest( @@ -86,7 +86,7 @@ AddTest( TARGET MODULE_ESTATE_charge_test LIBS parameter ${math_libs} planewave_serial base device cell_info SOURCES charge_test.cpp ../module_charge/charge.cpp - ../../source_io/module_output/output.cpp + ) AddTest( @@ -95,14 +95,14 @@ AddTest( SOURCES charge_mixing_test.cpp ../module_charge/charge_mixing.cpp ../module_charge/charge_mixing_dmr.cpp ../module_charge/charge_mixing_residual.cpp ../module_charge/charge_mixing_preconditioner.cpp ../module_charge/charge_mixing_rho.cpp - ../module_charge/charge_mixing_uspp.cpp ../../source_io/module_output/output.cpp + ../module_charge/charge_mixing_uspp.cpp ) AddTest( TARGET MODULE_ESTATE_charge_extra LIBS parameter ${math_libs} base device cell_info SOURCES charge_extra_test.cpp ../module_charge/charge_extra.cpp ../../source_io/module_output/read_cube.cpp ../../source_io/module_output/write_cube.cpp - ../../source_io/module_output/output.cpp ../../source_base/module_fft/fft_bundle.cpp ../../source_base/module_fft/fft_cpu.cpp + ../../source_base/module_fft/fft_bundle.cpp ../../source_base/module_fft/fft_cpu.cpp ) AddTest( diff --git a/source/source_estate/test/elecstate_magnetism_test.cpp b/source/source_estate/test/elecstate_magnetism_test.cpp index 2d92f80ea02..0765591db65 100644 --- a/source/source_estate/test/elecstate_magnetism_test.cpp +++ b/source/source_estate/test/elecstate_magnetism_test.cpp @@ -25,7 +25,7 @@ */ #define private public -#include "source_estate/magnetism.h" +#include "source_cell/magnetism.h" #undef private Charge::Charge() { diff --git a/source/source_io/CMakeLists.txt b/source/source_io/CMakeLists.txt index 6073f10a7df..f59ca4cf4fe 100644 --- a/source/source_io/CMakeLists.txt +++ b/source/source_io/CMakeLists.txt @@ -19,7 +19,6 @@ list(APPEND objects module_bessel/numerical_basis.cpp module_bessel/numerical_basis_jyjy.cpp module_bessel/numerical_descriptor.cpp - module_output/output.cpp module_output/print_info.cpp module_output/read_cube.cpp module_chgpot/rhog_io.cpp diff --git a/source/source_io/module_json/test/CMakeLists.txt b/source/source_io/module_json/test/CMakeLists.txt index 288009206ee..35b4db113fc 100644 --- a/source/source_io/module_json/test/CMakeLists.txt +++ b/source/source_io/module_json/test/CMakeLists.txt @@ -7,5 +7,5 @@ AddTest( TARGET MODULE_IO_JSON_OUTPUT_TEST LIBS parameter ${math_libs} base device cell_info SOURCES para_json_test.cpp ../general_info.cpp ../init_info.cpp ../readin_info.cpp - ../para_json.cpp ../abacusjson.cpp ../../module_output/output.cpp + ../para_json.cpp ../abacusjson.cpp ) diff --git a/source/source_io/test/CMakeLists.txt b/source/source_io/test/CMakeLists.txt index 6dd23247472..7e95a0379ee 100644 --- a/source/source_io/test/CMakeLists.txt +++ b/source/source_io/test/CMakeLists.txt @@ -31,7 +31,7 @@ add_test(NAME MODULE_IO_read_exit_file_test_para_4 AddTest( TARGET MODULE_IO_output_test LIBS parameter ${math_libs} base device - SOURCES output_test.cpp ../module_output/output.cpp + SOURCES output_test.cpp ) AddTest( @@ -42,7 +42,7 @@ AddTest( AddTest( TARGET MODULE_IO_write_eig_occ_test LIBS parameter ${math_libs} base device symmetry - SOURCES write_eig_occ_test.cpp ../module_energy/write_eig_occ.cpp ../module_output/output.cpp ../../source_cell/parallel_kpoints.cpp ../../source_cell/klist.cpp ../../source_cell/k_vector_utils.cpp + SOURCES write_eig_occ_test.cpp ../module_energy/write_eig_occ.cpp ../../source_cell/parallel_kpoints.cpp ../../source_cell/klist.cpp ../../source_cell/k_vector_utils.cpp ../module_output/cif_io.cpp ) @@ -55,13 +55,13 @@ AddTest( AddTest( TARGET MODULE_IO_write_dos_pw LIBS parameter ${math_libs} base device symmetry - SOURCES write_dos_pw_test.cpp ../module_dos/cal_dos.cpp ../module_dos/write_dos_pw.cpp ../module_output/output.cpp ../../source_cell/parallel_kpoints.cpp ../../source_cell/klist.cpp ../module_energy/nscf_fermi_surf.cpp ../../source_cell/k_vector_utils.cpp + SOURCES write_dos_pw_test.cpp ../module_dos/cal_dos.cpp ../module_dos/write_dos_pw.cpp ../../source_cell/parallel_kpoints.cpp ../../source_cell/klist.cpp ../module_energy/nscf_fermi_surf.cpp ../../source_cell/k_vector_utils.cpp ) AddTest( TARGET MODULE_IO_print_info LIBS parameter ${math_libs} base device symmetry cell_info - SOURCES print_info_test.cpp ../module_output/print_info.cpp ../module_output/output.cpp ../../source_cell/klist.cpp ../../source_cell/parallel_kpoints.cpp ../../source_cell/k_vector_utils.cpp + SOURCES print_info_test.cpp ../module_output/print_info.cpp ../../source_cell/klist.cpp ../../source_cell/parallel_kpoints.cpp ../../source_cell/k_vector_utils.cpp ) AddTest( @@ -92,7 +92,7 @@ add_test(NAME MODULE_IO_write_wfc_nao_para AddTest( TARGET MODULE_IO_write_orb_info LIBS parameter ${math_libs} base device cell_info - SOURCES write_orb_info_test.cpp ../module_output/write_orb_info.cpp ../module_output/output.cpp + SOURCES write_orb_info_test.cpp ../module_output/write_orb_info.cpp ) AddTest( @@ -241,7 +241,7 @@ add_test(NAME MODULE_IO_orb_io_test_parallel AddTest( TARGET MODULE_IO_write_dmk LIBS parameter ${math_libs} base device cell_info - SOURCES ../module_dm/test/write_dmk_test.cpp ../module_dm/write_dmk.cpp ../module_output/output.cpp ../module_output/ucell_io.cpp + SOURCES ../module_dm/test/write_dmk_test.cpp ../module_dm/write_dmk.cpp ../module_output/ucell_io.cpp ) add_test( diff --git a/source/source_io/test/bessel_basis_test.cpp b/source/source_io/test/bessel_basis_test.cpp index 6224bf35c0e..2a185949b4b 100644 --- a/source/source_io/test/bessel_basis_test.cpp +++ b/source/source_io/test/bessel_basis_test.cpp @@ -14,7 +14,7 @@ #include "../module_bessel/bessel_basis.h" #include "../../source_cell/unitcell.h" -#include "../../source_estate/magnetism.h" +#include "../../source_cell/magnetism.h" #ifdef __LCAO #include "../../source_cell/setup_nonlocal.h" diff --git a/source/source_io/test/for_testing_klist.h b/source/source_io/test/for_testing_klist.h index 8fe875fa587..18c42a2753d 100644 --- a/source/source_io/test/for_testing_klist.h +++ b/source/source_io/test/for_testing_klist.h @@ -10,7 +10,7 @@ #include "source_cell/pseudo.h" #include "source_cell/setup_nonlocal.h" #include "source_cell/unitcell.h" -#include "source_estate/magnetism.h" +#include "source_cell/magnetism.h" #include "source_pw/module_pwdft/vl_pw.h" #include "source_pw/module_pwdft/vnl_pw.h" #include "source_pw/module_pwdft/parallel_grid.h" diff --git a/source/source_io/test/output_test.cpp b/source/source_io/test/output_test.cpp index 769898339fc..7f1cc250313 100644 --- a/source/source_io/test/output_test.cpp +++ b/source/source_io/test/output_test.cpp @@ -33,7 +33,7 @@ T* get_simple_array(int num) return rand_array; } -#include "../module_output/output.h" +#include "../../source_base/output.h" class OutputTest : public testing::Test { diff --git a/source/source_io/test/to_qo_test.cpp b/source/source_io/test/to_qo_test.cpp index fcb9bb9b249..0f23e49c742 100644 --- a/source/source_io/test/to_qo_test.cpp +++ b/source/source_io/test/to_qo_test.cpp @@ -1,6 +1,6 @@ #include #include "source_io/module_qo/to_qo.h" -#include "source_io/module_output/output.h" +#include "source_base/output.h" #define private public #include "source_io/module_parameter/parameter.h" #undef private @@ -23,7 +23,6 @@ Magnetism::~Magnetism() {} InfoNonlocal::InfoNonlocal() {} InfoNonlocal::~InfoNonlocal() {} #endif -void output::printM3(std::ofstream &ofs, const std::string &description, const ModuleBase::Matrix3 &m) {} void define_fcc_cell(UnitCell& ucell) { diff --git a/source/source_io/test_serial/CMakeLists.txt b/source/source_io/test_serial/CMakeLists.txt index aaa170883e0..e7444b98922 100644 --- a/source/source_io/test_serial/CMakeLists.txt +++ b/source/source_io/test_serial/CMakeLists.txt @@ -47,7 +47,7 @@ AddTest( AddTest( TARGET MODULE_IO_rho_io LIBS parameter ${math_libs} base device cell_info - SOURCES rho_io_test.cpp ../module_output/read_cube.cpp ../module_output/write_cube.cpp ../module_output/output.cpp + SOURCES rho_io_test.cpp ../module_output/read_cube.cpp ../module_output/write_cube.cpp ) AddTest( diff --git a/source/source_lcao/module_deepks/test/CMakeLists.txt b/source/source_lcao/module_deepks/test/CMakeLists.txt index 2a1dae6e6db..6e5926f5b34 100644 --- a/source/source_lcao/module_deepks/test/CMakeLists.txt +++ b/source/source_lcao/module_deepks/test/CMakeLists.txt @@ -22,7 +22,7 @@ add_executable( ../../../source_cell/sep.cpp ../../../source_cell/sep_cell.cpp ../../../source_pw/module_pwdft/soc.cpp - ../../../source_io/module_output/output.cpp + ../../../source_io/module_output/sparse_matrix.cpp ../../../source_estate/read_pseudo.cpp ../../../source_estate/cal_wfc.cpp diff --git a/source/source_lcao/module_dftu/dftu.cpp b/source/source_lcao/module_dftu/dftu.cpp index e4ef6ed357f..ff06003c43d 100644 --- a/source/source_lcao/module_dftu/dftu.cpp +++ b/source/source_lcao/module_dftu/dftu.cpp @@ -6,7 +6,7 @@ #include "source_base/inverse_matrix.h" #include "source_base/memory_recorder.h" #include "source_base/timer.h" -#include "source_estate/magnetism.h" +#include "source_cell/magnetism.h" #include "source_estate/module_charge/charge.h" #include diff --git a/source/source_lcao/module_dftu/dftu_force.cpp b/source/source_lcao/module_dftu/dftu_force.cpp index a2b6ffca4bf..3c2f2608abe 100644 --- a/source/source_lcao/module_dftu/dftu_force.cpp +++ b/source/source_lcao/module_dftu/dftu_force.cpp @@ -9,7 +9,7 @@ #include "source_base/parallel_reduce.h" #include "source_base/timer.h" #include "source_estate/elecstate_lcao.h" -#include "source_estate/magnetism.h" +#include "source_cell/magnetism.h" #include "source_estate/module_charge/charge.h" #include diff --git a/source/source_lcao/module_ri/module_exx_symmetry/test/CMakeLists.txt b/source/source_lcao/module_ri/module_exx_symmetry/test/CMakeLists.txt index 822bd6afde6..c896b729bb3 100644 --- a/source/source_lcao/module_ri/module_exx_symmetry/test/CMakeLists.txt +++ b/source/source_lcao/module_ri/module_exx_symmetry/test/CMakeLists.txt @@ -6,5 +6,5 @@ AddTest( LIBS base ${math_libs} device symmetry neighbor parameter SOURCES symmetry_rotation_test.cpp ../symmetry_rotation.cpp ../symmetry_rotation_output.cpp ../irreducible_sector.cpp ../irreducible_sector_bvk.cpp ../../../../source_basis/module_ao/parallel_orbitals.cpp - ../../../../source_io/module_output/output.cpp + ) \ No newline at end of file diff --git a/source/source_lcao/test/CMakeLists.txt b/source/source_lcao/test/CMakeLists.txt index 483430f4f7f..9d0eb552143 100644 --- a/source/source_lcao/test/CMakeLists.txt +++ b/source/source_lcao/test/CMakeLists.txt @@ -20,7 +20,7 @@ AddTest( ${ABACUS_SOURCE_DIR}/source_io/module_output/sparse_matrix.cpp ${ABACUS_SOURCE_DIR}/source_io/module_output/csr_reader.cpp ${ABACUS_SOURCE_DIR}/source_io/module_output/file_reader.cpp - ${ABACUS_SOURCE_DIR}/source_io/module_output/output.cpp + ${ABACUS_SOURCE_DIR}/source_io/module_dm/write_dmr.cpp ${ABACUS_SOURCE_DIR}/source_io/module_output/ucell_io.cpp ${ABACUS_SOURCE_DIR}/source_lcao/module_hcontainer/output_hcontainer.cpp diff --git a/source/source_md/test/CMakeLists.txt b/source/source_md/test/CMakeLists.txt index 3ff705c4f4a..f7b917b1810 100644 --- a/source/source_md/test/CMakeLists.txt +++ b/source/source_md/test/CMakeLists.txt @@ -49,7 +49,7 @@ list(APPEND depend_files ../../source_cell/module_neighlist/bin_manager.cpp ../../source_cell/module_neighlist/page_allocator.cpp ../../source_cell/module_neighlist/unitcell_lite.cpp - ../../source_io/module_output/output.cpp + ../../source_base/output.cpp ../../source_io/module_output/output_log.cpp ../../source_io/module_output/print_info.cpp ../../source_io/module_output/cif_io.cpp @@ -103,7 +103,7 @@ AddTest( SOURCES nhchain_test.cpp ../md_base.cpp ../nhchain.cpp - ../../source_io/module_output/output.cpp + ../../source_base/output.cpp ${depend_files} ) @@ -114,7 +114,7 @@ AddTest( ../md_base.cpp ../msst.cpp ../../source_cell/update_cell.cpp - ../../source_io/module_output/output.cpp + ../../source_base/output.cpp ${depend_files} ) diff --git a/source/source_psi/test/psi_initializer_unit_test.cpp b/source/source_psi/test/psi_initializer_unit_test.cpp index 6ede4ce8928..f095d3ed900 100644 --- a/source/source_psi/test/psi_initializer_unit_test.cpp +++ b/source/source_psi/test/psi_initializer_unit_test.cpp @@ -10,7 +10,7 @@ #include "../psi_init_random.h" #include "source_pw/module_pwdft/vl_pw.h" #include "source_cell/klist.h" -#include "source_io/module_output/output.h" +#include "source_base/output.h" /* ========================= @@ -72,7 +72,6 @@ pseudopot_cell_vl::pseudopot_cell_vl() {} pseudopot_cell_vl::~pseudopot_cell_vl() {} Magnetism::Magnetism() {} Magnetism::~Magnetism() {} -void output::printM3(std::ofstream &ofs, const std::string &description, const ModuleBase::Matrix3 &m) {} #ifdef __LCAO ORB_gaunt_table::ORB_gaunt_table() {} ORB_gaunt_table::~ORB_gaunt_table() {} diff --git a/source/source_pw/module_pwdft/test/CMakeLists.txt b/source/source_pw/module_pwdft/test/CMakeLists.txt index 2699d58998b..a2e1fef4b8a 100644 --- a/source/source_pw/module_pwdft/test/CMakeLists.txt +++ b/source/source_pw/module_pwdft/test/CMakeLists.txt @@ -33,7 +33,7 @@ AddTest( LIBS parameter ${math_libs} base device planewave SOURCES structure_factor_test.cpp ../structure_factor.cpp ../parallel_grid.cpp ../../../source_cell/unitcell.cpp - ../../../source_io/module_output/output.cpp + ../../../source_cell/update_cell.cpp ../../../source_cell/bcast_cell.cpp ../../../source_cell/print_cell.cpp diff --git a/source/source_pw/module_pwdft/vnl_pw.cpp b/source/source_pw/module_pwdft/vnl_pw.cpp index 2ffb77aa28b..cfbee7933fe 100644 --- a/source/source_pw/module_pwdft/vnl_pw.cpp +++ b/source/source_pw/module_pwdft/vnl_pw.cpp @@ -6,7 +6,7 @@ #include "source_base/global_variable.h" #include "source_base/math_integral.h" #include "source_base/math_polyint.h" -#include "source_io/module_output/output.h" +#include "source_base/output.h" #include "source_base/math_sphbes.h" #include "source_base/math_ylmreal.h" #include "source_base/memory_recorder.h" diff --git a/source/source_relax/test/CMakeLists.txt b/source/source_relax/test/CMakeLists.txt index 3e7d7e8f31d..a85d067d95d 100644 --- a/source/source_relax/test/CMakeLists.txt +++ b/source/source_relax/test/CMakeLists.txt @@ -19,7 +19,7 @@ AddTest( ../../source_base/global_function.cpp ../../source_base/complexmatrix.cpp ../../source_base/matrix.cpp ../../source_base/complexarray.cpp ../../source_base/tool_quit.cpp ../../source_base/realarray.cpp ../../source_base/module_external/blas_connector_base.cpp ../../source_base/module_external/blas_connector_vector.cpp ../../source_base/module_external/blas_connector_matrix.cpp - ../../source_cell/update_cell.cpp ../../source_cell/print_cell.cpp ../../source_cell/bcast_cell.cpp ../../source_io/module_output/output.cpp + ../../source_cell/update_cell.cpp ../../source_cell/print_cell.cpp ../../source_cell/bcast_cell.cpp ../../source_base/output.cpp LIBS parameter ${math_libs} ) @@ -27,7 +27,6 @@ list(APPEND cell_source_files ../../source_cell/update_cell.cpp ../../source_cell/bcast_cell.cpp ../../source_cell/print_cell.cpp - ../../source_io/module_output/output.cpp ) AddTest( TARGET MODULE_RELAX_lattice_change_methods_test @@ -104,7 +103,6 @@ AddTest( ../../source_io/module_output/orb_io.cpp ../../source_cell/bcast_cell.cpp ../../source_cell/print_cell.cpp - ../../source_io/module_output/output.cpp ) AddTest(