diff --git a/pyhyp/__init__.py b/pyhyp/__init__.py index 31ce938..c3dbcc0 100644 --- a/pyhyp/__init__.py +++ b/pyhyp/__init__.py @@ -1,3 +1,3 @@ -__version__ = "2.3.0" +__version__ = "2.3.1" from .pyHyp import pyHyp, pyHypMulti diff --git a/pyhyp/pyHyp.py b/pyhyp/pyHyp.py index 243b72b..a90bea5 100644 --- a/pyhyp/pyHyp.py +++ b/pyhyp/pyHyp.py @@ -380,15 +380,22 @@ def __init__(self, comm=None, options=None, debug=False): name = "pyHyp" category = "Hyperbolic mesh generator" + informs = {} # Set the possible MPI Intracomm if comm is None: comm = MPI.COMM_WORLD - self.comm = comm # Default options for hyperbolic generation defOpts = self._getDefaultOptions() + # Use supplied options + if options is None: + raise Error("The options = keyword argument is *NOT* optional. " "It must always be provided") + + # Initialize the inherited BaseSolver + super().__init__(name, category, defaultOptions=defOpts, options=options, comm=comm, informs=informs) + # Import and set the hyp module curDir = os.path.dirname(os.path.realpath(__file__)) self.hyp = MExt.MExt("hyp", [curDir], debug=debug)._module @@ -396,13 +403,6 @@ def __init__(self, comm=None, options=None, debug=False): # Initialize PETSc and MPI if not already done so: self.hyp.initpetsc(self.comm.py2f()) - # Use supplied options - if options is None: - raise Error("The options = keyword argument is *NOT* optional. " "It must always be provided") - - # Initialize the inherited BaseSolver - super().__init__(name, category, defOpts, options) - # Set the fortan options self._setOptions() self.gridGenerated = False diff --git a/setup.py b/setup.py index b4bb76a..0964934 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ install_requires=[ "numpy>=1.16", "mpi4py>=3.0", - "mdolab-baseclasses>=1.2", + "mdolab-baseclasses>=1.3", ], classifiers=["Operating System :: Linux", "Programming Language :: Python, Fortran"], )