fix a merge bug

goodchong · goodchong · commit 76d1336e96cb · 2024-12-24T09:51:38.000Z
diff --git a/source/module_cell/module_neighbor/sltk_grid_driver.cpp b/source/module_cell/module_neighbor/sltk_grid_driver.cpp
@@ -25,7 +25,7 @@ Grid_Driver::~Grid_Driver()
 void Grid_Driver::Find_atom(const UnitCell& ucell,
                             const int ntype,
                             const int nnumber,
-                            AdjacentAtomInfo* adjs)
+                            AdjacentAtomInfo* adjs) const
 {
     ModuleBase::timer::tick("Grid_Driver", "Find_atom");
     //	std::cout << "lenght in Find atom = " << atomlink[offset].fatom.getAdjacentSet()->getLength() << std::endl;
@@ -58,7 +58,7 @@ void Grid_Driver::Find_atom(const UnitCell& ucell,
                    const ModuleBase::Vector3<double>& cartesian_posi,
                    const int& ntype,
                    const int& nnumber,
-                   AdjacentAtomInfo* adjs)
+                   AdjacentAtomInfo* adjs) const
 {
     this->Find_atom(ucell, ntype, nnumber, adjs);
 }
diff --git a/source/module_cell/module_neighbor/sltk_grid_driver.h b/source/module_cell/module_neighbor/sltk_grid_driver.h
@@ -68,15 +68,15 @@ class Grid_Driver : public Grid
     void Find_atom(const UnitCell& ucell,
                    const int ntype,
                    const int nnumber,
-                   AdjacentAtomInfo* adjs = nullptr);
+                   AdjacentAtomInfo* adjs = nullptr) const;
 
     // cartesian_posi and ucell is deprecated 20241204 zhanghaochong
     // this interface is deprecated, please use Find_atom above
     void Find_atom(const UnitCell& ucell,
                    const ModuleBase::Vector3<double>& cartesian_posi,
                    const int& ntype,
                    const int& nnumber,
-                   AdjacentAtomInfo* adjs = nullptr);
+                   AdjacentAtomInfo* adjs = nullptr) const;
     //==========================================================
     // EXPLAIN : The adjacent information for the input
     // cartesian_pos

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ Grid_Driver::~Grid_Driver()`
`25`	`25`	`void Grid_Driver::Find_atom(const UnitCell& ucell,`
`26`	`26`	`const int ntype,`
`27`	`27`	`const int nnumber,`
`28`		`- AdjacentAtomInfo* adjs)`
	`28`	`+ AdjacentAtomInfo* adjs) const`
`29`	`29`	`{`
`30`	`30`	`ModuleBase::timer::tick("Grid_Driver", "Find_atom");`
`31`	`31`	`// std::cout << "lenght in Find atom = " << atomlink[offset].fatom.getAdjacentSet()->getLength() << std::endl;`
`@@ -58,7 +58,7 @@ void Grid_Driver::Find_atom(const UnitCell& ucell,`
`58`	`58`	`const ModuleBase::Vector3<double>& cartesian_posi,`
`59`	`59`	`const int& ntype,`
`60`	`60`	`const int& nnumber,`
`61`		`- AdjacentAtomInfo* adjs)`
	`61`	`+ AdjacentAtomInfo* adjs) const`
`62`	`62`	`{`
`63`	`63`	`this->Find_atom(ucell, ntype, nnumber, adjs);`
`64`	`64`	`}`