Changeset 21988

Timestamp:

08/23/17 10:45:53 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: seems like mat_type should now be mpiaij, otherwise we get weird errors like sevfaults or Must call MatXXXSetPreallocation() or MatSetUp() on argument 1 mat before MatSetValues()

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)
• soroptions.m (modified) (1 diff)
• soroptions.py (modified) (1 diff)

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

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

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

@@ -10 +10 @@
         arguments=pairoptions.pairoptions(*args) 
         
-        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]];
+        options=[['toolkit','petsc'],['mat_type','mpiaij'],['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

@@ -9 +9 @@
 iluasm=struct();
 iluasm.toolkit='petsc';
-iluasm.mat_type=getfieldvalue(options,'mat_type','aij');
+iluasm.mat_type=getfieldvalue(options,'mat_type','mpiaij');
 iluasm.ksp_type=getfieldvalue(options,'ksp_type','gmres');
 iluasm.pc_type=getfieldvalue(options,'pc_type','asm');

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

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

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

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

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

@@ -10 +10 @@
         arguments=pairoptions.pairoptions(*args) 
         
-        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]];
+        options=[['toolkit','petsc'],['mat_type','mpiaij'],['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

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

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

@@ -10 +10 @@
         arguments=pairoptions.pairoptions(*args) 
         
-        options=[['toolkit','petsc'],['mat_type','aij'],['ksp_type','cg'],['ksp_max_it',100],['ksp_rtol',1e-15]];
+        options=[['toolkit','petsc'],['mat_type','mpiaij'],['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/soroptions.m

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

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

@@ -10 +10 @@
         arguments=pairoptions.pairoptions(*args) 
         
-        options=[['toolkit','petsc'],['mat_type','aij'],['ksp_type','cg'],['pc_type','sor'],['pc_sor_omega',1.1],['pc_sor_its',2]];
+        options=[['toolkit','petsc'],['mat_type','mpiaij'],['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.