Skip to content

Commit 0f67a54

Browse files
committed
remove redundant ";"
1 parent 77e7b47 commit 0f67a54

26 files changed

+125
-125
lines changed

source/module_hamilt_lcao/module_gint/temp_gint/batch_biggrid.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ class BatchBigGrid
1111
public:
1212
BatchBigGrid(std::vector<std::shared_ptr<BigGrid>> biggrids);
1313

14-
const std::vector<std::shared_ptr<BigGrid>>& get_bgrids() { return biggrids_; };
14+
const std::vector<std::shared_ptr<BigGrid>>& get_bgrids() { return biggrids_; }
1515

16-
int get_batch_size() const { return biggrids_.size(); };
17-
int get_atoms_num() const { return atoms_num_; };
16+
int get_batch_size() const { return biggrids_.size(); }
17+
int get_atoms_num() const { return atoms_num_; }
1818
int get_phi_len() const { return phi_len_;}
19-
int get_max_atoms_num_per_bgrid() const { return max_atoms_num_per_bgrid_; };
20-
bool empty() {return atoms_num_ == 0; };
21-
static int get_max_batch_size() { return max_batch_size_; };
22-
static int get_max_atoms_num() { return max_atoms_num_; };
23-
static int get_max_phi_len() { return max_phi_len_; };
24-
static int get_max_atom_pairs_num() { return max_atom_pairs_num_; };
25-
static std::shared_ptr<const BigGridInfo> get_bgrid_info() { return BigGrid::get_bgrid_info(); };
19+
int get_max_atoms_num_per_bgrid() const { return max_atoms_num_per_bgrid_; }
20+
bool empty() {return atoms_num_ == 0; }
21+
static int get_max_batch_size() { return max_batch_size_; }
22+
static int get_max_atoms_num() { return max_atoms_num_; }
23+
static int get_max_phi_len() { return max_phi_len_; }
24+
static int get_max_atom_pairs_num() { return max_atom_pairs_num_; }
25+
static std::shared_ptr<const BigGridInfo> get_bgrid_info() { return BigGrid::get_bgrid_info(); }
2626

2727
private:
2828
std::vector<std::shared_ptr<BigGrid>> biggrids_;

source/module_hamilt_lcao/module_gint/temp_gint/big_grid.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@ class BigGrid
1717
// constructor
1818
BigGrid(int idx);
1919

20-
static void init_localcell_info(std::shared_ptr<const LocalCellInfo> localcell_info) { localcell_info_ = localcell_info; };
21-
static void init_unitcell_info(std::shared_ptr<const UnitCellInfo> unitcell_info) { unitcell_info_ = unitcell_info; };
22-
static void init_bgrid_info(std::shared_ptr<const BigGridInfo> biggrid_info) { biggrid_info_ = biggrid_info; };
20+
static void init_localcell_info(std::shared_ptr<const LocalCellInfo> localcell_info) { localcell_info_ = localcell_info; }
21+
static void init_unitcell_info(std::shared_ptr<const UnitCellInfo> unitcell_info) { unitcell_info_ = unitcell_info; }
22+
static void init_bgrid_info(std::shared_ptr<const BigGridInfo> biggrid_info) { biggrid_info_ = biggrid_info; }
2323

2424
// getter functions
25-
int get_idx() const { return idx_; };
26-
static std::shared_ptr<const LocalCellInfo> get_localcell_info() { return localcell_info_; };
27-
static std::shared_ptr<const UnitCellInfo> get_unitcell_info() { return unitcell_info_; };
28-
static std::shared_ptr<const BigGridInfo> get_bgrid_info() { return biggrid_info_; };
29-
const std::vector<const GintAtom*>& get_atoms() const { return atoms_; };
30-
const GintAtom* get_atom(int i) const { return atoms_[i]; };
25+
int get_idx() const { return idx_; }
26+
static std::shared_ptr<const LocalCellInfo> get_localcell_info() { return localcell_info_; }
27+
static std::shared_ptr<const UnitCellInfo> get_unitcell_info() { return unitcell_info_; }
28+
static std::shared_ptr<const BigGridInfo> get_bgrid_info() { return biggrid_info_; }
29+
const std::vector<const GintAtom*>& get_atoms() const { return atoms_; }
30+
const GintAtom* get_atom(int i) const { return atoms_[i]; }
3131

3232
// get the number of meshgrids in the big grid
33-
int get_mgrids_num() const { return biggrid_info_->get_mgrids_num(); };
33+
int get_mgrids_num() const { return biggrid_info_->get_mgrids_num(); }
3434

