Changeset 11695 for issm/trunk-jpl/src/c/modules/Solverx/Solverx.cpp

Timestamp:

03/13/12 19:59:59 (13 years ago)

Author:

Eric.Larour

Message:

Completed separation of Petsc from ISSM. Matrix and Vector
are now the vehicles for Mat and Vec objects when running with
Petsc, or double* when running with a custom made type of matrix (still
to be finished).

File:

• issm/trunk-jpl/src/c/modules/Solverx/Solverx.cpp (modified) (2 diffs)

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

@@ -20 +20 @@
         uf=new Vector();
 
+        /*Intermediary: */
+        int analysis_type;
+
         #ifdef _HAVE_PETSC_
         Vec uf0_vector = NULL;
@@ -26 +29 @@
         if(df)  df_vector = df->vector;
 
-        SolverxPetsc(&uf->vector,Kff->matrix,pf->vector,uf0_vector,df_vector,parameters);
+        /*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);
         VecGetSize(uf->vector,&uf->M);
         #else