Changeset 14610

Timestamp:

04/16/13 16:12:55 (12 years ago)

Author:

Eric.Larour

Message:

CHG: adding toolkit type

Location:

issm/trunk-jpl/src/m/solvers

Files:

• asmoptions.m (modified) (1 diff)
• asmoptions.py (modified) (1 diff)
• iluasmoptions.m (modified) (1 diff)
• iluasmoptions.py (modified) (1 diff)
• jacobiasmoptions.m (modified) (1 diff)
• jacobiasmoptions.py (modified) (1 diff)
• jacobicgoptions.m (modified) (1 diff)
• jacobicgoptions.py (modified) (1 diff)
• matlaboptions.m (modified) (1 diff)
• matlaboptions.py (modified) (1 diff)
• mumpsoptions.m (modified) (2 diffs)
• mumpsoptions.py (modified) (2 diffs)
• soroptions.m (modified) (1 diff)
• soroptions.py (modified) (1 diff)
• stokesoptions.m (modified) (1 diff)
• stokesoptions.py (modified) (1 diff)

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

@@ -10 +10 @@
 
 %default asm options
+asm.toolkit='petsc';
 asm.mat_type=getfieldvalue(options,'mat_type','aij');
 asm.ksp_type=getfieldvalue(options,'ksp_type','gmres');

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

@@ -12 +12 @@
         arguments=pairoptions(*args) 
         
-        options=[['mat_type','aij'],['ksp_type','gmres'],['pc_type','asm'],['sub_pc_type','lu'],['pc_asm_overlap',3],['ksp_max_it',100],['ksp_rtol',1e-30]];
+        options=[['toolkit','petsc'],['mat_type','aij'],['ksp_type','gmres'],['pc_type','asm'],['sub_pc_type','lu'],['pc_asm_overlap',3],['ksp_max_it',100],['ksp_rtol',1e-30]];
 
         #now, go through our arguments, and write over default options.

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

@@ -10 +10 @@
 
 %default iluasm options
+iluasm.toolkit='petsc';
 iluasm.mat_type=getfieldvalue(options,'mat_type','aij');
 iluasm.ksp_type=getfieldvalue(options,'ksp_type','gmres');

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

@@ -15 +15 @@
 
         #default iluasm options
+        iluasm['toolkit']='petsc'
         iluasm['mat_type']=options.getfieldvalue('mat_type','aij')
         iluasm['ksp_type']=options.getfieldvalue('ksp_type','gmres')

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

@@ -10 +10 @@
 
 %default jacobiasm options
+jacobiasm.toolkit='petsc';
 jacobiasm.mat_type=getfieldvalue(options,'mat_type','aij');
 jacobiasm.ksp_type=getfieldvalue(options,'ksp_type','gmres');

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

@@ -12 +12 @@
         arguments=pairoptions(*args) 
         
-        options=[['mat_type','aij'],['ksp_type','gmres'],['pc_type','asm'],['sub_pc_type','jacobi'],['pc_asm_overlap',3],['ksp_max_it',100],['ksp_rtol',1e-15]];
+        options=[['toolkit','petsc'],['mat_type','aij'],['ksp_type','gmres'],['pc_type','asm'],['sub_pc_type','jacobi'],['pc_asm_overlap',3],['ksp_max_it',100],['ksp_rtol',1e-15]];
 
         #now, go through our arguments, and write over default options.

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

@@ -10 +10 @@
 
 %default jacobiasm options
+jacobicg.toolkit='petsc';
 jacobicg.mat_type=getfieldvalue(options,'mat_type','aij');
 jacobicg.ksp_type=getfieldvalue(options,'ksp_type','cg');

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

@@ -12 +12 @@
         arguments=pairoptions(*args) 
         
-        options=[['mat_type','aij'],['ksp_type','cg'],['ksp_max_it',100],['ksp_rtol',1e-15]];
+        options=[['toolkit','petsc'],['mat_type','aij'],['ksp_type','cg'],['ksp_max_it',100],['ksp_rtol',1e-15]];
 
         #now, go through our arguments, and write over default options.

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

@@ -10 +10 @@
 
 %default matlab options
+maltab.toolkit='petsc';
 maltab.ksp_type='matlab';

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

@@ -12 +12 @@
         arguments=pairoptions(*args) 
         
-        options=[['ksp_type','matlab']];
+        options=[['toolkit','petsc'],['ksp_type','matlab']];
 
         #now, go through our arguments, and write over default options.

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

@@ -12 +12 @@
 PETSC_VERSION=petscversion();
 if PETSC_VERSION==2,
+        mumps.toolkit='petsc';
         mumps.mat_type=getfieldvalue(options,'mat_type','aijmumps');
         mumps.ksp_type=getfieldvalue(options,'ksp_type','preonly');
@@ -19 +20 @@
 end
 if PETSC_VERSION==3,
+        mumps.toolkit='petsc';
         mumps.mat_type=getfieldvalue(options,'mat_type','mpiaij');
         mumps.ksp_type=getfieldvalue(options,'ksp_type','preonly');

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

@@ -18 +18 @@
         PETSC_VERSION=petscversion()
         if PETSC_VERSION==2:
+                mumps['toolkit']='petsc'
                 mumps['mat_type']=options.getfieldvalue('mat_type','aijmumps')
                 mumps['ksp_type']=options.getfieldvalue('ksp_type','preonly')
@@ -24 +25 @@
                 mumps['pc_factor_shift_positive_definite']=options.getfieldvalue('pc_factor_shift_positive_definite','true')
         if PETSC_VERSION==3:
+                mumps['toolkit']='petsc'
                 mumps['mat_type']=options.getfieldvalue('mat_type','mpiaij')
                 mumps['ksp_type']=options.getfieldvalue('ksp_type','preonly')

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

@@ -10 +10 @@
 
 %default sor options
+sor.toolkit='petsc';
 sor.mat_type=getfieldvalue(options,'mat_type','aij');
 sor.ksp_type=getfieldvalue(options,'ksp_type','cg');

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

@@ -12 +12 @@
         arguments=pairoptions(*args) 
         
-        options=[['mat_type','aij'],['ksp_type','cg'],['pc_type','sor'],['pc_sor_omega',1.1],['pc_sor_its',2]];
+        options=[['toolkit','petsc'],['mat_type','aij'],['ksp_type','cg'],['pc_type','sor'],['pc_sor_omega',1.1],['pc_sor_its',2]];
 
         #now, go through our arguments, and write over default options.

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

@@ -15 +15 @@
 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);

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

@@ -19 +19 @@
                 raise RuntimeError('stokesoptions error message: multi-physics options not supported in Petsc 2')
         if PETSC_VERSION==3:
-                options=[['mat_type','mpiaij'],['ksp_max_it',1000],['ksp_type','gmres'],['pc_type','fieldsplit'],['pc_field_split_type','schur'],\
+                options=[['toolkit','petsc'],['mat_type','mpiaij'],['ksp_max_it',1000],['ksp_type','gmres'],['pc_type','fieldsplit'],['pc_field_split_type','schur'],\
         ['fieldsplit_0_pc_type','hypre'],['fieldsplit_0_ksp_type','gmres'],['fieldsplit_0_pc_hypre_type','boomerang'],\
         ['fieldsplit_1_pc_type','jacobi'],['fieldsplit_1_ksp_type','preonly'],['issm_option_solver','stokes']]