Changeset 16137 for issm/trunk/src/m/solvers/stokesoptions.py

Timestamp:

09/16/13 09:43:55 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16135

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/m/solvers/stokesoptions.py (modified) (2 diffs)

issm/trunk ¶

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

issm/trunk/src/m/solvers/stokesoptions.py ¶

@@ -1 @@
-#module imports {{{
 from pairoptions import *
-from petscversion  import *
-#}}}
+from IssmConfig  import *
 def stokesoptions(*args):
         #STOKESOPTIONS - return STOKES multi-physics solver petsc options
@@ -14 +12 @@
 
         #default stokes options
-        PETSC_VERSION=petscversion()
+        PETSC_VERSION=IssmConfig('_PETSC_MAJOR_')[0]
 
-        if PETSC_VERSION==2:
+        if PETSC_VERSION==2.:
                 raise RuntimeError('stokesoptions error message: multi-physics options not supported in Petsc 2')
-        if PETSC_VERSION==3:
+        if PETSC_VERSION==3.:
                 options=[['toolkit','petsc'],['mat_type','mpiaij'],['ksp_max_it',1000],['ksp_type','gmres'],['pc_type','fieldsplit'],['pc_field_split_type','schur'],\
         ['fieldsplit_0_pc_type','hypre'],['fieldsplit_0_ksp_type','gmres'],['fieldsplit_0_pc_hypre_type','boomerang'],\

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad