Changeset 13515

Timestamp:

10/03/12 07:50:46 (12 years ago)

Author:

utke

Message:

CHG consistent naming

File:

• issm/trunk-jpl/src/c/modules/Solverx/SolverxSeq.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/modules/Solverx/SolverxSeq.cpp

@@ -169 +169 @@
         // the last m elements of dp_Z representing the adjoint of the right-hand side we want to compute:
         gsl_vector_view b_bar=gsl_vector_view_array(dp_Z+m*m,m);
-        gsl_permutation *p = gsl_permutation_alloc (m);
+        gsl_permutation *perm_p = gsl_permutation_alloc (m);
         int permSign;
-        gsl_linalg_LU_decomp (&aTransposed.matrix, p, &permSign);
-        gsl_linalg_LU_solve (&aTransposed.matrix, p, &x_bar.vector, &b_bar.vector);
+        gsl_linalg_LU_decomp (&aTransposed.matrix, perm_p, &permSign);
+        gsl_linalg_LU_solve (&aTransposed.matrix, perm_p, &x_bar.vector, &b_bar.vector);
         // now do the adjoint of the matrix
         for (int i=0; i<m; ++i) for (int j=0; j<m; ++j) dp_Z[i*m+j]-=dp_Z[m*m+i]*dp_y[j];
-        gsl_permutation_free(p);
+        gsl_permutation_free(perm_p);
         xDelete(transposed);
         return 0;