Changeset 11726

Timestamp:

03/19/12 20:07:14 (13 years ago)

Author:

Eric.Larour

Message:

Added GSL solver

Location:

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

Files:

• Solverx.cpp (modified) (1 diff)
• Solverx.h (modified) (1 diff)
• SolverxGsl.cpp (added)

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

@@ -27 +27 @@
 
         #ifdef _HAVE_PETSC_
-        Vec uf0_vector = NULL;
-        Vec df_vector  = NULL;
-        if(uf0) uf0_vector = uf0->vector;
-        if(df)  df_vector  = df->vector;
+                Vec uf0_vector = NULL;
+                Vec df_vector  = NULL;
+                if(uf0) uf0_vector = uf0->vector;
+                if(df)  df_vector  = df->vector;
 
-        /*In serial mode, the Petsc Options database has not been initialized properly: */
-        #ifdef _SERIAL_
-        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
-        PetscOptionsFromAnalysis(parameters,analysis_type);
-        #endif
+                /*In serial mode, the Petsc Options database has not been initialized properly: */
+                #ifdef _SERIAL_
+                parameters->FindParam(&analysis_type,AnalysisTypeEnum);
+                PetscOptionsFromAnalysis(parameters,analysis_type);
+                #endif
 
-        SolverxPetsc(&uf->vector,Kff->matrix,pf->vector,uf0_vector,df_vector,parameters);
-        if(uf->vector == NULL){
-                uf->M = 0;
-        }
-        else{
-                VecGetSize(uf->vector,&uf->M);
-        }
+                SolverxPetsc(&uf->vector,Kff->matrix,pf->vector,uf0_vector,df_vector,parameters);
+                if(uf->vector == NULL){
+                        uf->M = 0;
+                }
+                else{
+                        VecGetSize(uf->vector,&uf->M);
+                }
         #else
-        _error_("not supported yet!");
+                #ifdef _HAVE_GSL_
+                SolverxGsl(&uf->vector,Kff->matrix,pf->vector);
+                #else
+                        _error_("not supported yet!");
+                #endif
         #endif
 

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

@@ -22 +22 @@
 #endif
 
+#ifdef _HAVE_GSL_
+void    SolverxGsl(SeqVec** puf,SeqMat* Kff, SeqVec* pf);
+#endif
+
 #endif  /* _SOLVERX_H */