fix a merge bug

goodchong · goodchong · commit 256e34aa4af1 · 2024-12-24T07:26:23.000Z
diff --git a/source/module_cell/module_neighbor/sltk_grid_driver.h b/source/module_cell/module_neighbor/sltk_grid_driver.h
@@ -72,7 +72,7 @@ class Grid_Driver : public Grid
     void Find_atom(const UnitCell& ucell,
                    const int ntype,
                    const int nnumber,
-                   AdjacentAtomInfo* adjs = nullptr)  const;
+                   AdjacentAtomInfo* adjs = nullptr) const;
 
     // cartesian_posi and ucell is deprecated 20241204 zhanghaochong
     // this interface is deprecated, please use Find_atom above
@@ -81,7 +81,7 @@ class Grid_Driver : public Grid
                    const ModuleBase::Vector3<double>& cartesian_posi,
                    const int& ntype,
                    const int& nnumber,
-                   AdjacentAtomInfo* adjs = nullptr)  const;
+                   AdjacentAtomInfo* adjs = nullptr) const;
     //==========================================================
     // EXPLAIN : The adjacent information for the input
     // cartesian_pos
diff --git a/source/module_elecstate/module_dm/test/test_dm_io.cpp b/source/module_elecstate/module_dm/test/test_dm_io.cpp
@@ -48,7 +48,7 @@ void Grid_Driver::Find_atom(const UnitCell& ucell,
                             const ModuleBase::Vector3<double>& tau,
                             const int& T,
                             const int& I,
-                            AdjacentAtomInfo* adjs)
+                            AdjacentAtomInfo* adjs) const
 {
 }
 Grid::Grid(const int& test_grid_in) : test_grid(test_grid_in)
diff --git a/source/module_elecstate/module_dm/test/tmp_mocks.cpp b/source/module_elecstate/module_dm/test/tmp_mocks.cpp
@@ -78,7 +78,7 @@ void Grid_Driver::Find_atom(const UnitCell& ucell,
                             const ModuleBase::Vector3<double>& tau,
                             const int& T,
                             const int& I,
-                            AdjacentAtomInfo* adjs)
+                            AdjacentAtomInfo* adjs) const
 {
     adjs->adj_num = ucell.nat - 1;
     adjs->adjacent_tau.resize(ucell.nat);
diff --git a/source/module_hamilt_lcao/hamilt_lcaodft/operator_lcao/test/tmp_mocks.cpp b/source/module_hamilt_lcao/hamilt_lcaodft/operator_lcao/test/tmp_mocks.cpp
@@ -156,7 +156,7 @@ void Grid_Driver::Find_atom(const UnitCell& ucell,
                             const ModuleBase::Vector3<double>& tau,
                             const int& T,
                             const int& I,
-                            AdjacentAtomInfo* adjs)
+                            AdjacentAtomInfo* adjs) const
 {
     adjs->adj_num = ucell.nat - 1;
     adjs->adjacent_tau.resize(ucell.nat);

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ void Grid_Driver::Find_atom(const UnitCell& ucell,`
`48`	`48`	`const ModuleBase::Vector3<double>& tau,`
`49`	`49`	`const int& T,`
`50`	`50`	`const int& I,`
`51`		`- AdjacentAtomInfo* adjs)`
	`51`	`+ AdjacentAtomInfo* adjs) const`
`52`	`52`	`{`
`53`	`53`	`}`
`54`	`54`	`Grid::Grid(const int& test_grid_in) : test_grid(test_grid_in)`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ void Grid_Driver::Find_atom(const UnitCell& ucell,`
`78`	`78`	`const ModuleBase::Vector3<double>& tau,`
`79`	`79`	`const int& T,`
`80`	`80`	`const int& I,`
`81`		`- AdjacentAtomInfo* adjs)`
	`81`	`+ AdjacentAtomInfo* adjs) const`
`82`	`82`	`{`
`83`	`83`	`adjs->adj_num = ucell.nat - 1;`
`84`	`84`	`adjs->adjacent_tau.resize(ucell.nat);`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ void Grid_Driver::Find_atom(const UnitCell& ucell,`
`156`	`156`	`const ModuleBase::Vector3<double>& tau,`
`157`	`157`	`const int& T,`
`158`	`158`	`const int& I,`
`159`		`- AdjacentAtomInfo* adjs)`
	`159`	`+ AdjacentAtomInfo* adjs) const`
`160`	`160`	`{`
`161`	`161`	`adjs->adj_num = ucell.nat - 1;`
`162`	`162`	`adjs->adjacent_tau.resize(ucell.nat);`