Index: ../trunk-jpl/src/m/solvers/issmsolver.py =================================================================== --- ../trunk-jpl/src/m/solvers/issmsolver.py (revision 16190) +++ ../trunk-jpl/src/m/solvers/issmsolver.py (revision 16191) @@ -1,28 +0,0 @@ -from pairoptions import * -def asmoptions(*args): - #ISSMSOLVE - return issm solver options - # - # Usage: - # options=issmsolver; - - #retrieve options provided in varargin - arguments=pairoptions(*args) - - options=[['toolkit','issm'],['mat_type','mpidense'],['vec_type','mpi'],['solver_type','mumps']]; - - #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 Index: ../trunk-jpl/src/m/solvers/issmsolver.m =================================================================== --- ../trunk-jpl/src/m/solvers/issmsolver.m (revision 16190) +++ ../trunk-jpl/src/m/solvers/issmsolver.m (revision 16191) @@ -1,15 +0,0 @@ -function issmoptions=issmsolver(varargin) -%ISSMSOLVER - -% -% Usage: -% options=issmsolver; - -%retrieve options provided in varargin -options=pairoptions(varargin{:}); -issmoptions=struct(); - -%default issmoptions options -issmoptions.toolkit='issm'; -issmoptions.mat_type=getfieldvalue(options,'mat_type','mpidense'); -issmoptions.vec_type=getfieldvalue(options,'vec_type','mpi'); -issmoptions.solver_type=getfieldvalue(options,'solver_type','mumps'); Index: ../trunk-jpl/src/m/solvers/issmmumpssolver.py =================================================================== --- ../trunk-jpl/src/m/solvers/issmmumpssolver.py (revision 0) +++ ../trunk-jpl/src/m/solvers/issmmumpssolver.py (revision 16191) @@ -0,0 +1,28 @@ +from pairoptions import * +def issmmumpssolver(*args): + #ISSMSOLVE - return issm solver options + # + # Usage: + # options=issmsolver; + + #retrieve options provided in varargin + arguments=pairoptions(*args) + + options=[['toolkit','issm'],['mat_type','mpidense'],['vec_type','mpi'],['solver_type','mumps']]; + + #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 Index: ../trunk-jpl/src/m/solvers/issmmumpssolver.m =================================================================== --- ../trunk-jpl/src/m/solvers/issmmumpssolver.m (revision 0) +++ ../trunk-jpl/src/m/solvers/issmmumpssolver.m (revision 16191) @@ -0,0 +1,15 @@ +function issmoptions=issmmumpssolver(varargin) +%ISSMSOLVER - +% +% Usage: +% options=issmsolver; + +%retrieve options provided in varargin +options=pairoptions(varargin{:}); +issmoptions=struct(); + +%default issmoptions options +issmoptions.toolkit='issm'; +issmoptions.mat_type=getfieldvalue(options,'mat_type','mpidense'); +issmoptions.vec_type=getfieldvalue(options,'vec_type','mpi'); +issmoptions.solver_type=getfieldvalue(options,'solver_type','mumps'); Index: ../trunk-jpl/src/m/solvers/issmgslsolver.py =================================================================== --- ../trunk-jpl/src/m/solvers/issmgslsolver.py (revision 0) +++ ../trunk-jpl/src/m/solvers/issmgslsolver.py (revision 16191) @@ -0,0 +1,28 @@ +from pairoptions import * +def issmgslsolver(*args): + #ISSMSOLVE - return issm solver options + # + # Usage: + # options=issmsolver; + + #retrieve options provided in varargin + arguments=pairoptions(*args) + + options=[['toolkit','issm'],['mat_type','dense'],['vec_type','seq'],['solver_type','gsl']]; + + #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 Index: ../trunk-jpl/src/m/solvers/issmgslsolver.m =================================================================== --- ../trunk-jpl/src/m/solvers/issmgslsolver.m (revision 0) +++ ../trunk-jpl/src/m/solvers/issmgslsolver.m (revision 16191) @@ -0,0 +1,15 @@ +function issmoptions=issmgslsolver(varargin) +%ISSMSOLVER - +% +% Usage: +% options=issmsolver; + +%retrieve options provided in varargin +options=pairoptions(varargin{:}); +issmoptions=struct(); + +%default issmoptions options +issmoptions.toolkit='issm'; +issmoptions.mat_type=getfieldvalue(options,'mat_type','dense'); +issmoptions.vec_type=getfieldvalue(options,'vec_type','seq'); +issmoptions.solver_type=getfieldvalue(options,'solver_type','gsl');