Changeset 26061

Timestamp:

03/10/21 01:07:46 (4 years ago)

Author:

bdef

Message:

BUG: fix to the toolkit writing of mumps options

Location:

issm/trunk-jpl/src/m/solvers

Files:

• mumpsnoneoptions.py (modified) (2 diffs)
• mumpsoptions.py (modified) (4 diffs)

issm/trunk-jpl/src/m/solvers/mumpsnoneoptions.py

@@ -1 +1 @@
 from pairoptions import pairoptions
 from collections import OrderedDict
+from IssmConfig import IssmConfig
 
 
@@ -14 +15 @@
 
     #default mumps options
-    PETSC_MAJOR = IssmConfig('_PETSC_MAJOR_')
-    PETSC_MINOR = IssmConfig('_PETSC_MINOR_')
+    PETSC_MAJOR = IssmConfig('_PETSC_MAJOR_')[0]
+    PETSC_MINOR = IssmConfig('_PETSC_MINOR_')[0]
     if PETSC_MAJOR == 2:
-        mumps.toolkit = 'petsc'
-        mumps.mat_type = getfieldvalue(options, 'mat_type', 'aijmumps')
-        mumps.ksp_type = getfieldvalue(options, 'ksp_type', 'preonly')
-        mumps.pc_type = getfieldvalue(options, 'pc_type', 'lu')
-        mumps.mat_mumps_icntl_14 = getfieldvalue(options, 'mat_mumps_icntl_14', 120)
-    end
+        mumps['toolkit'] = 'petsc'
+        mumps['mat_type'] = options.getfieldvalue(options, 'mat_type', 'aijmumps')
+        mumps['ksp_type'] = options.getfieldvalue(options, 'ksp_type', 'preonly')
+        mumps['pc_type'] = options.getfieldvalue(options, 'pc_type', 'lu')
+        mumps['mat_mumps_icntl_14'] = options.getfieldvalue(options, 'mat_mumps_icntl_14', 120)
 
     if PETSC_MAJOR == 3:
-        mumps.toolkit = 'petsc'
-        mumps.mat_type = getfieldvalue(options, 'mat_type', 'mpiaij')
-        mumps.ksp_type = getfieldvalue(options, 'ksp_type', 'preonly')
-        mumps.pc_type = getfieldvalue(options, 'pc_type', 'lu')
+        mumps['toolkit'] = 'petsc'
+        mumps['mat_type'] = options.getfieldvalue(options, 'mat_type', 'mpiaij')
+        mumps['ksp_type'] = options.getfieldvalue(options, 'ksp_type', 'preonly')
+        mumps['pc_type'] = options.getfieldvalue(options, 'pc_type', 'lu')
         if PETSC_MINOR > 8:
-            mumps.pc_factor_mat_solver_type = getfieldvalue(options, 'pc_factor_mat_solver_type', 'mumps')
+            mumps['pc_factor_mat_solver_type'] = options.getfieldvalue(options, 'pc_factor_mat_solver_type', 'mumps')
         else:
-            mumps.pc_factor_mat_solver_package = getfieldvalue(options, 'pc_factor_mat_solver_package', 'mumps')
-        end
-        mumps.mat_mumps_icntl_14 = getfieldvalue(options, 'mat_mumps_icntl_14', 120)
-        mumps.mat_mumps_icntl_28 = 2; #1 = serial, 2 = parallel
-        mumps.mat_mumps_icntl_29 = 2; #parallel ordering 1 = ptscotch, 2 = parmetis
-    end
-    return solverOptions
+            mumps['pc_factor_mat_solver_package'] = options.getfieldvalue(options, 'pc_factor_mat_solver_package', 'mumps')
+        mumps['mat_mumps_icntl_14'] = options.getfieldvalue(options, 'mat_mumps_icntl_14', 120)
+        mumps['mat_mumps_icntl_28'] = 2  #1 = serial, 2 = parallel
+        mumps['mat_mumps_icntl_29'] = 2  #parallel ordering 1 = ptscotch, 2 = parmetis
+
+    return mumps

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

@@ -1 +1 @@
 from collections import OrderedDict
-import pairoptions
+from pairoptions import pairoptions
 from IssmConfig import IssmConfig
 
@@ -13 +13 @@
 
     #retrieve options provided in varargin
-    options = pairoptions.pairoptions(*args)
+    options = pairoptions(*args)
     mumps = OrderedDict()
 
@@ -24 +24 @@
         mumps['ksp_type'] = options.getfieldvalue('ksp_type', 'preonly')
         mumps['pc_type'] = options.getfieldvalue('pc_type', 'lu')
-        mumps['mat_mumps_icntl_14'] = options.getfieldvalue('mat_mumps_icntl_14', 120)
+        mumps['mat_mumps_icntl_14'] = options.options.getfieldvalue('mat_mumps_icntl_14', 120)
     if PETSC_MAJOR == 3.:
         mumps['toolkit'] = 'petsc'
@@ -36 +36 @@
         mumps['mat_mumps_icntl_14'] = options.getfieldvalue('mat_mumps_icntl_14', 120)
 
+        #These 2 lines make raijin break (ptwgts error during solver with PETSc 3.3)
+        mumps['mat_mumps_icntl_28'] = options.getfieldvalue('mat_mumps_icntl_28', 1)  #1=serial, 2=parallel
+        mumps['mat_mumps_icntl_29'] = options.getfieldvalue('mat_mumps_icntl_29', 2)  #parallel ordering 1 = ptscotch, 2 = parmetis
+
     return mumps