misc: Add petsc_type_to_ctype

Author: ZoeLeibowitz

devito/petsc/logging.py

@@ -7,7 +7,7 @@
 from devito.petsc.types import (
     PetscInt, PetscScalar, KSPType, KSPConvergedReason, KSPNormType
 )
-from devito.petsc.utils import petsc_type_mappings, fixed_petsc_type_mappings
+from devito.petsc.utils import petsc_type_to_ctype
 
 
 class PetscEntry:
@@ -142,7 +142,6 @@ def __init__(self, name, pname, petsc_option_mapper, sobjs, section_mapper,
         self.function_list = function_list
         self.formatted_prefix = inject_solve.expr.rhs.formatted_prefix
 
-        mapper = {v: k for k, v in petsc_type_mappings.items()}
         pfields = []
 
         # All petsc options needed to form the PetscInfo struct
@@ -152,11 +151,9 @@ def __init__(self, name, pname, petsc_option_mapper, sobjs, section_mapper,
         for petsc_option in self._fields:
             # petsc_type is e.g. 'PetscInt', 'PetscScalar', 'KSPType'
             petsc_type = str(petsc_option.dtype)
-            if petsc_type in mapper:
-                ctype = mapper[petsc_type]
-            else:
-                ctype = fixed_petsc_type_mappings[petsc_type]
+            ctype = petsc_type_to_ctype[petsc_type]
             pfields.append((petsc_option.name, ctype))
+
         super().__init__(name, pname, pfields)
 
     @property

devito/petsc/utils.py

@@ -92,17 +92,18 @@ def get_petsc_type_mappings():
     return mapper
 
 
+# This mapping is used by the printer to always convert
+# int, float/double to `PetscInt` and `PetscScalar`
 petsc_type_mappings = get_petsc_type_mappings()
 
 
-# NOTE: These mappings are only used when constructing ctypes.Structures
-# that wrap PETSc objects. In the generated C code, the fields will still
-# appear as the actual PETSc types.
-fixed_petsc_type_mappings = {
+# Used to construct ctypes.Structures that wrap PETSc objects
+petsc_type_to_ctype = {v: k for k, v in petsc_type_mappings.items()}
+petsc_type_to_ctype.update({
     'KSPType': ctypes.c_char_p,
-    'KSPConvergedReason': ctypes.c_int,
-    'KSPNormType': ctypes.c_int,
-}
+    'KSPConvergedReason': petsc_type_to_ctype['PetscInt'],
+    'KSPNormType': petsc_type_to_ctype['PetscInt'],
+})
 
 
 petsc_languages = ['petsc']