Skip to content
Snippets Groups Projects
Commit cacc0f9a authored by Jean-Baptiste Keck's avatar Jean-Baptiste Keck
Browse files

fix misc operator

parent cb0eb9fd
No related branches found
No related tags found
1 merge request!16MPI operators
......@@ -56,7 +56,9 @@ class ForceTopologyState(Noop):
@debug
def __init__(self, fields, variables,
tstate=None, memorder=None,
backend=None, extra_kwds=None, mpi_params=None, **kwds):
backend=None, extra_kwds=None,
mpi_params=None, cl_env=None,
**kwds):
extra_kwds = first_not_None(extra_kwds, {})
fields = to_tuple(fields)
......@@ -77,11 +79,16 @@ class ForceTopologyState(Noop):
input_fields = { k:variables[k] for k in fields }
output_fields = { k:variables[k] for k in fields }
if (mpi_params is None) and ('cl_env' in extra_kwds):
mpi_params = extra_kwds['cl_env'].mpi_params
cl_env = first_not_None(cl_env, extra_kwds.get('cl_env', None))
mpi_params = first_not_None(mpi_params, extra_kwds.get('mpi_params', None), getattr(cl_env, 'mpi_params', None))
extra_kwds.setdefault('cl_env', cl_env)
extra_kwds.setdefault('mpi_params', mpi_params)
kwds.setdefault('cl_env', cl_env)
kwds.setdefault('mpi_params', mpi_params)
super(ForceTopologyState, self).__init__(input_fields=input_fields,
output_fields=output_fields, mpi_params=mpi_params, **kwds)
output_fields=output_fields, **kwds)
self.tstate = tstate
self.memorder = memorder
self.backend = first_not_None(backend, Backend.HOST)
......
......@@ -158,10 +158,10 @@ class CartesianTopologyDescriptor(TopologyDescriptor):
cartesian_discretization = CartesianDiscretization(resolution=global_resolution,
lboundaries=field.lboundaries, rboundaries=field.rboundaries,
ghosts=None)
kwds.setdefault('mpi_params', operator.mpi_params)
kwds.setdefault('domain', field.domain)
return CartesianTopologyDescriptor(backend=backend,
domain=field.domain,
mpi_params=operator.mpi_params,
cartesian_discretization = cartesian_discretization,
**kwds)
elif isinstance(handle, CartesianTopologyDescriptor):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment