diff --git a/include/Helpers.hpp b/include/Helpers.hpp index 958b9ed..06ea441 100644 --- a/include/Helpers.hpp +++ b/include/Helpers.hpp @@ -37,6 +37,7 @@ void showMatrix(T *matrix, unsigned int M, string name) { cout << " ]," << endl; } cout << "]" << endl; + cout << endl; } template @@ -51,20 +52,7 @@ T *transpose(T *A, unsigned int M) { } template -T *matMul(T *A, T *B, unsigned int M) { - T *C = new T[M*M] {0}; - for (unsigned int i = 0; i < M; i++) { - for (unsigned int j = 0; j < M; j++) { - for (unsigned int k = 0; k < M; k++) { - C[i*M+j] += A[i*M+k] * B[k*M+j]; - } - } - } - return C; -} - -template -void matMul2(T *A, T *B, T *C, unsigned int M) { +void matMul(T *A, T *B, T *C, unsigned int M) { memset(C, 0, M*M*sizeof(T)); for (unsigned int i = 0; i < M; i++) { for (unsigned int j = 0; j < M; j++) { diff --git a/src/SM_MaponiA3.cpp b/src/SM_MaponiA3.cpp index a989423..8aca638 100644 --- a/src/SM_MaponiA3.cpp +++ b/src/SM_MaponiA3.cpp @@ -132,7 +132,7 @@ void MaponiA3(double *Slater_inv, unsigned int Dim, * ylk[l][p[k]][i + 1] / beta; } } - matMul2(Al, last, next, Dim); + matMul(Al, last, next, Dim); double *tmp = next; next = last; last = tmp;