Skip to content

Commit f2d3265

Browse files
dzzz2001claude
andauthored
[Refactor] Shorten verbose names in module_gint (deepmodeling#7336)
* [Refactor] Shorten verbose function names in module_gint Drop redundant verb prefixes and noise tokens: transfer_hr_gint_to_hR -> hr_gint_to_hR, transfer_dm_2d_to_gint -> dm_2d_to_gint, *_sparseMatrix -> *_sparse, init_atom_pair_start_end_idx_ -> init_atom_pair_idx_, get_max_atoms_num_per_bgrid -> get_max_atoms_per_bgrid. Pure rename, no behavior change. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * [Refactor] Shorten verbose member names in module_gint Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent 0cc38f1 commit f2d3265

36 files changed

Lines changed: 289 additions & 289 deletions

source/source_lcao/module_gint/batch_biggrid.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace ModuleGint
66
int BatchBigGrid::max_batch_size_ = 0;
77
int BatchBigGrid::max_atoms_num_ = 0;
88
int BatchBigGrid::max_phi_len_ = 0;
9-
int BatchBigGrid::max_atom_pairs_num_ = 0;
9+
int BatchBigGrid::max_atom_pairs_ = 0;
1010

1111
BatchBigGrid::BatchBigGrid(std::vector<std::shared_ptr<BigGrid>> biggrids)
1212
{
@@ -19,14 +19,14 @@ BatchBigGrid::BatchBigGrid(std::vector<std::shared_ptr<BigGrid>> biggrids)
1919
{
2020
max_nw_ = std::max(max_nw_, atom->get_nw());
2121
}
22-
max_atoms_num_per_bgrid_ = std::max(max_atoms_num_per_bgrid_, biggrid->get_atoms_num());
22+
max_atoms_per_bgrid_ = std::max(max_atoms_per_bgrid_, biggrid->get_atoms_num());
2323
atoms_num_ += biggrid->get_atoms_num();
2424
atom_pairs_num += std::pow(biggrid->get_atoms_num(), 2);
2525
phi_len_ += biggrid->get_phi_len() * biggrid->get_mgrids_num();
2626
}
2727
max_atoms_num_ = std::max(max_atoms_num_, atoms_num_);
2828
max_phi_len_ = std::max(max_phi_len_, phi_len_);
29-
max_atom_pairs_num_ = std::max(max_atom_pairs_num_, atom_pairs_num);
29+
max_atom_pairs_ = std::max(max_atom_pairs_, atom_pairs_num);
3030
}
3131

3232

source/source_lcao/module_gint/batch_biggrid.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ class BatchBigGrid
1616
int get_batch_size() const { return biggrids_.size(); }
1717
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_; }
19+
int get_max_atoms_per_bgrid() const { return max_atoms_per_bgrid_; }
2020
bool empty() {return atoms_num_ == 0; }
2121
static int get_max_batch_size() { return max_batch_size_; }
2222
static int get_max_atoms_num() { return max_atoms_num_; }
2323
static int get_max_phi_len() { return max_phi_len_; }
24-
static int get_max_atom_pairs_num() { return max_atom_pairs_num_; }
24+
static int get_max_atom_pairs_num() { return max_atom_pairs_; }
2525
static std::shared_ptr<const BigGridInfo> get_bgrid_info() { return BigGrid::get_bgrid_info(); }
2626

2727
private:
@@ -35,7 +35,7 @@ class BatchBigGrid
3535
int atoms_num_ = 0;
3636

3737
// the max number of atoms of a single biggrid
38-
int max_atoms_num_per_bgrid_ = 0;
38+
int max_atoms_per_bgrid_ = 0;
3939

4040
// the max number of biggrids of a biggrids batch
4141
static int max_batch_size_;
@@ -44,7 +44,7 @@ class BatchBigGrid
4444
// the max number of total wavefunctions of a biggrids batch
4545
static int max_phi_len_;
4646
// the max number of atom pairs of a biggrids batch
47-
static int max_atom_pairs_num_;
47+
static int max_atom_pairs_;
4848
};
4949

5050
}

