Changeset 23670 for issm/trunk-jpl/src/py3/solvers/mumpsoptions.py

Timestamp:

01/31/19 07:34:11 (6 years ago)

Author:

bdef

Message:

CHG: python scripts after 2to3 and indentation fix

File:

• issm/trunk-jpl/src/py3/solvers/mumpsoptions.py (modified) (3 diffs)

issm/trunk-jpl/src/py3/solvers/mumpsoptions.py

@@ -3 +3 @@
 from IssmConfig import IssmConfig
 
-def mumpsoptions(**kwargs):
+def mumpsoptions(*args):
         """
         MUMPSOPTIONS - return MUMPS direct solver  petsc options
@@ -12 +12 @@
 
         #retrieve options provided in varargin
-        options=pairoptions.pairoptions(**kwargs)
+        options=pairoptions.pairoptions(*args)
         mumps=OrderedDict()
 
         #default mumps options
-        PETSC_VERSION=IssmConfig('_PETSC_MAJOR_')[0]
-        if PETSC_VERSION==2.:
+        PETSC_MAJOR=IssmConfig('_PETSC_MAJOR_')[0]
+        PETSC_MINOR=IssmConfig('_PETSC_MINOR_')[0]
+        if PETSC_MAJOR==2.:
                 mumps['toolkit']='petsc'
                 mumps['mat_type']=options.getfieldvalue('mat_type','aijmumps')
@@ -23 +24 @@
                 mumps['pc_type']=options.getfieldvalue('pc_type','lu')
                 mumps['mat_mumps_icntl_14']=options.getfieldvalue('mat_mumps_icntl_14',120)
-                mumps['pc_factor_shift_positive_definite']=options.getfieldvalue('pc_factor_shift_positive_definite','true')
-        if PETSC_VERSION==3.:
+        if PETSC_MAJOR==3.:
                 mumps['toolkit']='petsc'
                 mumps['mat_type']=options.getfieldvalue('mat_type','mpiaij')
                 mumps['ksp_type']=options.getfieldvalue('ksp_type','preonly')
                 mumps['pc_type']=options.getfieldvalue('pc_type','lu')
-                mumps['pc_factor_mat_solver_package']=options.getfieldvalue('pc_factor_mat_solver_package','mumps')
+                if PETSC_MINOR>8.:
+                        mumps['pc_factor_mat_solver_type']=options.getfieldvalue('pc_factor_mat_solver_type','mumps')
+                else:
+                        mumps['pc_factor_mat_solver_package']=options.getfieldvalue('pc_factor_mat_solver_package','mumps')
                 mumps['mat_mumps_icntl_14']=options.getfieldvalue('mat_mumps_icntl_14',120)
-                mumps['pc_factor_shift_positive_definite']=options.getfieldvalue('pc_factor_shift_positive_definite','true')
 
         return mumps
-