3535
// get the number of atoms that can affect the big grid
36-
int get_atoms_num() const { return atoms_.size(); };
36+
int get_atoms_num() const { return atoms_.size(); }
3737

3838
// add an atom to the big grid
3939
void add_atom(const GintAtom* atom);

source/module_hamilt_lcao/module_gint/temp_gint/biggrid_info.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,36 +22,36 @@ class BigGridInfo
2222
Vec3d biggrid_vec3,
2323
int nmx, int nmy, int nmz);
2424

25-
Vec3d get_cartesian_coord(const Vec3d& index_3d) const { return index_3d * biggrid_latvec0_; };
26-
Vec3d get_cartesian_coord(const Vec3i& index_3d) const { return index_3d * biggrid_latvec0_; };
27-
Vec3d get_direct_coord(const Vec3d& cart_coord) const { return cart_coord * biggrid_GT_; };
25+
Vec3d get_cartesian_coord(const Vec3d& index_3d) const { return index_3d * biggrid_latvec0_; }
26+
Vec3d get_cartesian_coord(const Vec3i& index_3d) const { return index_3d * biggrid_latvec0_; }
27+
Vec3d get_direct_coord(const Vec3d& cart_coord) const { return cart_coord * biggrid_GT_; }
2828

2929
// Return the maximum number of big grids that can fit inside a sphere of radius r,
3030
// along the three lattice vector directions.
3131
Vec3i max_ext_bgrid_num(double r) const;
3232

3333
// get number of meshgrids along three lattice directions
34-
int get_nmx() const { return nmx_; };
35-
int get_nmy() const { return nmy_; };
36-
int get_nmz() const { return nmz_; };
37-
int get_mgrids_num() const { return nmxyz_; };
34+
int get_nmx() const { return nmx_; }
35+
int get_nmy() const { return nmy_; }
36+
int get_nmz() const { return nmz_; }
37+
int get_mgrids_num() const { return nmxyz_; }
3838

39-
const std::vector<Vec3d>& get_mgrids_coord() const { return meshgrid_coords_; };
40-
const Vec3d& get_mgrid_coord(int index_1d) const { return meshgrid_coords_[index_1d]; };
39+
const std::vector<Vec3d>& get_mgrids_coord() const { return meshgrid_coords_; }
40+
const Vec3d& get_mgrid_coord(int index_1d) const { return meshgrid_coords_[index_1d]; }
4141

42-
std::shared_ptr<const MeshGridInfo> get_mgrid_info() const { return meshgrid_info_; };
42+
std::shared_ptr<const MeshGridInfo> get_mgrid_info() const { return meshgrid_info_; }
4343

4444
// get the 3D index of a meshgrid in the big grid from the 1D index
4545
Vec3i mgrid_idx_1Dto3D(int index_1d) const
4646
{
4747
return index1Dto3D(index_1d, nmx_, nmy_, nmz_);
48-
};
48+
}
4949

5050
// get the 1D index of a meshgrid in the big grid from the 3D index
5151
int mgrid_idx_3Dto1D(const Vec3i index_3d) const
5252
{
5353
return index3Dto1D(index_3d.x, index_3d.y, index_3d.z, nmx_, nmy_, nmz_);
54-
};
54+
}
5555

5656
private:
5757
// basis vectors of the big grid

source/module_hamilt_lcao/module_gint/temp_gint/gint_atom.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@ class GintAtom
2121
const UnitCell* ucell);
2222

2323
// getter functions
24-
const Atom* get_atom() const { return atom_; };
25-
int get_ia() const { return ia_; };
26-
int get_iat() const { return iat_; };
27-
int get_start_iw() const { return ucell_->itiaiw2iwt(it_, ia_, 0); }; // get the start index of global atomic orbitals
28-
const Vec3i& get_bgrid_idx() const { return biggrid_idx_; };
29-
const Vec3i& get_unitcell_idx() const { return unitcell_idx_; };
30-
const Vec3i& get_R() const { return unitcell_idx_; };
31-
const Vec3d& get_tau_in_bgrid() const { return tau_in_biggrid_; };
32-
const Numerical_Orbital* get_orb() const { return orb_; };
24+
const Atom* get_atom() const { return atom_; }
25+
int get_ia() const { return ia_; }
26+
int get_iat() const { return iat_; }
27+
int get_start_iw() const { return ucell_->itiaiw2iwt(it_, ia_, 0); } // get the start index of global atomic orbitals
28+
const Vec3i& get_bgrid_idx() const { return biggrid_idx_; }
29+
const Vec3i& get_unitcell_idx() const { return unitcell_idx_; }
30+
const Vec3i& get_R() const { return unitcell_idx_; }
31+
const Vec3d& get_tau_in_bgrid() const { return tau_in_biggrid_; }
32+
const Numerical_Orbital* get_orb() const { return orb_; }
3333

