source: issm/oecreview/Archive/16133-16554/ISSM-16190-16191.diff

Last change on this file was 16556, checked in by Mathieu Morlighem, 11 years ago

NEW: added Archive/16133-16554
File size: 5.1 KB
RevLine 
[16556]1Index: ../trunk-jpl/src/m/solvers/issmsolver.py
2===================================================================
3--- ../trunk-jpl/src/m/solvers/issmsolver.py (revision 16190)
4+++ ../trunk-jpl/src/m/solvers/issmsolver.py (revision 16191)
5@@ -1,28 +0,0 @@
6-from pairoptions import *
7-def asmoptions(*args):
8- #ISSMSOLVE - return issm solver options
9- #
10- # Usage:
11- # options=issmsolver;
12-
13- #retrieve options provided in varargin
14- arguments=pairoptions(*args)
15-
16- options=[['toolkit','issm'],['mat_type','mpidense'],['vec_type','mpi'],['solver_type','mumps']];
17-
18- #now, go through our arguments, and write over default options.
19- for i in range(len(arguments.list)):
20- arg1=arguments.list[i][0]
21- arg2=arguments.list[i][1]
22- found=0;
23- for j in range(len(options)):
24- joption=options[j][0]
25- if joption==arg1:
26- joption[1]=arg2;
27- options[j]=joption;
28- found=1;
29- break
30- if not found:
31- #this option did not exist, add it:
32- options.append([arg1,arg2])
33- return options
34Index: ../trunk-jpl/src/m/solvers/issmsolver.m
35===================================================================
36--- ../trunk-jpl/src/m/solvers/issmsolver.m (revision 16190)
37+++ ../trunk-jpl/src/m/solvers/issmsolver.m (revision 16191)
38@@ -1,15 +0,0 @@
39-function issmoptions=issmsolver(varargin)
40-%ISSMSOLVER -
41-%
42-% Usage:
43-% options=issmsolver;
44-
45-%retrieve options provided in varargin
46-options=pairoptions(varargin{:});
47-issmoptions=struct();
48-
49-%default issmoptions options
50-issmoptions.toolkit='issm';
51-issmoptions.mat_type=getfieldvalue(options,'mat_type','mpidense');
52-issmoptions.vec_type=getfieldvalue(options,'vec_type','mpi');
53-issmoptions.solver_type=getfieldvalue(options,'solver_type','mumps');
54Index: ../trunk-jpl/src/m/solvers/issmmumpssolver.py
55===================================================================
56--- ../trunk-jpl/src/m/solvers/issmmumpssolver.py (revision 0)
57+++ ../trunk-jpl/src/m/solvers/issmmumpssolver.py (revision 16191)
58@@ -0,0 +1,28 @@
59+from pairoptions import *
60+def issmmumpssolver(*args):
61+ #ISSMSOLVE - return issm solver options
62+ #
63+ # Usage:
64+ # options=issmsolver;
65+
66+ #retrieve options provided in varargin
67+ arguments=pairoptions(*args)
68+
69+ options=[['toolkit','issm'],['mat_type','mpidense'],['vec_type','mpi'],['solver_type','mumps']];
70+
71+ #now, go through our arguments, and write over default options.
72+ for i in range(len(arguments.list)):
73+ arg1=arguments.list[i][0]
74+ arg2=arguments.list[i][1]
75+ found=0;
76+ for j in range(len(options)):
77+ joption=options[j][0]
78+ if joption==arg1:
79+ joption[1]=arg2;
80+ options[j]=joption;
81+ found=1;
82+ break
83+ if not found:
84+ #this option did not exist, add it:
85+ options.append([arg1,arg2])
86+ return options
87Index: ../trunk-jpl/src/m/solvers/issmmumpssolver.m
88===================================================================
89--- ../trunk-jpl/src/m/solvers/issmmumpssolver.m (revision 0)
90+++ ../trunk-jpl/src/m/solvers/issmmumpssolver.m (revision 16191)
91@@ -0,0 +1,15 @@
92+function issmoptions=issmmumpssolver(varargin)
93+%ISSMSOLVER -
94+%
95+% Usage:
96+% options=issmsolver;
97+
98+%retrieve options provided in varargin
99+options=pairoptions(varargin{:});
100+issmoptions=struct();
101+
102+%default issmoptions options
103+issmoptions.toolkit='issm';
104+issmoptions.mat_type=getfieldvalue(options,'mat_type','mpidense');
105+issmoptions.vec_type=getfieldvalue(options,'vec_type','mpi');
106+issmoptions.solver_type=getfieldvalue(options,'solver_type','mumps');
107Index: ../trunk-jpl/src/m/solvers/issmgslsolver.py
108===================================================================
109--- ../trunk-jpl/src/m/solvers/issmgslsolver.py (revision 0)
110+++ ../trunk-jpl/src/m/solvers/issmgslsolver.py (revision 16191)
111@@ -0,0 +1,28 @@
112+from pairoptions import *
113+def issmgslsolver(*args):
114+ #ISSMSOLVE - return issm solver options
115+ #
116+ # Usage:
117+ # options=issmsolver;
118+
119+ #retrieve options provided in varargin
120+ arguments=pairoptions(*args)
121+
122+ options=[['toolkit','issm'],['mat_type','dense'],['vec_type','seq'],['solver_type','gsl']];
123+
124+ #now, go through our arguments, and write over default options.
125+ for i in range(len(arguments.list)):
126+ arg1=arguments.list[i][0]
127+ arg2=arguments.list[i][1]
128+ found=0;
129+ for j in range(len(options)):
130+ joption=options[j][0]
131+ if joption==arg1:
132+ joption[1]=arg2;
133+ options[j]=joption;
134+ found=1;
135+ break
136+ if not found:
137+ #this option did not exist, add it:
138+ options.append([arg1,arg2])
139+ return options
140Index: ../trunk-jpl/src/m/solvers/issmgslsolver.m
141===================================================================
142--- ../trunk-jpl/src/m/solvers/issmgslsolver.m (revision 0)
143+++ ../trunk-jpl/src/m/solvers/issmgslsolver.m (revision 16191)
144@@ -0,0 +1,15 @@
145+function issmoptions=issmgslsolver(varargin)
146+%ISSMSOLVER -
147+%
148+% Usage:
149+% options=issmsolver;
150+
151+%retrieve options provided in varargin
152+options=pairoptions(varargin{:});
153+issmoptions=struct();
154+
155+%default issmoptions options
156+issmoptions.toolkit='issm';
157+issmoptions.mat_type=getfieldvalue(options,'mat_type','dense');
158+issmoptions.vec_type=getfieldvalue(options,'vec_type','seq');
159+issmoptions.solver_type=getfieldvalue(options,'solver_type','gsl');
Note: See TracBrowser for help on using the repository browser.