matrix edits for the 2D flow simulation

David Mayerich
1 parent ef1f6218
Showing 3 changed files with 11 additions and 10 deletions Show diff stats
stim/biomodels/flow.h
stim/math/matrix.h
stim/math/matrix_sq.h
@@ -118,7 +118,8 @@ namespace stim {
 			Q.resize(n_e);
 		}
  
-		void inversion(T** A, int order, T** C) {
+		/// Calculate the inverse of A and store the result in C
+		void inversion(T** A, int order, T* C) {
  
 #ifdef __CUDACC__
  
@@ -127,7 +128,7 @@ namespace stim {
 			for (unsigned i = 0; i < order; i++)
 				for (unsigned j = 0; j < order; j++)
 					Aflat[i * order + j] = A[i][j];
-			T* Cflat = (T*)malloc(order * order * sizeof(T));
+			//T* Cflat = C;// (T*)malloc(order * order * sizeof(T));
  
 			// create device pointer
 			T* d_Aflat;		// flat original matrix
@@ -175,14 +176,14 @@ namespace stim {
 			HANDLE_ERROR(cudaMemcpy(&d_Cflat, d_C, sizeof(T*), cudaMemcpyDeviceToHost));
  
 			// copy inverse matrix from device to host
-			HANDLE_ERROR(cudaMemcpy(Cflat, d_Cflat, order * order * sizeof(T), cudaMemcpyDeviceToHost));
+			HANDLE_ERROR(cudaMemcpy(C, d_Cflat, order * order * sizeof(T), cudaMemcpyDeviceToHost));
  
-			for(unsigned i = 0; i < order; i++)
-				memcpy(C[i], &Cflat[i*order], order * sizeof(T*));
+			//for(unsigned i = 0; i < order; i++)
+			//	memcpy(C[i], &Cflat[i*order], order * sizeof(T*));
  
 			// clear up
 			free(Aflat);
-			free(Cflat);
+			//free(Cflat);
 			HANDLE_ERROR(cudaFree(d_Aflat));
 			HANDLE_ERROR(cudaFree(d_Cflat));
 			HANDLE_ERROR(cudaFree(d_A));
-#ifndef RTS_MATRIX_H
-#define RTS_MATRIX_H
+#ifndef STIM_MATRIX_H
+#define STIM_MATRIX_H
  
 //#include "rts/vector.h"
 #include <string.h>
-#ifndef RTS_MATRIX_H
-#define RTS_MATRIX_H
+#ifndef STIM_MATRIX_SQ_H
+#define STIM_MATRIX_SQ_H
  
 //#include "rts/vector.h"
 #include <string.h>