source/source_lcao/module_gint/big_grid.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ void BigGrid::set_atoms_phi_len(std::vector<int>& phi_len) const
4545
void BigGrid::set_mgrids_coord(std::vector<Vec3d>& coord) const
4646
{
4747
coord.resize(biggrid_info_->get_mgrids_num());
48-
Vec3d this_bgrid_coord = localcell_info_->get_bgrid_global_coord_3D(idx_);
48+
Vec3d bgrid_coord = localcell_info_->get_bgrid_global_coord_3D(idx_);
4949
for(int im = 0; im < biggrid_info_->get_mgrids_num(); ++im)
5050
{
51-
coord[im] = biggrid_info_->get_mgrid_coord(im) + this_bgrid_coord;
51+
coord[im] = biggrid_info_->get_mgrid_coord(im) + bgrid_coord;
5252
}
5353
}
5454

@@ -83,14 +83,14 @@ void BigGrid::set_atom_relative_coords(const Vec3i bgrid_idx, const Vec3d tau_in
8383
Vec3i this_bgrid_idx = localcell_info_->get_bgrid_global_idx_3D(idx_);
8484

8585
// the relative coordinates of this big grid and the atom
86-
Vec3d bgrid_relative_coord
86+
Vec3d bgrid_rcoord
8787
= unitcell_info_->get_relative_coord(bgrid_idx, this_bgrid_idx) + tau_in_bgrid;
8888

8989
atom_coord.resize(biggrid_info_->get_mgrids_num());
9090
for(int im = 0; im < biggrid_info_->get_mgrids_num(); ++im)
9191
{
9292
const Vec3d& mgrid_coord = biggrid_info_->get_mgrid_coord(im);
93-
atom_coord[im] = mgrid_coord - bgrid_relative_coord;
93+
atom_coord[im] = mgrid_coord - bgrid_rcoord;
9494
}
9595
}
9696

