Merge branch 'develop' into off-nloc-vdw-xc

Author: kirk0830

README.md

@@ -12,7 +12,7 @@
 
 # About ABACUS
 
-ABACUS (Atomic-orbital Based Ab-initio Computation at UStc) is an open-source package based on density functional theory (DFT). The package utilizes both plane wave and numerical atomic basis sets with the usage of norm-conserving pseudopotentials to describe the interactions between nuclear ions and valence electrons. ABACUS supports LDA, GGA, meta-GGA, and hybrid functionals. Apart from single-point calculations, the package allows geometry optimizations and ab-initio molecular dynamics with various ensembles. The package also provides a variety of advanced functionalities for simulating materials, including the DFT+U, VdW corrections, and implicit solvation model, etc. In addition, ABACUS strives to provide a general infrastructure to facilitate the developments and applications of novel machine-learning-assisted DFT methods (DeePKS, DP-GEN, DeepH, etc.) in molecular and material simulations.
+ABACUS (Atomic-orbital Based Ab-initio Computation at UStc) is an open-source package based on density functional theory (DFT). The package utilizes both plane wave and numerical atomic basis sets with the usage of norm-conserving pseudopotentials to describe the interactions between nuclear ions and valence electrons. ABACUS supports LDA, GGA, meta-GGA, and hybrid functionals. Apart from single-point calculations, the package allows geometry optimizations and ab-initio molecular dynamics with various ensembles. The package also provides a variety of advanced functionalities for simulating materials, including the DFT+U, VdW corrections, and implicit solvation model, etc. In addition, ABACUS strives to provide a general infrastructure to facilitate the developments and applications of novel machine-learning-assisted DFT methods (DeePKS, DP-GEN, DeepH, DeePTB etc.) in molecular and material simulations.
 
 # Online Documentation
 For detailed documentation, please refer to [our documentation website](https://abacus.deepmodeling.com/).

docs/CITATIONS.md

@@ -26,7 +26,7 @@ The following references are required to be cited when using ABACUS. Specificall
 
 - **If DeePKS is used:**
 
-    Wenfei Li, Qi Ou, et al. "DeePKS+ABACUS as a Bridge between Expensive Quantum Mechanical Models and Machine Learning Potentials." <https://arxiv.org/abs/2206.10093>.
+    Wenfei Li, Qi Ou, et al. "DeePKS+ABACUS as a Bridge between Expensive Quantum Mechanical Models and Machine Learning Potentials." J. Phys. Chem. A 126.49 (2022): 9154-9164.
 
 - **If hybrid functional is used:**
 

docs/advanced/input_files/input-main.md

@@ -728,7 +728,7 @@ These variables are used to control the plane wave related parameters.
 
 - **Type**: Real
 - **Description**: Energy cutoff for plane wave functions, the unit is **Rydberg**. Note that even for localized orbitals basis, you still need to setup an energy cutoff for this system. Because our local pseudopotential parts and the related force are calculated from plane wave basis set, etc. Also, because our orbitals are generated by matching localized orbitals to a chosen set of wave functions from a certain energy cutoff, this set of localize orbitals is most accurate under this same plane wave energy cutoff.
-- **Default**: 50
+- **Default**: 50 Ry (PW basis), 100 Ry (LCAO basis)
 
 ### ecutrho
 

docs/advanced/interface/deepks.md

@@ -1,9 +1,14 @@
 # DeePKS
 
-[DeePKS](https://pubs.acs.org/doi/10.1021/acs.jctc.0c00872) is a machine-learning aided density funcitonal model that fits the energy difference between highly accurate but computationally demanding method and effcient but less accurate method via neural-network. As such, the trained DeePKS model can provide highly accurate energetics (and forces) with relatively low computational cost, and can therefore act as a bridge to connect expensive quantum mechanic data and machine-learning-based potentials. While the original framework of DeePKS is for molecular systems, please refer to this [reference](https://arxiv.org/abs/2206.10093) for the application of DeePKS in periodic systems. 
+[DeePKS](https://pubs.acs.org/doi/10.1021/acs.jctc.0c00872) is a machine-learning (ML) aided density funcitonal model that fits the energy difference between highly accurate but computationally demanding method and effcient but less accurate method via neural-network. Common high-precision methods include hybrid functionals or CCSD-T, while common low-precision methods are LDA/GGA.
 
-Detailed instructions on installing and running DeePKS can be found on this [website](https://deepks-kit.readthedocs.io/en/latest/index.html). An [example](https://github.com/deepmodeling/deepks-kit/tree/abacus/examples/water_single_lda2pbe_abacus) for training DeePKS model with ABACUS is also provided. The DeePKS-related keywords in `INPUT` file can be found [here](http://abacus.deepmodeling.com/en/latest/advanced/input_files/input-main.html#deepks).
+As such, the trained DeePKS model can provide highly accurate energetics (and forces/band gap/density) with relatively low computational cost, and can therefore act as a bridge to connect expensive quantum mechanic data and machine-learning-based potentials. 
+While the original framework of DeePKS is for molecular systems, please refer to this [J. Phys. Chem. A 126.49 (2022): 9154-9164](https://pubs.acs.org/doi/abs/10.1021/acs.jpca.2c05000) for the application of DeePKS in periodic systems.
 
-> Note: Use the LCAO basis for DeePKS-related calculations
+Detailed instructions on installing and running DeePKS can be found on this [website](https://deepks-kit.readthedocs.io/en/latest/index.html). The DeePKS-related keywords in `INPUT` file can be found [here](http://abacus.deepmodeling.com/en/latest/advanced/input_files/input-main.html#deepks). An [example](https://github.com/deepmodeling/deepks-kit/tree/abacus/examples/water_single_lda2pbe_abacus) for training DeePKS model with ABACUS is also provided. For practical applications, users can refer to a series of [Notebooks](https://bohrium.dp.tech/collections/1921409690). These Notebooks provide detailed instructions on how to train and use the DeePKS model using perovskite as an example. Currently, these tutorials are available in Chinese, but we plan to release corresponding English versions in the near future. 
+
+
+
+> Note: DeePKS calculations can only be performed by the LCAO basis.
 
 

docs/advanced/interface/deeptb.md

@@ -0,0 +1,5 @@
+# DeePTB
+
+[DeePTB](https://github.com/deepmodeling/DeePTB) is an innovative Python package that uses deep learning to accelerate ab initio electronic structure simulations. It offers versatile, accurate, and efficient simulations for a wide range of materials and phenomena. Trained on small systems, DeePTB can predict electronic structures of large systems, handle structural perturbations, and integrate with molecular dynamics for finite temperature simulations, providing comprehensive insights into atomic and electronic behavior. See more details in [DeePTB-SK: Nat Commun 15, 6772 (2024)](https://www.nature.com/articles/s41467-024-51006-4) and [DeePTB-E3: arXiv:2407.06053](https://arxiv.org/pdf/2407.06053).
+
+DeePTB trains the model based on the Structure, Eigenvalues, Hamiltonian, Density matrix, and Overlap matrix  from first-principles calcualtions. DeePTB team provides the interfaces [dftio](https://github.com/deepmodeling/dftio) with other first-principles softwares. [dftio](https://github.com/deepmodeling/dftio) fully supports the interfaces with ABACUS, and can transfer the Structure, Eigenvalues, Hamiltonian, Density matrix, and Overlap matrix from ABACUS into the format used in [DeePTB](https://github.com/deepmodeling/DeePTB).

docs/advanced/interface/index.rst

@@ -9,6 +9,7 @@ Interfaces to Other Softwares
    deepks
    dpgen
    deeph
+   deeptb
    Hefei-NAMD
    phonopy
    Wannier90

docs/conf.py

@@ -33,7 +33,6 @@
 extensions = [
         'myst_parser',
         'deepmodeling_sphinx',
-        'sphinxcontrib.jquery',
 ]
 myst_enable_extensions = [
     "amsmath",
@@ -66,7 +65,7 @@
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = 'sphinx_rtd_theme'
+html_theme = 'sphinx_book_theme'
 html_logo = 'abacus-logo.svg'
 
 

docs/requirements.txt

@@ -1,4 +1,4 @@
 urllib3
 myst_parser[linkify]
-sphinx_rtd_theme
-deepmodeling_sphinx
+sphinx-book-theme
+deepmodeling-sphinx>=0.3.0

source/Makefile.Objects

@@ -243,7 +243,6 @@ OBJS_ESOLVER=esolver.o\
     esolver_of.o\
     esolver_of_tool.o\
     esolver_of_interface.o\
-    print_funcs.o\
     pw_fun.o\
     pw_init_after_vc.o\
     pw_init_globalc.o\

source/module_elecstate/elecstate_pw_sdft.cpp

@@ -1,41 +1,47 @@
 #include "./elecstate_pw_sdft.h"
+
+#include "module_base/global_function.h"
 #include "module_base/global_variable.h"
-#include "module_parameter/parameter.h"
 #include "module_base/timer.h"
-#include "module_base/global_function.h"
 #include "module_hamilt_general/module_xc/xc_functional.h"
+#include "module_parameter/parameter.h"
 namespace elecstate
 {
-    void ElecStatePW_SDFT::psiToRho(const psi::Psi<std::complex<double>>& psi)
+
+template <typename T, typename Device>
+void ElecStatePW_SDFT<T, Device>::psiToRho(const psi::Psi<T>& psi)
+{
+    ModuleBase::TITLE(this->classname, "psiToRho");
+    ModuleBase::timer::tick(this->classname, "psiToRho");
+    for (int is = 0; is < PARAM.inp.nspin; is++)
     {
-        ModuleBase::TITLE(this->classname, "psiToRho");
-        ModuleBase::timer::tick(this->classname, "psiToRho");
-        for(int is=0; is < PARAM.inp.nspin; is++)
-		{
-			ModuleBase::GlobalFunc::ZEROS(this->charge->rho[is], this->charge->nrxx);
-            if (XC_Functional::get_func_type() == 3)
-		    {
-                ModuleBase::GlobalFunc::ZEROS(this->charge->kin_r[is], this->charge->nrxx);
-            }
-		}
-        
-        if(GlobalV::MY_STOGROUP == 0)
-		{
-            this->calEBand();
+        ModuleBase::GlobalFunc::ZEROS(this->charge->rho[is], this->charge->nrxx);
+        if (XC_Functional::get_func_type() == 3)
+        {
+            ModuleBase::GlobalFunc::ZEROS(this->charge->kin_r[is], this->charge->nrxx);
+        }
+    }
+
+    if (GlobalV::MY_STOGROUP == 0)
+    {
+        this->calEBand();
 
-            for(int is=0; is<PARAM.inp.nspin; is++)
-	        {
-		        ModuleBase::GlobalFunc::ZEROS(this->charge->rho[is], this->charge->nrxx);
-	        }
+        for (int is = 0; is < PARAM.inp.nspin; is++)
+        {
+            ModuleBase::GlobalFunc::ZEROS(this->charge->rho[is], this->charge->nrxx);
+        }
 
-            for (int ik = 0; ik < psi.get_nk(); ++ik)
-            {
-                psi.fix_k(ik);
-                this->updateRhoK(psi);
-            }
-            this->parallelK();
+        for (int ik = 0; ik < psi.get_nk(); ++ik)
+        {
+            psi.fix_k(ik);
+            this->updateRhoK(psi);
         }
-        ModuleBase::timer::tick(this->classname, "psiToRho");
-        return;
+        this->parallelK();
     }
-}
+    ModuleBase::timer::tick(this->classname, "psiToRho");
+    return;
+}
+
+// template class ElecStatePW_SDFT<std::complex<float>, base_device::DEVICE_CPU>;
+template class ElecStatePW_SDFT<std::complex<double>, base_device::DEVICE_CPU>;
+} // namespace elecstate