Skip to content

Commit d6d8006

Browse files
committed
resolve confilct
1 parent f8e85bd commit d6d8006

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

source/source_lcao/module_gint/temp_gint/gint_common.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,11 @@ void transfer_dm_2d_to_gint(
250250
int iat2 = ap.get_atom_j();
251251
for (int ir = 0; ir < ap.get_R_size(); ++ir) {
252252
const ModuleBase::Vector3<int> r_index = ap.get_R_index(ir);
253+
#ifdef __MPI
253254
T* matrix_out = dm2d_tmp.find_matrix(iat1, iat2, r_index)->get_pointer();
255+
#else
256+
T* matrix_out = dm2d_tmp->find_matrix(iat1, iat2, r_index)->get_pointer();
257+
#endif
254258
T* matrix_in = ap.get_pointer(ir);
255259
for (int irow = 0; irow < ap.get_row_size()/2; irow ++) {
256260
for (int icol = 0; icol < ap.get_col_size()/2; icol ++) {

0 commit comments

Comments
 (0)