source/source_lcao/module_gint/biggrid_info.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,33 +16,33 @@ BigGridInfo::BigGridInfo(
1616
biggrid_vec3_(biggrid_vec3),
1717
nmx_(nmx), nmy_(nmy), nmz_(nmz), nmxyz_(nmx*nmy*nmz)
1818
{
19-
// initialize the biggrid_latvec0_
20-
biggrid_latvec0_.e11 = biggrid_vec1_.x;
21-
biggrid_latvec0_.e12 = biggrid_vec1_.y;
22-
biggrid_latvec0_.e13 = biggrid_vec1_.z;
19+
// initialize the bgrid_latvec0_
20+
bgrid_latvec0_.e11 = biggrid_vec1_.x;
21+
bgrid_latvec0_.e12 = biggrid_vec1_.y;
22+
bgrid_latvec0_.e13 = biggrid_vec1_.z;
2323

24-
biggrid_latvec0_.e21 = biggrid_vec2_.x;
25-
biggrid_latvec0_.e22 = biggrid_vec2_.y;
26-
biggrid_latvec0_.e23 = biggrid_vec2_.z;
24+
bgrid_latvec0_.e21 = biggrid_vec2_.x;
25+
bgrid_latvec0_.e22 = biggrid_vec2_.y;
26+
bgrid_latvec0_.e23 = biggrid_vec2_.z;
2727

28-
biggrid_latvec0_.e31 = biggrid_vec3_.x;
29-
biggrid_latvec0_.e32 = biggrid_vec3_.y;
30-
biggrid_latvec0_.e33 = biggrid_vec3_.z;
28+
bgrid_latvec0_.e31 = biggrid_vec3_.x;
29+
bgrid_latvec0_.e32 = biggrid_vec3_.y;
30+
bgrid_latvec0_.e33 = biggrid_vec3_.z;
3131

3232
// initialize the GT matrix
33-
biggrid_GT_ = biggrid_latvec0_.Inverse();
33+
biggrid_GT_ = bgrid_latvec0_.Inverse();
3434

3535
// initialize the meshgrid_info_
3636
meshgrid_info_ = std::make_shared<MeshGridInfo>(
3737
biggrid_vec1_ / static_cast<double>(nmx),
3838
biggrid_vec2_ / static_cast<double>(nmy),
3939
biggrid_vec3_ / static_cast<double>(nmz));
4040

41-
// initialize the meshgrid_coords_
42-
meshgrid_coords_.resize(nmxyz_);
41+
// initialize the mgrid_coords_
42+
mgrid_coords_.resize(nmxyz_);
4343
for(int index_1d = 0; index_1d < nmxyz_; index_1d++)
4444
{
45-
meshgrid_coords_[index_1d] =
45+
mgrid_coords_[index_1d] =
4646
meshgrid_info_->get_cartesian_coord(mgrid_idx_1Dto3D(index_1d));
4747
}
4848
ModuleBase::Memory::record("BigGridInfo::meshgrid_coords", (long long)nmxyz_ * sizeof(Vec3d), true);

source/source_lcao/module_gint/biggrid_info.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ class BigGridInfo
2424

2525
~BigGridInfo();
2626

27-
Vec3d get_cartesian_coord(const Vec3d& index_3d) const { return index_3d * biggrid_latvec0_; }
28-
Vec3d get_cartesian_coord(const Vec3i& index_3d) const { return index_3d * biggrid_latvec0_; }
27+
Vec3d get_cartesian_coord(const Vec3d& index_3d) const { return index_3d * bgrid_latvec0_; }
28+
Vec3d get_cartesian_coord(const Vec3i& index_3d) const { return index_3d * bgrid_latvec0_; }
2929
Vec3d get_direct_coord(const Vec3d& cart_coord) const { return cart_coord * biggrid_GT_; }
3030

3131
// Return the maximum number of big grids that can fit inside a sphere of radius r,
@@ -38,8 +38,8 @@ class BigGridInfo
3838
int get_nmz() const { return nmz_; }
3939
int get_mgrids_num() const { return nmxyz_; }
4040

41-
const std::vector<Vec3d>& get_mgrids_coord() const { return meshgrid_coords_; }
42-
const Vec3d& get_mgrid_coord(int index_1d) const { return meshgrid_coords_[index_1d]; }
41+
const std::vector<Vec3d>& get_mgrids_coord() const { return mgrid_coords_; }
42+
const Vec3d& get_mgrid_coord(int index_1d) const { return mgrid_coords_[index_1d]; }
4343

4444
std::shared_ptr<const MeshGridInfo> get_mgrid_info() const { return meshgrid_info_; }
4545

@@ -63,12 +63,12 @@ class BigGridInfo
6363

6464
// used to convert the (i, j, k) index of the big grid to the Cartesian coordinate
6565
// if biggrid_vec1_ is row vector,
66-
// then biggrid_latvec0_ = [biggrid_vec1_; biggrid_vec2_; biggrid_vec3_],
67-
// (i, j, k) * biggrid_latvec0_ = (x, y, z)
68-
Matrix3 biggrid_latvec0_;
66+
// then bgrid_latvec0_ = [biggrid_vec1_; biggrid_vec2_; biggrid_vec3_],
67+
// (i, j, k) * bgrid_latvec0_ = (x, y, z)
68+
Matrix3 bgrid_latvec0_;
6969

7070
// used to convert the Cartesian coordinate to the (i, j, k) index of the big grid
71-
// biggrid_GT_ = biggrid_latvec0_.Inverse()
71+
// biggrid_GT_ = bgrid_latvec0_.Inverse()
7272
// (x, y, z) * biggrid_GT_ = (i, j, k)
7373
Matrix3 biggrid_GT_;
7474

@@ -95,7 +95,7 @@ class BigGridInfo
9595

9696
// store the relative Cartesian coordinates of all meshgrids in the biggrid
9797
// the size of vector is nbxyz_
98-
std::vector<Vec3d> meshgrid_coords_;
98+
std::vector<Vec3d> mgrid_coords_;
9999
};
100100

101101
} // namespace ModuleGint

source/source_lcao/module_gint/gint_common.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,10 @@ void compose_hr_gint(HContainer<T>& hr_gint)
113113
}
114114

115115
template <typename T>
116-
void transfer_hr_gint_to_hR(const HContainer<T>& hr_gint, HContainer<T>& hR)
116+
void hr_gint_to_hR(const HContainer<T>& hr_gint, HContainer<T>& hR)
117117
{
118-
ModuleBase::TITLE("Gint", "transfer_hr_gint_to_hR");
119-
ModuleBase::timer::start("Gint", "transfer_hr_gint_to_hR");
118+
ModuleBase::TITLE("Gint", "hr_gint_to_hR");
119+
ModuleBase::timer::start("Gint", "hr_gint_to_hR");
120120
#ifdef __MPI
121121
int size = 0;
122122
MPI_Comm_size(MPI_COMM_WORLD, &size);
@@ -131,7 +131,7 @@ void transfer_hr_gint_to_hR(const HContainer<T>& hr_gint, HContainer<T>& hR)
131131
#else
132132
hR.add(hr_gint);
133133
#endif
134-
ModuleBase::timer::end("Gint", "transfer_hr_gint_to_hR");
134+
ModuleBase::timer::end("Gint", "hr_gint_to_hR");
135135
}
136136

137137

