clean useless code

Author: Cstandardlib

source/module_hsolver/diago_bpcg.cpp

@@ -33,8 +33,6 @@ DiagoBPCG<T, Device>::~DiagoBPCG() {
 template<typename T, typename Device>
 void DiagoBPCG<T, Device>::init_iter(const int nband, const int nbasis) {
     // Specify the problem size n_basis, n_band, while lda is n_basis
-    // this->n_band        = psi_in.get_nbands();
-    // this->n_basis       = psi_in.get_nbasis();
     this->n_band        = nband;
     this->n_basis       = nbasis;
 
@@ -54,9 +52,6 @@ void DiagoBPCG<T, Device>::init_iter(const int nband, const int nbasis) {
 
     this->prec          = std::move(ct::Tensor(r_type, device_type, {this->n_basis}));
 
-    //TODO: Remove class Psi, using ct::Tensor instead!
-    // this->grad_wrapper  = new psi::Psi<T, Device>(1, this->n_band, this->n_basis, psi_in.get_ngk_pointer());
-    // this->grad          = std::move(ct::TensorMap(grad_wrapper->get_pointer(), t_type, device_type, {this->n_band, this->n_basis}));
     this->grad          = std::move(ct::Tensor(t_type, device_type, {this->n_band, this->n_basis}));
 }
 
@@ -183,12 +178,7 @@ void DiagoBPCG<T, Device>::calc_hpsi_with_block(
         ct::Tensor& hpsi_out)
 {
     // calculate all-band hpsi
-    // psi::Range all_bands_range(1, psi_in.get_current_k(), 0, psi_in.get_nbands() - 1);
-    // hpsi_info info(&psi_in, all_bands_range, hpsi_out.data<T>());
-    // hamilt_in->ops->hPsi(info);
     hpsi_func(psi_in, hpsi_out.data<T>(), this->n_basis, this->n_band);
-
-    // return;
 }
 
 template<typename T, typename Device>

source/module_hsolver/hsolver_pw.cpp

@@ -486,9 +486,7 @@ void HSolverPW<T, Device>::hamiltSolvePsiK(hamilt::Hamilt<T, Device>* hm,
             ModuleBase::timer::tick("DavSubspace", "hpsi_func");
         };
         DiagoBPCG<T, Device> bpcg(pre_condition.data());
-        // bpcg.init_iter(psi);
         bpcg.init_iter(nband, nbasis);
-        // bpcg.diag(hm, psi, eigenvalue);
         bpcg.diag(hpsi_func, psi.get_pointer(), eigenvalue);
     }
     else if (this->method == "dav_subspace")

source/module_hsolver/test/diago_bpcg_test.cpp

@@ -241,30 +241,6 @@ TEST(DiagoBPCGTest, Hamilt)
     }
 }*/
 
-// This test will not work for now!
-// bpcg for a 2x2 matrix
-// #ifdef __MPI
-// #else
-// TEST(DiagoBPCGTest, TwoByTwo)
-// {
-//     int dim = 2;
-//     int nband = 2;
-//     ModuleBase::ComplexMatrix hm(2, 2);
-//     hm(0, 0) = std::complex<double>{4.0, 0.0};
-//     hm(0, 1) = std::complex<double>{1.0, 0.0};
-//     hm(1, 0) = std::complex<double>{1.0, 0.0};
-//     hm(1, 1) = std::complex<double>{3.0, 0.0};
-//     // nband, npw, sub, sparsity, reorder, eps, maxiter, threshold
-//     DiagoBPCGPrepare dcp(nband, dim, 0, true, 1e-4, 50, 1e-10);
-//     hsolver::DiagoIterAssist<std::complex<double>>::PW_DIAG_NMAX = dcp.maxiter;
-//     hsolver::DiagoIterAssist<std::complex<double>>::PW_DIAG_THR = dcp.eps;
-//     HPsi<std::complex<double>> hpsi;
-//     hpsi.create(nband, dim);
-//     DIAGOTEST::hmatrix = hm;
-//     DIAGOTEST::npw = dim;
-//     dcp.CompareEigen(hpsi.precond());
-// }
-// #endif
 
 TEST(DiagoBPCGTest, readH)
 {