34-
int get_nw() const { return atom_->nw; };
35-
double get_rcut() const { return orb_->getRcut(); };
34+
int get_nw() const { return atom_->nw; }
35+
double get_rcut() const { return orb_->getRcut(); }
3636

3737
/**
3838
* @brief Get the wave function values of the atom at a meshgrid.

source/module_hamilt_lcao/module_gint/temp_gint/gint_fvl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class Gint_fvl : public Gint
2323
ModuleBase::matrix* svl)
2424
: nspin_(nspin), vr_eff_(vr_eff), dm_vec_(dm_vec),
2525
isforce_(isforce), isstress_(isstress), fvl_(fvl), svl_(svl),
26-
dr3_(gint_info_->get_mgrid_volume()) {};
26+
dr3_(gint_info_->get_mgrid_volume()) {}
2727

2828
void cal_gint();
2929

source/module_hamilt_lcao/module_gint/temp_gint/gint_fvl_gpu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class Gint_fvl_gpu : public Gint
2424
ModuleBase::matrix* svl)
2525
: nspin_(nspin), vr_eff_(vr_eff), dm_vec_(dm_vec),
2626
isforce_(isforce), isstress_(isstress), fvl_(fvl), svl_(svl),
27-
dr3_(gint_info_->get_mgrid_volume()) {};
27+
dr3_(gint_info_->get_mgrid_volume()) {}
2828

2929
void cal_gint();
3030

source/module_hamilt_lcao/module_gint/temp_gint/gint_fvl_meta.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class Gint_fvl_meta : public Gint
2323
ModuleBase::matrix* svl)
2424
: nspin_(nspin), vr_eff_(vr_eff), vofk_(vofk), dm_vec_(dm_vec),
2525
isforce_(isforce), isstress_(isstress), fvl_(fvl), svl_(svl),
26-
dr3_(gint_info_->get_mgrid_volume()) {};
26+
dr3_(gint_info_->get_mgrid_volume()) {}
2727

2828
void cal_gint();
2929

source/module_hamilt_lcao/module_gint/temp_gint/gint_fvl_meta_gpu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class Gint_fvl_meta_gpu : public Gint
2424
ModuleBase::matrix* svl)
2525
: nspin_(nspin), vr_eff_(vr_eff), vofk_(vofk), dm_vec_(dm_vec),
2626
isforce_(isforce), isstress_(isstress), fvl_(fvl), svl_(svl),
27-
dr3_(gint_info_->get_mgrid_volume()) {};
27+
dr3_(gint_info_->get_mgrid_volume()) {}
2828

2929
void cal_gint();
3030

source/module_hamilt_lcao/module_gint/temp_gint/gint_info.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ class GintInfo
3434
const UnitCell& ucell, Grid_Driver& gd);
3535

3636
// getter functions
37-
const std::vector<std::shared_ptr<BigGrid>>& get_biggrids() { return biggrids_; };
38-
const std::vector<int>& get_trace_lo() const{ return trace_lo_; };
39-
int get_lgd() const { return lgd_; };
40-
int get_nat() const { return ucell_->nat; }; // return the number of atoms in the unitcell
41-
int get_local_mgrid_num() const { return localcell_info_->get_mgrids_num(); };
42-
double get_mgrid_volume() const { return meshgrid_info_->get_volume(); };
37+
const std::vector<std::shared_ptr<BigGrid>>& get_biggrids() { return biggrids_; }
38+
const std::vector<int>& get_trace_lo() const{ return trace_lo_; }
39+
int get_lgd() const { return lgd_; }
40+
int get_nat() const { return ucell_->nat; } // return the number of atoms in the unitcell
41+
int get_local_mgrid_num() const { return localcell_info_->get_mgrids_num(); }
42+
double get_mgrid_volume() const { return meshgrid_info_->get_volume(); }
4343

4444
//=========================================
4545
// functions about hcontainer

source/module_hamilt_lcao/module_gint/temp_gint/gint_rho.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class Gint_rho : public Gint
1616
const std::vector<HContainer<double>*>& dm_vec,
1717
const int nspin,
1818
double **rho)
19-
: dm_vec_(dm_vec), nspin_(nspin), rho_(rho) {};
19+
: dm_vec_(dm_vec), nspin_(nspin), rho_(rho) {}
2020

2121
void cal_gint();
2222

0 commit comments

Comments
 (0)