Changeset 6858

Timestamp:

12/29/10 18:46:37 (14 years ago)

Author:

Eric.Larour

Message:

Starting migration towards petsc solver options of version 3. Almost done with mumps.

Location:

issm/trunk/src

Files:

• c/modules/Solverx/Solverx.cpp (modified) (2 diffs)
• m/model/solvers/mumpsoptions.m (modified) (1 diff)

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

@@ -32 +32 @@
 
         #if _PETSC_VERSION_ == 3 
-        const MatType type;
+        char ksp_type[50];
+        PetscTruth flg;
         #endif
 
@@ -47 +48 @@
         /*Now, check that we are not getting an initial guess to the solver, if we are running a direct solver: */
         #if _PETSC_VERSION_ == 3 
-        MatGetType(Kff,&type);
-        if (strcmp(type,"mpidense")==0)uf0=NULL;
+        PetscOptionsGetString(PETSC_NULL,"-ksp_type",ksp_type,49,&flg);
+        if (strcmp(ksp_type,"preonly")==0)uf0=NULL;
         #endif
         

issm/trunk/src/m/model/solvers/mumpsoptions.m

@@ -15 +15 @@
 end
 if PETSC_VERSION==3,
-options={{'mat_type','mpidense'},{'ksp_type','preonly'},{'pc_type','lu'},{'mat_mumps_icntl_14',120},{'pc_factor_shift_positive_definite','true'}};
+        options={{'mat_type','mpiaij'},{'ksp_type','preonly'},{'pc_type','lu'},{'pc_factor_mat_solver_package','mumps'},{'mat_mumps_icntl_14',120},{'pc_factor_shift_positive_definite','true'}};
+
 end