Fixed init of merged Ramses sim

This commit is contained in:
Guilhem Lavaux 2015-02-10 14:08:33 +01:00
parent b2b5c93ad6
commit 1f0d1ee113

View File

@ -23,16 +23,16 @@ class SimulationBare(PySimulationBase):
def merge(self, other):
def _safe_merge(a, b):
if b:
if a:
if b is not None:
if a is not None:
a = [np.append(q, r) for q,r in zip(a,b)]
else:
a = b
return a
def _safe_merge0(a, b):
if b:
if a:
if b is not None:
if a is not None:
a = np.append(a, b)
else:
a = b