source: issm/oecreview/Archive/11786-11800/ISSM-11790-11791.diff@ 11991

Last change on this file since 11991 was 11991, checked in by Eric.Larour, 13 years ago

oecreview from 11518 to present
File size: 8.9 KB
RevLine 
[11991]1Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/scipy/install-macosx64.sh
2===================================================================
3--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/scipy/install-macosx64.sh (revision 11790)
4+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/scipy/install-macosx64.sh (revision 11791)
5@@ -3,7 +3,7 @@
6 #1: install numpy
7 #2 install scipy
8 #3 erase
9-install=2;
10+install=1;
11
12
13 export CC=gcc
14Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/py/model/solvers/asmoptions.py
15===================================================================
16--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/py/model/solvers/asmoptions.py (revision 0)
17+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/py/model/solvers/asmoptions.py (revision 11791)
18@@ -0,0 +1,31 @@
19+#module imports {{{
20+from pairoptions import *
21+from petscversion import *
22+#}}}
23+def asmoptions(*args):
24+ #ASMOPTIONS - return ASM petsc options
25+ #
26+ # Usage:
27+ # options=asmoptions;
28+
29+ #retrieve options provided in varargin
30+ arguments=pairoptions(*args)
31+
32+ options=[['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]];
33+
34+ #now, go through our arguments, and write over default options.
35+ for i in range(len(arguments.list)):
36+ arg1=arguments.list[i][0]
37+ arg2=arguments.list[i][1]
38+ found=0;
39+ for j in range(len(options)):
40+ joption=options[j][0]
41+ if joption==arg1:
42+ joption[1]=arg2;
43+ options[j]=joption;
44+ found=1;
45+ break
46+ if not found:
47+ #this option did not exist, add it:
48+ options.append([arg1,arg2])
49+ return options
50Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/py/model/solvers/matlaboptions.py
51===================================================================
52--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/py/model/solvers/matlaboptions.py (revision 0)
53+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/py/model/solvers/matlaboptions.py (revision 11791)
54@@ -0,0 +1,31 @@
55+#module imports {{{
56+from pairoptions import *
57+from petscversion import *
58+#}}}
59+def matlaboptions(*args):
60+ #MATLABOPTIONS - return Matlab petsc options
61+ #
62+ # Usage:
63+ # options=matlaboptions;
64+
65+ #retrieve options provided in varargin
66+ arguments=pairoptions(*args)
67+
68+ options=[['ksp_type','matlab']];
69+
70+ #now, go through our arguments, and write over default options.
71+ for i in range(len(arguments.list)):
72+ arg1=arguments.list[i][0]
73+ arg2=arguments.list[i][1]
74+ found=0;
75+ for j in range(len(options)):
76+ joption=options[j][0]
77+ if joption==arg1:
78+ joption[1]=arg2;
79+ options[j]=joption;
80+ found=1;
81+ break
82+ if not found:
83+ #this option did not exist, add it:
84+ options.append([arg1,arg2])
85+ return options
86Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/py/model/solvers/jacobicgoptions.py
87===================================================================
88--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/py/model/solvers/jacobicgoptions.py (revision 0)
89+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/py/model/solvers/jacobicgoptions.py (revision 11791)
90@@ -0,0 +1,31 @@
91+#module imports {{{
92+from pairoptions import *
93+from petscversion import *
94+#}}}
95+def jacobicgoptions(*args):
96+ #ASMOPTIONS - return Additive Shwartz Method with Jacobi preconditioner petsc options
97+ #
98+ # Usage:
99+ # options=jacobicgoptions;
100+
101+ #retrieve options provided in varargin
102+ arguments=pairoptions(*args)
103+
104+ options=[['mat_type','aij'],['ksp_type','cg'],['ksp_max_it',100],['ksp_rtol',1e-15]];
105+
106+ #now, go through our arguments, and write over default options.
107+ for i in range(len(arguments.list)):
108+ arg1=arguments.list[i][0]
109+ arg2=arguments.list[i][1]
110+ found=0;
111+ for j in range(len(options)):
112+ joption=options[j][0]
113+ if joption==arg1:
114+ joption[1]=arg2;
115+ options[j]=joption;
116+ found=1;
117+ break
118+ if not found:
119+ #this option did not exist, add it:
120+ options.append([arg1,arg2])
121+ return options
122Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/py/model/solvers/soroptions.py
123===================================================================
124--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/py/model/solvers/soroptions.py (revision 0)
125+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/py/model/solvers/soroptions.py (revision 11791)
126@@ -0,0 +1,31 @@
127+#module imports {{{
128+from pairoptions import *
129+from petscversion import *
130+#}}}
131+def soroptions(*args):
132+ #SOROPTIONS - return Relaxation Solver petsc options
133+ #
134+ # Usage:
135+ # options=soroptions;
136+
137+ #retrieve options provided in varargin
138+ arguments=pairoptions(*args)
139+
140+ options=[['mat_type','aij'],['ksp_type','cg'],['pc_type','sor'],['pc_sor_omega',1.1],['pc_sor_its',2]];
141+
142+ #now, go through our arguments, and write over default options.
143+ for i in range(len(arguments.list)):
144+ arg1=arguments.list[i][0]
145+ arg2=arguments.list[i][1]
146+ found=0;
147+ for j in range(len(options)):
148+ joption=options[j][0]
149+ if joption==arg1:
150+ joption[1]=arg2;
151+ options[j]=joption;
152+ found=1;
153+ break
154+ if not found:
155+ #this option did not exist, add it:
156+ options.append([arg1,arg2])
157+ return options
158Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/py/model/solvers/jacobiasmoptions.py
159===================================================================
160--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/py/model/solvers/jacobiasmoptions.py (revision 0)
161+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/py/model/solvers/jacobiasmoptions.py (revision 11791)
162@@ -0,0 +1,31 @@
163+#module imports {{{
164+from pairoptions import *
165+from petscversion import *
166+#}}}
167+def jacobiasmoptions(*args):
168+ #ASMOPTIONS - return Additive Shwartz Method with Jacobi preconditioner petsc options
169+ #
170+ # Usage:
171+ # options=jacobiasmoptions;
172+
173+ #retrieve options provided in varargin
174+ arguments=pairoptions(*args)
175+
176+ 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]];
177+
178+ #now, go through our arguments, and write over default options.
179+ for i in range(len(arguments.list)):
180+ arg1=arguments.list[i][0]
181+ arg2=arguments.list[i][1]
182+ found=0;
183+ for j in range(len(options)):
184+ joption=options[j][0]
185+ if joption==arg1:
186+ joption[1]=arg2;
187+ options[j]=joption;
188+ found=1;
189+ break
190+ if not found:
191+ #this option did not exist, add it:
192+ options.append([arg1,arg2])
193+ return options
194Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/py/model/solvers/stokesoptions.py
195===================================================================
196--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/py/model/solvers/stokesoptions.py (revision 0)
197+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/py/model/solvers/stokesoptions.py (revision 11791)
198@@ -0,0 +1,40 @@
199+#module imports {{{
200+from pairoptions import *
201+from petscversion import *
202+#}}}
203+def stokesoptions(*args):
204+ #STOKESOPTIONS - return STOKES multi-physics solver petsc options
205+ #
206+ # Usage:
207+ # options=stokesoptions;
208+
209+ #retrieve options provided in varargin
210+ arguments=pairoptions(*args)
211+
212+
213+ #default stokes options
214+ PETSC_VERSION=petscversion()
215+
216+ if PETSC_VERSION==2:
217+ raise RuntimeError('stokesoptions error message: multi-physics options not supported in Petsc 2')
218+ if PETSC_VERSION==3:
219+ options=[['mat_type','mpiaij'],['ksp_max_it',1000],['ksp_type','gmres'],['pc_type','fieldsplit'],['pc_field_split_type','schur'],\
220+ ['fieldsplit_0_pc_type','hypre'],['fieldsplit_0_ksp_type','gmres'],['fieldsplit_0_pc_hypre_type','boomerang'],\
221+ ['fieldsplit_1_pc_type','jacobi'],['fieldsplit_1_ksp_type','preonly'],['issm_option_solver','stokes']]
222+
223+ #now, go through our arguments, and write over default options.
224+ for i in range(len(arguments.list)):
225+ arg1=arguments.list[i][0]
226+ arg2=arguments.list[i][1]
227+ found=0;
228+ for j in range(len(options)):
229+ joption=options[j][0]
230+ if joption==arg1:
231+ joption[1]=arg2;
232+ options[j]=joption;
233+ found=1;
234+ break
235+ if not found:
236+ #this option did not exist, add it:
237+ options.append([arg1,arg2])
238+ return options
239Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/startup.py
240===================================================================
241--- /proj/ice/larour/issm-uci-clean/trunk-jpl/startup.py (revision 11790)
242+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/startup.py (revision 11791)
243@@ -58,6 +58,18 @@
244 from debug import *
245 from settings import *
246 from solver import *
247+from issmtier import *
248+from ismumps import *
249+from pairoptions import *
250+from petscversion import *
251+from asmoptions import *
252+from iluasmoptions import *
253+from jacobiasmoptions import *
254+from jacobicgoptions import *
255+from matlaboptions import *
256+from mumpsoptions import *
257+from soroptions import *
258+from stokesoptions import *
259 #}}}
260
261 print("\n To get started with ISSM, type issmdoc at the command prompt.\n\n")
Note: See TracBrowser for help on using the repository browser.