From d396f5fcad99d3889d74b3a94be128a688775e61 Mon Sep 17 00:00:00 2001 From: Lukas Winkler Date: Sat, 2 Jan 2021 16:38:07 +0100 Subject: [PATCH] fix typo in main_particle --- merge.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/merge.py b/merge.py index 89bd3fb..704ead3 100644 --- a/merge.py +++ b/merge.py @@ -101,7 +101,7 @@ def merge_particles(sim: Simulation, ed: ExtraData): # just called the more massive one the main particle to keep its type/name # Sun<->Protoplanet -> Sun - main_particle = cp1.m if cp1.m > cp2.m else cp2 + main_particle = cp1 if cp1.m > cp2.m else cp2 projectile_wmf = ed.pd(cp1).water_mass_fraction target_wmf = ed.pd(cp2).water_mass_fraction