Skip to content

Commit 3cc38dc

Browse files
committed
Remove unsed parameter
1 parent 55c7419 commit 3cc38dc

File tree

4 files changed

+9
-28
lines changed

4 files changed

+9
-28
lines changed

src/dbcsr.h

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -340,14 +340,7 @@ void c_dbcsr_get_info(const dbcsr_matrix c_matrix, int* c_nblkrows_total, int* c
340340

341341
void c_dbcsr_binary_write(const dbcsr_matrix c_matrix, const char* c_filepath);
342342

343-
void c_dbcsr_binary_read_aux(
344-
const char* c_filepath, dbcsr_distribution c_distribution, MPI_Fint c_groupid, dbcsr_matrix* c_matrix_new);
345-
346-
inline void c_dbcsr_binary_read(
347-
const char* c_filepath, dbcsr_distribution c_distribution, MPI_Comm comm, dbcsr_matrix* c_matrix_new) {
348-
MPI_Fint fcomm = MPI_Comm_c2f(comm);
349-
c_dbcsr_binary_read_aux(c_filepath, c_distribution, fcomm, c_matrix_new);
350-
}
343+
void c_dbcsr_binary_read(const char* c_filepath, dbcsr_distribution c_distribution, dbcsr_matrix* c_matrix_new);
351344

352345
void c_free_string(char** c_string);
353346

src/dbcsr_api.F

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1044,17 +1044,12 @@ SUBROUTINE dbcsr_binary_write(matrix, filepath)
10441044
CALL dbcsr_binary_write_prv(matrix%prv, filepath)
10451045
END SUBROUTINE dbcsr_binary_write
10461046

1047-
SUBROUTINE dbcsr_binary_read(filepath, distribution, groupid, matrix_new)
1047+
SUBROUTINE dbcsr_binary_read(filepath, distribution, matrix_new)
10481048
CHARACTER(len=*), INTENT(IN) :: filepath
10491049
TYPE(dbcsr_distribution_type), INTENT(IN) :: distribution
1050-
INTEGER, INTENT(IN), OPTIONAL :: groupid
10511050
TYPE(dbcsr_type), INTENT(INOUT) :: matrix_new
10521051

1053-
TYPE(mp_comm_type) :: my_comm
1054-
1055-
CALL my_comm%set_handle(groupid)
1056-
1057-
CALL dbcsr_binary_read_prv(filepath, distribution%prv, my_comm, matrix_new%prv)
1052+
CALL dbcsr_binary_read_prv(filepath, distribution%prv, matrix_new%prv)
10581053
END SUBROUTINE dbcsr_binary_read
10591054

10601055
SUBROUTINE dbcsr_copy(matrix_b, matrix_a, name, keep_sparsity, &

src/dbcsr_api_c.F

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1670,11 +1670,10 @@ SUBROUTINE c_dbcsr_binary_write(c_matrix, c_filepath) &
16701670
CALL dbcsr_binary_write(matrix, filepath)
16711671
END SUBROUTINE
16721672

1673-
SUBROUTINE c_dbcsr_binary_read(c_filepath, c_distribution, c_groupid, c_matrix_new) &
1674-
BIND(C, name="c_dbcsr_binary_read_aux")
1673+
SUBROUTINE c_dbcsr_binary_read(c_filepath, c_distribution, c_matrix_new) &
1674+
BIND(C, name="c_dbcsr_binary_read")
16751675

16761676
TYPE(c_ptr), INTENT(IN), VALUE :: c_filepath, c_distribution
1677-
INTEGER(kind=c_int), INTENT(IN), VALUE :: c_groupid
16781677
TYPE(c_ptr), INTENT(INOUT) :: c_matrix_new
16791678

16801679
CHARACTER(:, kind=c_char), ALLOCATABLE :: filepath
@@ -1685,7 +1684,7 @@ SUBROUTINE c_dbcsr_binary_read(c_filepath, c_distribution, c_groupid, c_matrix_n
16851684
CALL c_f_pointer(c_distribution, distribution)
16861685
ALLOCATE (matrix_new)
16871686

1688-
CALL dbcsr_binary_read(filepath, distribution, c_groupid, matrix_new)
1687+
CALL dbcsr_binary_read(filepath, distribution, matrix_new)
16891688
c_matrix_new = c_loc(matrix_new)
16901689
END SUBROUTINE
16911690

src/ops/dbcsr_io.F

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ SUBROUTINE cumsum_l(arr, cumsum)
754754
END SUBROUTINE cumsum_l
755755
END SUBROUTINE dbcsr_binary_write
756756
757-
SUBROUTINE dbcsr_binary_read(filepath, distribution, groupid, matrix_new)
757+
SUBROUTINE dbcsr_binary_read(filepath, distribution, matrix_new)
758758
!! Reads a DBCSR matrix from a file
759759
760760
IMPLICIT NONE
@@ -763,8 +763,6 @@ SUBROUTINE dbcsr_binary_read(filepath, distribution, groupid, matrix_new)
763763
!! path to the file
764764
TYPE(dbcsr_distribution_obj), INTENT(IN) :: distribution
765765
!! row and column distribution
766-
TYPE(mp_comm_type), INTENT(IN), OPTIONAL :: groupid
767-
!! message passing environment identifier
768766
TYPE(dbcsr_type), INTENT(INOUT) :: matrix_new
769767
!! DBCSR matrix
770768
@@ -817,12 +815,8 @@ SUBROUTINE dbcsr_binary_read(filepath, distribution, groupid, matrix_new)
817815
818816
CALL timeset(routineN, handle)
819817
820-
IF (PRESENT(groupid)) THEN
821-
group_id = groupid
822-
ELSE
823-
mp_env = dbcsr_distribution_mp(distribution)
824-
group_id = dbcsr_mp_group(mp_env)
825-
END IF
818+
mp_env = dbcsr_distribution_mp(distribution)
819+
group_id = dbcsr_mp_group(mp_env)
826820
827821
CALL mp_environ(group_list_size, worker_id, group_id)
828822
CALL mp_file_open(group_id, thefile, filepath, file_amode_rdonly)

0 commit comments

Comments
 (0)