Changeset 17343

Timestamp:

02/22/14 13:04:26 (11 years ago)

Author:

Mathieu Morlighem

Message:

DEL: removed TripleSolve, not needed anymore

Location:

issm/trunk-jpl/src/c/toolkits/gsl

Files:

• DenseGslSolve.cpp (modified) (1 diff)
• gslincludes.h (modified) (1 diff)

issm/trunk-jpl/src/c/toolkits/gsl/DenseGslSolve.cpp

@@ -44 +44 @@
         /*allocate output pointers: */
         *px=x;
-}
-/*}}}*/
-void DenseGslTripleSolve(IssmPDouble** pX1,IssmPDouble** pX2,IssmPDouble** pX3,IssmPDouble* A,IssmPDouble* B1,IssmPDouble* B2,IssmPDouble* B3,int n){/*{{{*/
-
-        /*Allocate output: */
-        IssmPDouble *X1 = xNew<IssmPDouble>(n);
-        IssmPDouble *X2 = xNew<IssmPDouble>(n);
-        IssmPDouble *X3 = xNew<IssmPDouble>(n);
-
-#ifdef _HAVE_GSL_
-        /*GSL Matrices and vectors: */
-        int s;
-
-        double* Acopy = xNew<double>(n*n);
-        xMemCpy(Acopy,A,n*n);
-
-        /*Initialize gsl matrices and vectors: */
-        gsl_matrix_view a = gsl_matrix_view_array(Acopy,n,n);
-        gsl_vector_view b1= gsl_vector_view_array(B1,n);
-        gsl_vector_view b2= gsl_vector_view_array(B2,n);
-        gsl_vector_view b3= gsl_vector_view_array(B3,n);
-        gsl_vector_view x1= gsl_vector_view_array(X1,n);
-        gsl_vector_view x2= gsl_vector_view_array(X2,n);
-        gsl_vector_view x3= gsl_vector_view_array(X3,n);
-
-        /*Run LU and solve: */
-        gsl_permutation* p = gsl_permutation_alloc (n);
-        gsl_linalg_LU_decomp(&a.matrix,p,&s);
-
-        gsl_linalg_LU_solve(&a.matrix,p,&b1.vector,&x1.vector);
-        gsl_linalg_LU_solve(&a.matrix,p,&b2.vector,&x2.vector);
-        gsl_linalg_LU_solve(&a.matrix,p,&b3.vector,&x3.vector);
-
-        /*Clean up and assign output pointer*/
-        xDelete(Acopy);
-        gsl_permutation_free(p);
-#endif
-
-        /*allocate output pointers: */
-        *pX1=X1;
-        *pX2=X2;
-        *pX3=X3;
 }
 /*}}}*/

issm/trunk-jpl/src/c/toolkits/gsl/gslincludes.h

@@ -22 +22 @@
 void DenseGslSolve(IssmPDouble** pX,IssmPDouble* A,IssmPDouble* B, int n);
 void DenseGslSolve(IssmDouble** pX,IssmDouble* Kff,int Kff_M,int Kff_N,IssmDouble* pf,int pf_M,Parameters* parameters);
-void DenseGslTripleSolve(IssmPDouble** pX1,IssmPDouble** pX2,IssmPDouble** pX3,IssmPDouble* A,IssmPDouble* B1,IssmPDouble* B2,IssmPDouble* B3,int n);
 
 void SolverxSeq(IssmPDouble *X, IssmPDouble *A, IssmPDouble *B,int n);