Code

Sinks can now merge#172

Code

Merged

danieljprice merged 11 commits intodanieljprice:masterdanieljprice/phantom:masterfrom jameswurster:masterjameswurster/phantom:masterCopy head branch name to clipboardSep 23, 2021

+541-133

Commits

Commits on Sep 3, 2021

• added option to merge sink particles

  jameswurster

  committed
  3af9a1c

  Copy full SHA for 3af9a1c

• (force) bug fix

  jameswurster

  committed
  bfd67fb

  Copy full SHA for bfd67fb

Commits on Sep 7, 2021

• (random) will reset second seed if first seed is negative; necessary for reproducibility in test suite

  jameswurster

  committed
  0d1bcb7

  Copy full SHA for 0d1bcb7

• (readwrite) formated sink-related print statement

  jameswurster

  committed
  907d872

  Copy full SHA for 907d872

• (ptmass) bug fixes in merger algorithm

  jameswurster

  committed
  82befdc

  Copy full SHA for 82befdc

• (test_ptmass) added a new merger test

  jameswurster

  committed
  ac7e227

  Copy full SHA for ac7e227

Commits on Sep 9, 2021

• (test_ptmass) removed commented out text

  jameswurster

  committed
  f676f68

  Copy full SHA for f676f68

• (ptmass) debugged angular momentum conservation in merger

  jameswurster

  committed
  a08ee2f

  Copy full SHA for a08ee2f

Commits on Sep 13, 2021

• Merge remote-tracking branch 'upstream/master'

  jameswurster

  committed
  9643772

  Copy full SHA for 9643772

Commits on Sep 17, 2021

• (cooling) added comments since there appears to be three independent temperature floors

  jameswurster

  committed
  64691b3

  Copy full SHA for 64691b3

Commits on Sep 22, 2021

• (analysis_common_envelope) bug fix

  jameswurster

  committed
  f71baee

  Copy full SHA for f71baee