Changeset 24313 for issm/trunk/src/m/solvers/asmoptions.py

Timestamp:

11/01/19 12:01:57 (5 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 24310

Location:

issm/trunk

Files:

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

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

@@ -1 +1 @@
 import pairoptions
 
+
 def asmoptions(*args):
-        #ASMOPTIONS - return ASM petsc options
-        #
-        #   Usage:
-        #      options=asmoptions;
-        
-        #retrieve options provided in varargin
-        arguments=pairoptions.pairoptions(*args) 
-        
-        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]];
+    #ASMOPTIONS - return ASM petsc options
+    #
+    #   Usage:
+    #      options = asmoptions
 
-        #now, go through our arguments, and write over default options.
-        for i in range(len(arguments.list)):
-                arg1=arguments.list[i][0]
-                arg2=arguments.list[i][1]
-                found=0;
-                for j in range(len(options)):
-                        joption=options[j][0]
-                        if joption==arg1:
-                                joption[1]=arg2;
-                                options[j]=joption;
-                                found=1;
-                                break
-                if not found:
-                        #this option did not exist, add it: 
-                        options.append([arg1,arg2])
-        return options
+    #retrieve options provided in varargin
+    arguments = pairoptions.pairoptions(*args)
+
+    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.
+    for i in range(len(arguments.list)):
+        arg1 = arguments.list[i][0]
+        arg2 = arguments.list[i][1]
+        found = 0
+        for j in range(len(options)):
+            joption = options[j][0]
+            if joption == arg1:
+                joption[1] = arg2
+                options[j] = joption
+                found = 1
+                break
+        if not found:
+            #this option did not exist, add it:
+            options.append([arg1, arg2])
+    return options