[15393] | 1 | Index: ../trunk-jpl/src/m/classes/toolkits.m
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/src/m/classes/toolkits.m (revision 14880)
|
---|
| 4 | +++ ../trunk-jpl/src/m/classes/toolkits.m (revision 14881)
|
---|
| 5 | @@ -38,11 +38,16 @@
|
---|
| 6 | %}}}
|
---|
| 7 | function obj = setdefaultparameters(obj) % {{{
|
---|
| 8 |
|
---|
| 9 | - %MUMPS is the default toolkits
|
---|
| 10 | - if ismumps(),
|
---|
| 11 | - obj.DefaultAnalysis = mumpsoptions();
|
---|
| 12 | + %default toolkits:
|
---|
| 13 | + if ispetsc,
|
---|
| 14 | + %MUMPS is the default toolkits
|
---|
| 15 | + if ismumps(),
|
---|
| 16 | + obj.DefaultAnalysis = mumpsoptions();
|
---|
| 17 | + else
|
---|
| 18 | + obj.DefaultAnalysis = iluasmoptions();
|
---|
| 19 | + end
|
---|
| 20 | else
|
---|
| 21 | - obj.DefaultAnalysis = iluasmoptions();
|
---|
| 22 | + obj.DefaultAnalysis = issmsolver();
|
---|
| 23 | end
|
---|
| 24 |
|
---|
| 25 | end % }}}
|
---|
| 26 | Index: ../trunk-jpl/src/m/classes/toolkits.py
|
---|
| 27 | ===================================================================
|
---|
| 28 | --- ../trunk-jpl/src/m/classes/toolkits.py (revision 14880)
|
---|
| 29 | +++ ../trunk-jpl/src/m/classes/toolkits.py (revision 14881)
|
---|
| 30 | @@ -16,11 +16,15 @@
|
---|
| 31 | """
|
---|
| 32 |
|
---|
| 33 | def __init__(self): # {{{
|
---|
| 34 | - #MUMPS is the default toolkits
|
---|
| 35 | - if ismumps():
|
---|
| 36 | - self.DefaultAnalysis = mumpsoptions()
|
---|
| 37 | + #default toolkits
|
---|
| 38 | + if ispetsc():
|
---|
| 39 | + #MUMPS is the default toolkits
|
---|
| 40 | + if ismumps():
|
---|
| 41 | + self.DefaultAnalysis = mumpsoptions()
|
---|
| 42 | + else:
|
---|
| 43 | + self.DefaultAnalysis = iluasmoptions()
|
---|
| 44 | else:
|
---|
| 45 | - self.DefaultAnalysis = iluasmoptions()
|
---|
| 46 | + self.DefaultAnalysis = issmsolver()
|
---|
| 47 |
|
---|
| 48 | #The other properties are dynamic
|
---|
| 49 | # }}}
|
---|