@@ -258,7 +258,7 @@ void merge_hr_part_to_hR(const std::vector<hamilt::HContainer<double>>& hr_gint_
258258

259259

260260

261-
// C++11-compatible helpers for transfer_dm_2d_to_gint:
261+
// C++11-compatible helpers for dm_2d_to_gint:
262262
// SFINAE (enable_if) to select same-type vs cross-type code paths at compile time.
263263

264264
// Same-type path (TGint == TDM): transfer directly
@@ -294,13 +294,13 @@ gather_dm(const HContainer<TDM>& dm_src, HContainer<TGint>& dm_dst,
294294
// gint_info should not have been a parameter, but it was added to initialize dm_gint_full
295295
// In the future, we might try to remove the gint_info parameter
296296
template<typename TGint, typename TDM>
297-
void transfer_dm_2d_to_gint(
297+
void dm_2d_to_gint(
298298
const GintInfo& gint_info,
299299
const std::vector<HContainer<TDM>*>& dm,
300300
std::vector<HContainer<TGint>>& dm_gint)
301301
{
302-
ModuleBase::TITLE("Gint", "transfer_dm_2d_to_gint");
303-
ModuleBase::timer::start("Gint", "transfer_dm_2d_to_gint");
302+
ModuleBase::TITLE("Gint", "dm_2d_to_gint");
303+
ModuleBase::timer::start("Gint", "dm_2d_to_gint");
304304

305305
if (PARAM.inp.nspin != 4)
306306
{
@@ -368,7 +368,7 @@ void transfer_dm_2d_to_gint(
368368
delete dm2d_tmp;
369369
#endif
370370
}
371-
ModuleBase::timer::end("Gint", "transfer_dm_2d_to_gint");
371+
ModuleBase::timer::end("Gint", "dm_2d_to_gint");
372372
}
373373

374374
int globalIndex(int localindex, int nblk, int nprocs, int myproc)
@@ -480,10 +480,10 @@ void wfc_2d_to_gint(const T* wfc_2d,
480480

481481
template void compose_hr_gint(HContainer<double>& hr_gint);
482482
template void compose_hr_gint(HContainer<float>& hr_gint);
483-
template void transfer_hr_gint_to_hR(
483+
template void hr_gint_to_hR(
484484
const HContainer<double>& hr_gint,
485485
HContainer<double>& hR);
486-
template void transfer_hr_gint_to_hR(
486+
template void hr_gint_to_hR(
487487
const HContainer<std::complex<double>>& hr_gint,
488488
HContainer<std::complex<double>>& hR);
489489
template void cast_hcontainer_values(
@@ -494,15 +494,15 @@ template void cast_hcontainer_values(
494494
HContainer<double>& dst);
495495
template HContainer<float> make_cast_hcontainer(const HContainer<double>& src);
496496
template HContainer<double> make_cast_hcontainer(const HContainer<float>& src);
497-
template void transfer_dm_2d_to_gint(
497+
template void dm_2d_to_gint(
498498
const GintInfo& gint_info,
499499
const std::vector<HContainer<double>*>& dm,
500500
std::vector<HContainer<double>>& dm_gint);
501-
template void transfer_dm_2d_to_gint(
501+
template void dm_2d_to_gint(
502502
const GintInfo& gint_info,
503503
const std::vector<HContainer<double>*>& dm,
504504
std::vector<HContainer<float>>& dm_gint);
505-
template void transfer_dm_2d_to_gint(
505+
template void dm_2d_to_gint(
506506
const GintInfo& gint_info,
507507
const std::vector<HContainer<std::complex<double>>*>& dm,
508508
std::vector<HContainer<std::complex<double>>>& dm_gint);

source/source_lcao/module_gint/gint_common.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ namespace ModuleGint
1616

1717

1818
template <typename T>
19-
void transfer_hr_gint_to_hR(const HContainer<T>& hr_gint, HContainer<T>& hR);
19+
void hr_gint_to_hR(const HContainer<T>& hr_gint, HContainer<T>& hR);
2020
// for nspin=4 case
2121
void merge_hr_part_to_hR(const std::vector<hamilt::HContainer<double>>& hr_gint_tmp ,
2222
hamilt::HContainer<std::complex<double>>* hR,
2323
const GintInfo& gint_info);
2424

2525
template<typename TGint, typename TDM>
26-
void transfer_dm_2d_to_gint(
26+
void dm_2d_to_gint(
2727
const GintInfo& gint_info,
2828
const std::vector<HContainer<TDM>*>& dm,
2929
std::vector<HContainer<TGint>>& dm_gint);

0 commit comments

Comments
 (0)