Basesolver init function now accepts a comm

baseclasses/BaseSolver.py

@@ -14,19 +14,22 @@ class BaseSolver(object):
     Abstract Class for a basic Solver Object
     """
 
-    def __init__(self, name, category={}, def_options={}, options={}, immutableOptions=set(), deprecatedOptions={}):
+    def __init__(
+        self, name, category, defaultOptions={}, options={}, immutableOptions=set(), deprecatedOptions={}, comm=None, informs={}
+    ):
         """
         Solver Class Initialization
         """
 
         self.name = name
         self.category = category
         self.options = CaseInsensitiveDict()
-        self.defaultOptions = CaseInsensitiveDict(def_options)
+        self.defaultOptions = CaseInsensitiveDict(defaultOptions)
         self.immutableOptions = CaseInsensitiveSet(immutableOptions)
         self.deprecatedOptions = CaseInsensitiveDict(deprecatedOptions)
+        self.comm = comm
+        self.informs = informs
         self.solverCreated = False
-        self.comm = None
 
         # Initialize Options
         for key, (optionType, optionValue) in self.defaultOptions.items():
@@ -146,7 +149,7 @@ def printModifiedOptions(self):
         tmpDict = {}
         for key in self.options:
             defaultType, defaultValue = self.defaultOptions[key]
-            if defaultType == list and not isinstance(defaultValue, list):
+            if defaultType is list and not isinstance(defaultValue, list):
                 defaultValue = defaultValue[0]
             optionValue = self.getOption(key)
             if optionValue != defaultValue:
@@ -156,7 +159,7 @@ def printModifiedOptions(self):
     def pp(self, obj):
         """
         This method prints ``obj`` (via pprint) on the root proc of ``self.comm`` if it exists.
-        Otherswise it will just print ``obj``.
+        Otherwise it will just print ``obj``.
 
         Parameters
         ----------

baseclasses/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.2.4"
+__version__ = "1.2.5"
 
 from .pyAero_problem import AeroProblem
 from .pyTransi_problem import TransiProblem

baseclasses/pyAero_solver.py

@@ -27,7 +27,15 @@ class AeroSolver(BaseSolver):
     """
 
     def __init__(
-        self, name, category={}, def_options={}, informs={}, options={}, immutableOptions=set(), deprecatedOptions={}
+        self,
+        name,
+        category,
+        defaultOptions={},
+        options={},
+        immutableOptions=set(),
+        deprecatedOptions={},
+        comm=None,
+        informs={},
     ):
 
         """
@@ -37,10 +45,12 @@ def __init__(
         super().__init__(
             name,
             category=category,
-            def_options=def_options,
+            defaultOptions=defaultOptions,
             options=options,
             immutableOptions=immutableOptions,
             deprecatedOptions=deprecatedOptions,
+            comm=comm,
+            informs=informs,
         )
         self.families = CaseInsensitiveDict()
         self._updateGeomInfo = False

tests/test_BaseSolver.py

@@ -1,15 +1,20 @@
+try:
+    from mpi4py import MPI
+except ImportError:
+    MPI = None
+
 import unittest
 from baseclasses import BaseSolver
 from baseclasses.utils import Error
 
 
 class SOLVER(BaseSolver):
-    def __init__(self, name, options=None, *args, **kwargs):
+    def __init__(self, name, options={}, comm=None, *args, **kwargs):
 
         """Create an artificial class for testing"""
 
         category = "Solver for testing BaseSolver"
-        def_opts = {
+        defaultOptions = {
             "boolOption": [bool, True],
             "floatOption": [float, 10.0],
             "intOption": [int, [1, 2, 3]],
@@ -22,9 +27,22 @@ def __init__(self, name, options=None, *args, **kwargs):
             "oldOption": "Use boolOption instead.",
         }
 
+        informs = {
+            -1: "Failure -1",
+            0: "Success",
+            1: "Failure 1",
+        }
+
         # Initialize the inherited BaseSolver
         super().__init__(
-            name, category, def_opts, options, immutableOptions=immutableOptions, deprecatedOptions=deprecatedOptions
+            name,
+            category,
+            defaultOptions=defaultOptions,
+            options=options,
+            immutableOptions=immutableOptions,
+            deprecatedOptions=deprecatedOptions,
+            comm=comm,
+            informs=informs,
         )
 
 
@@ -85,3 +103,27 @@ def test_options(self):
             solver.setOption("strOPTION", "str2")  # test  immutableOptions
         with self.assertRaises(Error):
             solver.setOption("oldoption", 4)  # test deprecatedOptions
+
+
+class TestComm(unittest.TestCase):
+
+    N_PROCS = 2
+
+    @unittest.skipIf(MPI is None, "mpi4py not imported")
+    def test_comm_with_mpi(self):
+        # initialize solver
+        solver = SOLVER("testComm", comm=MPI.COMM_WORLD)
+        self.assertFalse(solver.comm is None)
+        solver.printCurrentOptions()
+
+    def test_comm_without_mpi(self):
+        # initialize solver
+        solver = SOLVER("testComm", comm=None)
+        self.assertTrue(solver.comm is None)
+        solver.printCurrentOptions()
+
+
+class TestInforms(unittest.TestCase):
+    def test_informs(self):
+        solver = SOLVER("testInforms")
+        self.assertEqual(solver.informs[0], "Success")