Changeset 11760

Timestamp:

03/20/12 16:52:58 (13 years ago)

Author:

Eric.Larour

Message:

More robuts Solverx

Location:

issm/trunk-jpl/src/c/modules/Solverx

Files:

• Solverx.cpp (modified) (1 diff)
• SolverxGsl.cpp (modified) (3 diffs)

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

@@ -43 +43 @@
                 /*Create vector out of petsc vector: */
                 uf=new Vector(uf_vector);
+
+                /*Free ressources: */
+                VecFree(&uf_vector);
         #else
                 #ifdef _HAVE_GSL_
-                SolverxGsl(&uf->vector,Kff->matrix,pf->vector);
+                SeqVec* uf_vector=NULL;
+
+                SolverxGsl(&uf_vector,Kff->matrix,pf->vector);
+
+                /*Create vector out of SeqVec vector: */
+                uf=new Vector(uf_vector);
+
+                /*Free ressources: */
+                delete uf_vector;
+
                 #else
-                        _error_("not supported yet!");
+                        _error_("GSL support not compiled in!");
                 #endif
         #endif

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

@@ -24 +24 @@
         SeqVec*        uf               = NULL;
 
-        /*We are going to do an in place LU decomp, so we need to save the matrix with its original structure: */
-        KffCopy=Kff->Duplicate();
-
+        
         /*GSL Matrices and vectors: */
         gsl_matrix_view m;
@@ -33 +31 @@
         gsl_permutation* p=NULL;
         
+        /*We are going to do an in place LU decomp, so we need to save the matrix with its original structure: */
+        KffCopy=Kff->Duplicate();
+
+
         /*Intermediary: */
         int M,N,N2,s;
@@ -61 +63 @@
         gsl_permutation_free (p);
         gsl_vector_free (x);
+
         delete KffCopy;
+
 
         /*Assign output pointers:*/