Fixed init of merged Ramses sim
This commit is contained in:
parent
b2b5c93ad6
commit
1f0d1ee113
@ -23,16 +23,16 @@ class SimulationBare(PySimulationBase):
|
|||||||
def merge(self, other):
|
def merge(self, other):
|
||||||
|
|
||||||
def _safe_merge(a, b):
|
def _safe_merge(a, b):
|
||||||
if b:
|
if b is not None:
|
||||||
if a:
|
if a is not None:
|
||||||
a = [np.append(q, r) for q,r in zip(a,b)]
|
a = [np.append(q, r) for q,r in zip(a,b)]
|
||||||
else:
|
else:
|
||||||
a = b
|
a = b
|
||||||
return a
|
return a
|
||||||
|
|
||||||
def _safe_merge0(a, b):
|
def _safe_merge0(a, b):
|
||||||
if b:
|
if b is not None:
|
||||||
if a:
|
if a is not None:
|
||||||
a = np.append(a, b)
|
a = np.append(a, b)
|
||||||
else:
|
else:
|
||||||
a = b
|
a = b
|
||||||
|
Loading…
Reference in New Issue
Block a user