Changeset 23910

Timestamp:

05/07/19 01:06:11 (6 years ago)

Author:

wester

Message:

CHG: Adjusted stokesoptions for appropriate use in combination with SchurCG

Location:

issm/trunk-jpl/src/m/solvers

Files:

• stokesoptions.m (modified) (1 diff)
• stokesoptions.py (modified) (1 diff)

issm/trunk-jpl/src/m/solvers/stokesoptions.m

@@ -11 +11 @@
 stokes.toolkit='petsc';
 stokes.mat_type=getfieldvalue(options,'mat_type','mpiaij');
-stokes.ksp_max_it=getfieldvalue(options,'ksp_max_it',1000);
-stokes.ksp_type=getfieldvalue(options,'ksp_type','gmres');
-stokes.pc_type=getfieldvalue(options,'pc_type','fieldsplit');
-stokes.pc_field_split_type=getfieldvalue(options,'pc_field_split_type','schur');
-stokes.fieldsplit_0_pc_type=getfieldvalue(options,'fieldsplit_0_pc_type','hypre');
-stokes.fieldsplit_0_ksp_type=getfieldvalue(options,'fieldsplit_0_ksp_type','gmres');
-stokes.fieldsplit_0_pc_hypre_type=getfieldvalue(options,'fieldsplit_0_pc_hypre_type','boomerang');
-stokes.fieldsplit_1_pc_type=getfieldvalue(options,'fieldsplit_1_pc_type','jacobi');
-stokes.fieldsplit_1_ksp_type=getfieldvalue(options,'fieldsplit_1_ksp_type','preonly');
 stokes.issm_option_solver=getfieldvalue(options,'issm_option_solver','stokes');
+stokes.ksp_type = 'cr';
+stokes.pc_type = 'bjacobi';
+stokes.tol = 0.6;
+stokes.elltol = 5e-5;
+stokes.schur_pc = 1;
+stokes.max_iter = 10000;

issm/trunk-jpl/src/m/solvers/stokesoptions.py

@@ -18 +18 @@
                 raise RuntimeError('stokesoptions error message: multi-physics options not supported in Petsc 2')
         if PETSC_VERSION==3.:
-                options=[['toolkit','petsc'],['mat_type','mpiaij'],['ksp_max_it',1000],['ksp_type','gmres'],['pc_type','fieldsplit'],['pc_field_split_type','schur'],\
-        ['fieldsplit_0_pc_type','hypre'],['fieldsplit_0_ksp_type','gmres'],['fieldsplit_0_pc_hypre_type','boomerang'],\
-        ['fieldsplit_1_pc_type','jacobi'],['fieldsplit_1_ksp_type','preonly'],['issm_option_solver','stokes']]
+                options=[['toolkit','petsc'],['mat_type','mpiaij'],['ksp_type','cr'],['pc_type','bjacobi'],['tol',0.6],\
+        ['elltol',5e-5],['schur_pc',1],\
+        ['max_iter',10000],['issm_option_solver','stokes']]
 
         #now, go through our arguments, and write over default options.