Changeset 11871 for issm/trunk-jpl/src/m/model/solvers/jacobiasmoptions.m

Timestamp:

04/03/12 10:11:50 (13 years ago)

Author:

Mathieu Morlighem

Message:

solver is now an object with dynamic properties, and each property is a struct with all the PETSc options

File:

• issm/trunk-jpl/src/m/model/solvers/jacobiasmoptions.m (modified) (2 diffs)

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

@@ -1 @@
-function options=jacobiasmoptions(varargin)
+function jacobiasm=jacobiasmoptions(varargin)
 %ASMOPTIONS - return Additive Shwartz Method with Jacobi preconditioner petsc options
 %
@@ -6 +6 @@
                          
 %retrieve options provided in varargin
-arguments=pairoptions(varargin{:});
+options=pairoptions(varargin{:});
+jacobiasm=struct();
 
 %default jacobiasm options
-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'}};
-
-%now, go through our arguments, and write over default options.
-for i=1:size(arguments.list,1),
-        arg1=arguments.list{i,1};
-        arg2=arguments.list{i,2};
-        found=0;
-        for j=1:size(options,2),
-                joption=options{j};
-                if strcmpi(joption{1},arg1),
-                        joption{2}=arg2;
-                        options{j}=joption;
-                        found=1;
-                        break;
-                end
-        end
-        if ~found,
-                %this option did not exist, add it: 
-                options{end+1}={arg1,arg2};
-        end
-end
+jacobiasm.mat_type=getfieldvalue(options,'mat_type','aij');
+jacobiasm.ksp_type=getfieldvalue(options,'ksp_type','gmres');
+jacobiasm.pc_type=getfieldvalue(options,'pc_type','asm');
+jacobiasm.sub_pc_type=getfieldvalue(options,'sub_pc_type','jacobi');
+jacobiasm.pc_asm_overlap=getfieldvalue(options,'pc_asm_overlap',3);
+jacobiasm.ksp_max_it=getfieldvalue(options,'ksp_max_it',100);
+jacobiasm.ksp_rtol=getfieldvalue(options,'ksp_rtol',1e-15);