Changeset 21341 for issm/trunk/src/m/solvers/ibcgsasmoptions.m

Timestamp:

11/04/16 13:48:43 (8 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 21337

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/solvers/ibcgsasmoptions.m (modified) (1 diff)

issm/trunk/src/m/solvers/ibcgsasmoptions.m

@@ -5 +5 @@
 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