Index: /issm/trunk-jpl/src/m/solvers/bcgsasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/bcgsasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/bcgsasmoptions.m (revision 20574) @@ -5,6 +5,4 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; - - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bcgs'); Index: /issm/trunk-jpl/src/m/solvers/bcgsbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/bcgsbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/bcgsbjacobioptions.m (revision 20574) @@ -5,6 +5,4 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; - - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bcgs'); Index: /issm/trunk-jpl/src/m/solvers/bcgsgamgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/bcgsgamgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/bcgsgamgoptions.m (revision 20574) @@ -5,6 +5,4 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; - - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bcgs'); Index: /issm/trunk-jpl/src/m/solvers/bcgsgasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/bcgsgasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/bcgsgasmoptions.m (revision 20574) @@ -5,6 +5,4 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; - - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bcgs'); Index: /issm/trunk-jpl/src/m/solvers/bcgshypreoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/bcgshypreoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/bcgshypreoptions.m (revision 20574) @@ -5,6 +5,4 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; - - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bcgs'); Index: /issm/trunk-jpl/src/m/solvers/bcgsjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/bcgsjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/bcgsjacobioptions.m (revision 20574) @@ -5,6 +5,4 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; - - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bcgs'); Index: /issm/trunk-jpl/src/m/solvers/bcgslasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/bcgslasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/bcgslasmoptions.m (revision 20574) @@ -5,6 +5,4 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; - - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bcgsl'); Index: /issm/trunk-jpl/src/m/solvers/bcgslbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/bcgslbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/bcgslbjacobioptions.m (revision 20574) @@ -5,6 +5,4 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; - - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bcgsl'); Index: /issm/trunk-jpl/src/m/solvers/bcgslgamgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/bcgslgamgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/bcgslgamgoptions.m (revision 20574) @@ -5,6 +5,4 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; - - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bcgsl'); Index: /issm/trunk-jpl/src/m/solvers/bcgslgasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/bcgslgasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/bcgslgasmoptions.m (revision 20574) @@ -5,6 +5,4 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; - - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bcgsl'); Index: /issm/trunk-jpl/src/m/solvers/bcgslhypreoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/bcgslhypreoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/bcgslhypreoptions.m (revision 20574) @@ -5,10 +5,5 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; - - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bcgsl'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); -end +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bcgsl'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); Index: /issm/trunk-jpl/src/m/solvers/bcgsljacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/bcgsljacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/bcgsljacobioptions.m (revision 20574) @@ -5,10 +5,5 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; - - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bcgsl'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); -end +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bcgsl'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); Index: /issm/trunk-jpl/src/m/solvers/bcgslmgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/bcgslmgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/bcgslmgoptions.m (revision 20574) @@ -5,10 +5,5 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; - - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bcgsl'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); -end +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bcgsl'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); Index: /issm/trunk-jpl/src/m/solvers/bcgslpbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/bcgslpbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/bcgslpbjacobioptions.m (revision 20574) @@ -5,10 +5,5 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; - - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bcgsl'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); -end +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bcgsl'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); Index: /issm/trunk-jpl/src/m/solvers/bcgslsoroptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/bcgslsoroptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/bcgslsoroptions.m (revision 20574) @@ -5,10 +5,5 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; - - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bcgsl'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); -end +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bcgsl'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); Index: /issm/trunk-jpl/src/m/solvers/bcgsmgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/bcgsmgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/bcgsmgoptions.m (revision 20574) @@ -5,10 +5,5 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; - - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bcgs'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); -end +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bcgs'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); Index: /issm/trunk-jpl/src/m/solvers/bcgspbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/bcgspbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/bcgspbjacobioptions.m (revision 20574) @@ -5,10 +5,5 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; - - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bcgs'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); -end +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bcgs'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); Index: /issm/trunk-jpl/src/m/solvers/bcgssoroptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/bcgssoroptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/bcgssoroptions.m (revision 20574) @@ -5,10 +5,5 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; - - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bcgs'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); -end +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bcgs'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); Index: /issm/trunk-jpl/src/m/solvers/bicgasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/bicgasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/bicgasmoptions.m (revision 20574) @@ -5,10 +5,5 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; - - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bicg'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); -end +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bicg'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); Index: /issm/trunk-jpl/src/m/solvers/bicgbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/bicgbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/bicgbjacobioptions.m (revision 20574) @@ -5,10 +5,5 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; - - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bicg'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); -end +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bicg'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); Index: /issm/trunk-jpl/src/m/solvers/bicggamgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/bicggamgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/bicggamgoptions.m (revision 20574) @@ -5,10 +5,5 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; - - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bicg'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); -end +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bicg'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); Index: /issm/trunk-jpl/src/m/solvers/bicggasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/bicggasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/bicggasmoptions.m (revision 20574) @@ -5,10 +5,5 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; - - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bicg'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); -end +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bicg'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); Index: /issm/trunk-jpl/src/m/solvers/bicghypreoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/bicghypreoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/bicghypreoptions.m (revision 20574) @@ -5,10 +5,5 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; - - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bicg'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); -end +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bicg'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); Index: /issm/trunk-jpl/src/m/solvers/bicgjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/bicgjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/bicgjacobioptions.m (revision 20574) @@ -5,10 +5,5 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; - - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bicg'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); -end +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bicg'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); Index: /issm/trunk-jpl/src/m/solvers/bicgmgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/bicgmgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/bicgmgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bicg'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bicg'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); -end Index: /issm/trunk-jpl/src/m/solvers/bicgpbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/bicgpbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/bicgpbjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bicg'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bicg'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/bicgsoroptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/bicgsoroptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/bicgsoroptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bicg'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','bicg'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); -end Index: /issm/trunk-jpl/src/m/solvers/cgasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/cgasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/cgasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cg'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cg'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); -end Index: /issm/trunk-jpl/src/m/solvers/cgbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/cgbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/cgbjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cg'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cg'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/cggamgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/cggamgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/cggamgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cg'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cg'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); -end Index: /issm/trunk-jpl/src/m/solvers/cggasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/cggasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/cggasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cg'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cg'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); -end Index: /issm/trunk-jpl/src/m/solvers/cghypreoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/cghypreoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/cghypreoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cg'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cg'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); -end Index: /issm/trunk-jpl/src/m/solvers/cgjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/cgjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/cgjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cg'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cg'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/cgmgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/cgmgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/cgmgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cg'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cg'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); -end Index: /issm/trunk-jpl/src/m/solvers/cgneasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/cgneasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/cgneasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgne'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgne'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); -end Index: /issm/trunk-jpl/src/m/solvers/cgnebjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/cgnebjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/cgnebjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgne'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgne'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/cgnegamgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/cgnegamgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/cgnegamgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgne'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgne'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); -end Index: /issm/trunk-jpl/src/m/solvers/cgnegasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/cgnegasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/cgnegasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgne'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgne'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); -end Index: /issm/trunk-jpl/src/m/solvers/cgnehypreoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/cgnehypreoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/cgnehypreoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgne'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgne'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); -end Index: /issm/trunk-jpl/src/m/solvers/cgnejacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/cgnejacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/cgnejacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgne'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgne'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/cgnemgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/cgnemgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/cgnemgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgne'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgne'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); -end Index: /issm/trunk-jpl/src/m/solvers/cgnepbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/cgnepbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/cgnepbjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgne'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgne'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/cgnesoroptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/cgnesoroptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/cgnesoroptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgne'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgne'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); -end Index: /issm/trunk-jpl/src/m/solvers/cgpbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/cgpbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/cgpbjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cg'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cg'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/cgsasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/cgsasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/cgsasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgs'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgs'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); -end Index: /issm/trunk-jpl/src/m/solvers/cgsbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/cgsbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/cgsbjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgs'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgs'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/cgsgamgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/cgsgamgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/cgsgamgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgs'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgs'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); -end Index: /issm/trunk-jpl/src/m/solvers/cgsgasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/cgsgasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/cgsgasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgs'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgs'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); -end Index: /issm/trunk-jpl/src/m/solvers/cgshypreoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/cgshypreoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/cgshypreoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgs'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgs'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); -end Index: /issm/trunk-jpl/src/m/solvers/cgsjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/cgsjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/cgsjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgs'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgs'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/cgsmgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/cgsmgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/cgsmgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgs'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgs'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); -end Index: /issm/trunk-jpl/src/m/solvers/cgsoroptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/cgsoroptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/cgsoroptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cg'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cg'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); -end Index: /issm/trunk-jpl/src/m/solvers/cgspbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/cgspbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/cgspbjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgs'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgs'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/cgssoroptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/cgssoroptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/cgssoroptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgs'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cgs'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); -end Index: /issm/trunk-jpl/src/m/solvers/conditionnumberoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/conditionnumberoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/conditionnumberoptions.m (revision 20574) @@ -8,15 +8,10 @@ options=pairoptions(varargin{:}); cn=struct(); -cn..toolkit='petsc'; - -%default options -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - cn.mat_type=getfieldvalue(options,'mat_type','mpiaij'); - cn.ksp_type=getfieldvalue(options,'ksp_type','gmres'); - cn.pc_type=getfieldvalue(options,'pc_type','none'); - cn.ksp_monitor_singular_value=getfieldvalue(options,'ksp_monitor_singular_value',''); - cn.ksp_gmres_restart=getfieldvalue(options,'ksp_gmres_restart',1000); - cn.info=getfieldvalue(options,'info',''); - cn.log_summary=getfieldvalue(options,'log_summary',''); -end +cn.toolkit='petsc'; +cn.mat_type=getfieldvalue(options,'mat_type','mpiaij'); +cn.ksp_type=getfieldvalue(options,'ksp_type','gmres'); +cn.pc_type=getfieldvalue(options,'pc_type','none'); +cn.ksp_monitor_singular_value=getfieldvalue(options,'ksp_monitor_singular_value',''); +cn.ksp_gmres_restart=getfieldvalue(options,'ksp_gmres_restart',1000); +cn.info=getfieldvalue(options,'info',''); +cn.log_summary=getfieldvalue(options,'log_summary',''); Index: /issm/trunk-jpl/src/m/solvers/crasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/crasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/crasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); -end Index: /issm/trunk-jpl/src/m/solvers/crbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/crbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/crbjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/crgamgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/crgamgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/crgamgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); -end Index: /issm/trunk-jpl/src/m/solvers/crgasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/crgasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/crgasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); -end Index: /issm/trunk-jpl/src/m/solvers/crhypreoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/crhypreoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/crhypreoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); -end Index: /issm/trunk-jpl/src/m/solvers/crjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/crjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/crjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/crmgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/crmgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/crmgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); -end Index: /issm/trunk-jpl/src/m/solvers/crpbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/crpbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/crpbjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/crsoroptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/crsoroptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/crsoroptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','cr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); -end Index: /issm/trunk-jpl/src/m/solvers/dgmresasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/dgmresasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/dgmresasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','dgmres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','dgmres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); -end Index: /issm/trunk-jpl/src/m/solvers/dgmresbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/dgmresbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/dgmresbjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','dgmres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','dgmres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/dgmresgamgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/dgmresgamgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/dgmresgamgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','dgmres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','dgmres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); -end Index: /issm/trunk-jpl/src/m/solvers/dgmresgasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/dgmresgasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/dgmresgasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','dgmres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','dgmres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); -end Index: /issm/trunk-jpl/src/m/solvers/dgmreshypreoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/dgmreshypreoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/dgmreshypreoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','dgmres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','dgmres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); -end Index: /issm/trunk-jpl/src/m/solvers/dgmresjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/dgmresjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/dgmresjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','dgmres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','dgmres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/dgmresmgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/dgmresmgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/dgmresmgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','dgmres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','dgmres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); -end Index: /issm/trunk-jpl/src/m/solvers/dgmrespbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/dgmrespbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/dgmrespbjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','dgmres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','dgmres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/dgmressoroptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/dgmressoroptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/dgmressoroptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','dgmres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','dgmres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); -end Index: /issm/trunk-jpl/src/m/solvers/fgmresasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/fgmresasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/fgmresasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','fgmres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','fgmres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); -end Index: /issm/trunk-jpl/src/m/solvers/fgmresbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/fgmresbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/fgmresbjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','fgmres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','fgmres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/fgmresgamgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/fgmresgamgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/fgmresgamgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','fgmres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','fgmres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); -end Index: /issm/trunk-jpl/src/m/solvers/fgmresgasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/fgmresgasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/fgmresgasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','fgmres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','fgmres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); -end Index: /issm/trunk-jpl/src/m/solvers/fgmreshypreoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/fgmreshypreoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/fgmreshypreoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','fgmres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','fgmres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); -end Index: /issm/trunk-jpl/src/m/solvers/fgmresjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/fgmresjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/fgmresjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','fgmres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','fgmres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/fgmresmgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/fgmresmgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/fgmresmgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','fgmres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','fgmres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); -end Index: /issm/trunk-jpl/src/m/solvers/fgmrespbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/fgmrespbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/fgmrespbjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','fgmres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','fgmres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/fgmressoroptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/fgmressoroptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/fgmressoroptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','fgmres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','fgmres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); -end Index: /issm/trunk-jpl/src/m/solvers/gcrasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/gcrasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/gcrasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gcr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gcr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); -end Index: /issm/trunk-jpl/src/m/solvers/gcrbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/gcrbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/gcrbjacobioptions.m (revision 20574) @@ -5,10 +5,5 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; - - -PETSC_VERSION=IssmConfig('_PETSC_MAJOR_'); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gcr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); -end +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gcr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); Index: /issm/trunk-jpl/src/m/solvers/gcrgamgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/gcrgamgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/gcrgamgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gcr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gcr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); -end Index: /issm/trunk-jpl/src/m/solvers/gcrgasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/gcrgasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/gcrgasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gcr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gcr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); -end Index: /issm/trunk-jpl/src/m/solvers/gcrhypreoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/gcrhypreoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/gcrhypreoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gcr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gcr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); -end Index: /issm/trunk-jpl/src/m/solvers/gcrjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/gcrjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/gcrjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gcr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gcr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/gcrmgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/gcrmgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/gcrmgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gcr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gcr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); -end Index: /issm/trunk-jpl/src/m/solvers/gcrpbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/gcrpbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/gcrpbjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gcr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gcr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/gcrsoroptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/gcrsoroptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/gcrsoroptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gcr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gcr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); -end Index: /issm/trunk-jpl/src/m/solvers/gltrasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/gltrasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/gltrasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gltr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gltr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); -end Index: /issm/trunk-jpl/src/m/solvers/gltrbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/gltrbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/gltrbjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gltr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gltr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/gltrgamgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/gltrgamgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/gltrgamgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gltr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gltr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); -end Index: /issm/trunk-jpl/src/m/solvers/gltrgasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/gltrgasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/gltrgasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gltr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gltr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); -end Index: /issm/trunk-jpl/src/m/solvers/gltrhypreoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/gltrhypreoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/gltrhypreoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gltr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gltr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); -end Index: /issm/trunk-jpl/src/m/solvers/gltrjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/gltrjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/gltrjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gltr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gltr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/gltrmgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/gltrmgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/gltrmgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gltr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gltr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); -end Index: /issm/trunk-jpl/src/m/solvers/gltrpbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/gltrpbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/gltrpbjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gltr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gltr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/gltrsoroptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/gltrsoroptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/gltrsoroptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gltr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gltr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); -end Index: /issm/trunk-jpl/src/m/solvers/gmresasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/gmresasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/gmresasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gmres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gmres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); -end Index: /issm/trunk-jpl/src/m/solvers/gmresbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/gmresbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/gmresbjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gmres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gmres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/gmresgamgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/gmresgamgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/gmresgamgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gmres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gmres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); -end Index: /issm/trunk-jpl/src/m/solvers/gmresgasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/gmresgasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/gmresgasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gmres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gmres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); -end Index: /issm/trunk-jpl/src/m/solvers/gmreshypreoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/gmreshypreoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/gmreshypreoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gmres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gmres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); -end Index: /issm/trunk-jpl/src/m/solvers/gmresjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/gmresjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/gmresjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gmres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); - -PETSC_VERSION=IssmConfig('_PETSC_MAJOR_'); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gmres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/gmresmgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/gmresmgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/gmresmgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gmres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gmres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); -end Index: /issm/trunk-jpl/src/m/solvers/gmrespbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/gmrespbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/gmrespbjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gmres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gmres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/gmressoroptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/gmressoroptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/gmressoroptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gmres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','gmres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); -end Index: /issm/trunk-jpl/src/m/solvers/ibcgsasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/ibcgsasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/ibcgsasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','ibcgs'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','ibcgs'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); -end Index: /issm/trunk-jpl/src/m/solvers/ibcgsbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/ibcgsbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/ibcgsbjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','ibcgs'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','ibcgs'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/ibcgsgamgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/ibcgsgamgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/ibcgsgamgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','ibcgs'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','ibcgs'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); -end Index: /issm/trunk-jpl/src/m/solvers/ibcgsgasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/ibcgsgasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/ibcgsgasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','ibcgs'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','ibcgs'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); -end Index: /issm/trunk-jpl/src/m/solvers/ibcgshypreoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/ibcgshypreoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/ibcgshypreoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','ibcgs'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','ibcgs'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); -end Index: /issm/trunk-jpl/src/m/solvers/ibcgsjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/ibcgsjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/ibcgsjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','ibcgs'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','ibcgs'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/ibcgsmgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/ibcgsmgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/ibcgsmgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','ibcgs'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','ibcgs'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); -end Index: /issm/trunk-jpl/src/m/solvers/ibcgspbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/ibcgspbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/ibcgspbjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','ibcgs'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','ibcgs'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/ibcgssoroptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/ibcgssoroptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/ibcgssoroptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','ibcgs'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','ibcgs'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); -end Index: /issm/trunk-jpl/src/m/solvers/iluasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/iluasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/iluasmoptions.m (revision 20574) @@ -8,6 +8,4 @@ options=pairoptions(varargin{:}); iluasm=struct(); - -%default iluasm options iluasm.toolkit='petsc'; iluasm.mat_type=getfieldvalue(options,'mat_type','aij'); Index: /issm/trunk-jpl/src/m/solvers/lcdasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/lcdasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/lcdasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lcd'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lcd'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); -end Index: /issm/trunk-jpl/src/m/solvers/lcdbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/lcdbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/lcdbjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lcd'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lcd'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/lcdgamgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/lcdgamgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/lcdgamgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lcd'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lcd'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); -end Index: /issm/trunk-jpl/src/m/solvers/lcdgasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/lcdgasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/lcdgasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lcd'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lcd'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); -end Index: /issm/trunk-jpl/src/m/solvers/lcdhypreoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/lcdhypreoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/lcdhypreoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lcd'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lcd'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); -end Index: /issm/trunk-jpl/src/m/solvers/lcdjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/lcdjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/lcdjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lcd'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lcd'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/lcdmgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/lcdmgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/lcdmgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lcd'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lcd'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); -end Index: /issm/trunk-jpl/src/m/solvers/lcdpbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/lcdpbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/lcdpbjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lcd'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lcd'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/lcdsoroptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/lcdsoroptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/lcdsoroptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lcd'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lcd'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); -end Index: /issm/trunk-jpl/src/m/solvers/lsqrasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/lsqrasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/lsqrasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lsqr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lsqr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); -end Index: /issm/trunk-jpl/src/m/solvers/lsqrbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/lsqrbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/lsqrbjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lsqr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lsqr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/lsqrgamgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/lsqrgamgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/lsqrgamgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lsqr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lsqr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); -end Index: /issm/trunk-jpl/src/m/solvers/lsqrgasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/lsqrgasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/lsqrgasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lsqr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lsqr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); -end Index: /issm/trunk-jpl/src/m/solvers/lsqrhypreoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/lsqrhypreoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/lsqrhypreoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lsqr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lsqr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); -end Index: /issm/trunk-jpl/src/m/solvers/lsqrjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/lsqrjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/lsqrjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lsqr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lsqr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/lsqrmgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/lsqrmgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/lsqrmgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lsqr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lsqr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); -end Index: /issm/trunk-jpl/src/m/solvers/lsqrpbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/lsqrpbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/lsqrpbjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lsqr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lsqr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/lsqrsoroptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/lsqrsoroptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/lsqrsoroptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lsqr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','lsqr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); -end Index: /issm/trunk-jpl/src/m/solvers/minresasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/minresasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/minresasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','minres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','minres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); -end Index: /issm/trunk-jpl/src/m/solvers/minresbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/minresbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/minresbjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','minres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','minres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/minresgamgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/minresgamgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/minresgamgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','minres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','minres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); -end Index: /issm/trunk-jpl/src/m/solvers/minresgasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/minresgasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/minresgasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','minres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','minres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); -end Index: /issm/trunk-jpl/src/m/solvers/minreshypreoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/minreshypreoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/minreshypreoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','minres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','minres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); -end Index: /issm/trunk-jpl/src/m/solvers/minresjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/minresjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/minresjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','minres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','minres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/minresmgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/minresmgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/minresmgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','minres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','minres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); -end Index: /issm/trunk-jpl/src/m/solvers/minrespbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/minrespbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/minrespbjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','minres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','minres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/minressoroptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/minressoroptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/minressoroptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','minres'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','minres'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); -end Index: /issm/trunk-jpl/src/m/solvers/mumpsoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/mumpsoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/mumpsoptions.m (revision 20574) @@ -19,4 +19,5 @@ mumps.pc_factor_shift_positive_definite=getfieldvalue(options,'pc_factor_shift_positive_definite','true'); end + if PETSC_VERSION==3., mumps.toolkit='petsc'; Index: /issm/trunk-jpl/src/m/solvers/richardsonasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/richardsonasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/richardsonasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','richardson'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','richardson'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); -end Index: /issm/trunk-jpl/src/m/solvers/richardsonbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/richardsonbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/richardsonbjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','richardson'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','richardson'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/richardsongamgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/richardsongamgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/richardsongamgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','richardson'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','richardson'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); -end Index: /issm/trunk-jpl/src/m/solvers/richardsongasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/richardsongasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/richardsongasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','richardson'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','richardson'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); -end Index: /issm/trunk-jpl/src/m/solvers/richardsonhypreoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/richardsonhypreoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/richardsonhypreoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','richardson'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','richardson'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); -end Index: /issm/trunk-jpl/src/m/solvers/richardsonjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/richardsonjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/richardsonjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','richardson'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','richardson'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/richardsonmgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/richardsonmgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/richardsonmgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','richardson'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','richardson'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); -end Index: /issm/trunk-jpl/src/m/solvers/richardsonpbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/richardsonpbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/richardsonpbjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','richardson'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','richardson'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/richardsonsoroptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/richardsonsoroptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/richardsonsoroptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','richardson'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','richardson'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); -end Index: /issm/trunk-jpl/src/m/solvers/stcgasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/stcgasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/stcgasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','stcg'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','stcg'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); -end Index: /issm/trunk-jpl/src/m/solvers/stcgbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/stcgbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/stcgbjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','stcg'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','stcg'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/stcggamgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/stcggamgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/stcggamgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','stcg'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','stcg'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); -end Index: /issm/trunk-jpl/src/m/solvers/stcggasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/stcggasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/stcggasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','stcg'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','stcg'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); -end Index: /issm/trunk-jpl/src/m/solvers/stcghypreoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/stcghypreoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/stcghypreoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','stcg'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','stcg'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); -end Index: /issm/trunk-jpl/src/m/solvers/stcgjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/stcgjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/stcgjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','stcg'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','stcg'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/stcgmgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/stcgmgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/stcgmgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','stcg'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','stcg'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); -end Index: /issm/trunk-jpl/src/m/solvers/stcgpbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/stcgpbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/stcgpbjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','stcg'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','stcg'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/stcgsoroptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/stcgsoroptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/stcgsoroptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','stcg'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','stcg'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); -end Index: /issm/trunk-jpl/src/m/solvers/stokesoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/stokesoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/stokesoptions.m (revision 20574) @@ -9,21 +9,14 @@ stokes=struct(); -%default stokes options -PETSC_VERSION=IssmConfig('_PETSC_MAJOR_')[0]; -if PETSC_VERSION==2., - error('stokesoptions error message: multi-physics options not supported in Petsc 2'); -end -if PETSC_VERSION==3., - 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'); -end +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'); Index: /issm/trunk-jpl/src/m/solvers/symmlqasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/symmlqasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/symmlqasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','symmlq'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','symmlq'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); -end Index: /issm/trunk-jpl/src/m/solvers/symmlqbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/symmlqbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/symmlqbjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','symmlq'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','symmlq'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/symmlqgamgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/symmlqgamgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/symmlqgamgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','symmlq'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','symmlq'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); -end Index: /issm/trunk-jpl/src/m/solvers/symmlqgasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/symmlqgasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/symmlqgasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','symmlq'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','symmlq'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); -end Index: /issm/trunk-jpl/src/m/solvers/symmlqhypreoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/symmlqhypreoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/symmlqhypreoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','symmlq'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','symmlq'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); -end Index: /issm/trunk-jpl/src/m/solvers/symmlqjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/symmlqjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/symmlqjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','symmlq'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','symmlq'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/symmlqmgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/symmlqmgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/symmlqmgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','symmlq'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','symmlq'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); -end Index: /issm/trunk-jpl/src/m/solvers/symmlqpbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/symmlqpbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/symmlqpbjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','symmlq'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','symmlq'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/symmlqsoroptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/symmlqsoroptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/symmlqsoroptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','symmlq'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','symmlq'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); -end Index: /issm/trunk-jpl/src/m/solvers/tfqmrasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/tfqmrasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/tfqmrasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','tfqmr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','tfqmr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'asm'); -end Index: /issm/trunk-jpl/src/m/solvers/tfqmrbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/tfqmrbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/tfqmrbjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','tfqmr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','tfqmr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'bjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/tfqmrgamgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/tfqmrgamgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/tfqmrgamgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','tfqmr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','tfqmr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gamg'); -end Index: /issm/trunk-jpl/src/m/solvers/tfqmrgasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/tfqmrgasmoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/tfqmrgasmoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','tfqmr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','tfqmr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'gasm'); -end Index: /issm/trunk-jpl/src/m/solvers/tfqmrhypreoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/tfqmrhypreoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/tfqmrhypreoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','tfqmr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','tfqmr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'hypre'); -end Index: /issm/trunk-jpl/src/m/solvers/tfqmrjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/tfqmrjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/tfqmrjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','tfqmr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','tfqmr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'jacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/tfqmrmgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/tfqmrmgoptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/tfqmrmgoptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','tfqmr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','tfqmr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'mg'); -end Index: /issm/trunk-jpl/src/m/solvers/tfqmrpbjacobioptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/tfqmrpbjacobioptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/tfqmrpbjacobioptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','tfqmr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','tfqmr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'pbjacobi'); -end Index: /issm/trunk-jpl/src/m/solvers/tfqmrsoroptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/tfqmrsoroptions.m (revision 20573) +++ /issm/trunk-jpl/src/m/solvers/tfqmrsoroptions.m (revision 20574) @@ -5,10 +5,6 @@ solverOptions=struct(); solverOptions.toolkit='petsc'; +solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); +solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','tfqmr'); +solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); - -PETSC_VERSION=petscversion(); -if PETSC_VERSION==3, - solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij'); - solverOptions.ksp_type=getfieldvalue(options, 'ksp_type','tfqmr'); - solverOptions.pc_type=getfieldvalue(options, 'pc_type', 'sor'); -end