Code

Cbd abdot#101

Code

Open

mssiwek wants to merge 82 commits intodevnanograv/holodeck:devfrom cbd_abdotnanograv/holodeck:cbd_abdotCopy head branch name to clipboard

+3,262-253

Commits

Commits on Jun 21, 2023

• local changes

  mssiwek

  committed
  ef11e8d

  Copy full SHA for ef11e8d

• Merge branch 'dev' of https://github.com/nanograv/holodeck into cbd_abdot

  mssiwek

  committed
  5536e99

  Copy full SHA for 5536e99

Commits on Jul 5, 2023

• Merge branch 'dev' of https://github.com/nanograv/holodeck into cbd_abdot

  mssiwek

  committed
  f0f1376

  Copy full SHA for f0f1376

Commits on Jul 12, 2023

• notebooks

  mssiwek

  committed
  075b742

  Copy full SHA for 075b742

• Merge branch 'dev' of https://github.com/nanograv/holodeck into cbd_abdot

  mssiwek

  committed
  1f2983a

  Copy full SHA for 1f2983a

• Eddington limited accretion

  mssiwek

  committed
  ec911fb

  Copy full SHA for ec911fb

• add separation and eccentricity to sample_universe

  mssiwek

  committed
  f998954

  Copy full SHA for f998954

Commits on Jul 17, 2023

• interpolating eccentricity in sample_universe

  mssiwek

  committed
  e371e15

  Copy full SHA for e371e15

• Merge branch 'dev' of https://github.com/nanograv/holodeck into cbd_abdot

  mssiwek

  committed
  649a452

  Copy full SHA for 649a452

Commits on Jul 20, 2023

• fixed bug in utils.trapz()

  mssiwek

  committed
  f666fa1

  Copy full SHA for f666fa1

• notebook changes?

  mssiwek

  committed
  fcbb53f

  Copy full SHA for fcbb53f

• Merge branch 'dev' of https://github.com/nanograv/holodeck into cbd_abdot

  mssiwek

  committed
  71c61e9

  Copy full SHA for 71c61e9

Commits on Aug 7, 2023

• documentation in samples

  mssiwek

  committed
  d980e73

  Copy full SHA for d980e73

• merge conflict

  mssiwek

  committed
  a910f28

  Copy full SHA for a910f28

• Merge branch 'cbd_abdot' of https://github.com/nanograv/holodeck into cbd_abdot

  mssiwek

  committed
  b7ff13b

  Copy full SHA for b7ff13b

• merge conflict with dev

  mssiwek

  committed
  e9938ee

  Copy full SHA for e9938ee

Commits on Sep 1, 2023

• add evol_mass switch in accretion, and add dadt,dedt in sample_universe

  mssiwek

  committed
  6377966

  Copy full SHA for 6377966

• Merge branch 'dev' of https://github.com/nanograv/holodeck into cbd_abdot

  mssiwek

  committed
  f0522ac

  Copy full SHA for f0522ac

• notebook to check effect of cbd on gwb

  mssiwek

  committed
  f890878

  Copy full SHA for f890878

• Comment out old warning - dont think its still relevant

  lzkelley

  committed
  0997bdf

  Copy full SHA for 0997bdf

• Add LZK version of notebook for messing around with stuff

  lzkelley

  committed
  97fb6ac

  Copy full SHA for 97fb6ac

Commits on Sep 4, 2023

• Cleanup '_gws_harmonics_at_evo_fobs' method, store 'harms' (hc^2 harmonics) to GW_Discrete instance

  lzkelley

  committed
  4c10550

  Copy full SHA for 4c10550

Commits on Sep 22, 2023

• fixed bug due to mass being updated AFTER calculating dadt for timestep

  mssiwek

  committed
  e78182f

  Copy full SHA for e78182f

• switch to include dfdt_mdot

  mssiwek

  committed
  f142b54

  Copy full SHA for f142b54

• switch to include dfdt_mdot in utils.py

  mssiwek

  committed
  1b2becc

  Copy full SHA for 1b2becc

• fixed DF attenuation

  mssiwek

  committed
  335fa7f

  Copy full SHA for 335fa7f

• merge conflict resolved

  mssiwek

  committed
  99fea98

  Copy full SHA for 99fea98

Commits on Sep 25, 2023

• Add a flag to CBD_Torques to turn on/off positive da/dt values (i.e. softening instead of hardening-only)

  lzkelley

  committed
  40a8129

  Copy full SHA for 40a8129

• Add (stern) warning when using attenuate=False in dynamical friction

  lzkelley

  committed
  b872486

  Copy full SHA for b872486

Commits on Sep 26, 2023

• Complete re-write of Evolution class integration method.

  Show description for 71a43e3
  lzkelley

  committed
  71a43e3

  Copy full SHA for 71a43e3

• BUG: fix cython issue with new cython version

  lzkelley

  committed
  3283e3c

  Copy full SHA for 3283e3c

• Store all hardening rates, dont go past ISCO, cleanup

  lzkelley

  committed
  961c11e

  Copy full SHA for 961c11e

Commits on Sep 27, 2023

• Add new cython module for performing interpolation of new discrete population structure

  lzkelley

  committed
  45644d9

  Copy full SHA for 45644d9

• Debugging and development tweaks

  lzkelley

  committed
  3b1c1a7

  Copy full SHA for 3b1c1a7

• dfdt with accretion

  mssiwek

  committed
  f84dacc

  Copy full SHA for f84dacc

Commits on Sep 28, 2023

• Add formal tests for discrete_cyutils.interp_at_fobs --- currently working.

  Show description for 753aebf
  lzkelley

  committed
  753aebf

  Copy full SHA for 753aebf

• Restore the old version of 'Evolution' and add 'New_Evolution' along side it, with the new-style of integration.

  Show description for 1cde72f
  lzkelley

  committed
  1cde72f

  Copy full SHA for 1cde72f

• notebooks

  mssiwek

  committed
  b85185e

  Copy full SHA for b85185e

• merge conflict in notebook resolved

  mssiwek

  committed
  e595e63

  Copy full SHA for e595e63

• no need to set mdot=0 at >1.e5pc separations

  mssiwek

  committed
  bdfb798

  Copy full SHA for bdfb798

• initialize self.mdot=0 whether or not we use accretion, otherwise stuff breaks

  mssiwek

  committed
  91b6ccb

  Copy full SHA for 91b6ccb

• Cleanup

  lzkelley

  committed
  6fd92e2

  Copy full SHA for 6fd92e2

• INCOMPLETE: implement GW calculation in New_Evolution

  lzkelley

  committed
  6030e58

  Copy full SHA for 6030e58

Commits on Sep 29, 2023

• Continue implementing GWB calculation in New_Evolution.

  Show description for 54c1356
  lzkelley

  committed
  54c1356

  Copy full SHA for 54c1356

• make accretion.py compatible with both new and old evo

  mssiwek

  committed
  3b5093c

  Copy full SHA for 3b5093c

• evolution compatible with old/new evo, fixed mass switching issue in take_next_step

  mssiwek

  committed
  e397a60

  Copy full SHA for e397a60

• hardening compatible with new/old evo

  mssiwek

  committed
  ca30430

  Copy full SHA for ca30430

• m1m2 order for both evo classes, output change in velocity_orbital

  mssiwek

  committed
  cfd4ad1

  Copy full SHA for cfd4ad1

• new tests and changes in notebooks

  mssiwek

  committed
  b7f1eba

  Copy full SHA for b7f1eba

• GW calculation with New_Evolution seems to be working

  lzkelley

  committed
  9a0d022

  Copy full SHA for 9a0d022

Commits on Sep 30, 2023

• Merge remote-tracking branch 'origin/cbd_abdot' into manual-merge

  Show description for 327028f
  lzkelley

  committed
  327028f

  Copy full SHA for 327028f

• Implement dfdt_mdot into New_Evolution

  lzkelley

  committed
  6bd2cfc

  Copy full SHA for 6bd2cfc

Commits on Oct 2, 2023

• changes in notebook

  mssiwek

  committed
  479eb61

  Copy full SHA for 479eb61

• Merge branch 'dev_discrete-time-based-evo' of https://github.com/nanograv/holodeck into cbd_abdot

  mssiwek

  committed
  c687df2

  Copy full SHA for c687df2

Commits on Oct 5, 2023

• add ebeq function and move interpolation and pkl loading to init

  mssiwek

  committed
  c68d862

  Copy full SHA for c68d862

• cfl condition for eccentricity evolution, add nsteps and cfl as parameters in evolution init

  mssiwek

  committed
  4130229

  Copy full SHA for 4130229

• move interp and pkl.load to init

  mssiwek

  committed
  28053d2

  Copy full SHA for 28053d2

• BUG: no 'bool' in cython, cast to int before passing

  lzkelley

  committed
  2862cc8

  Copy full SHA for 2862cc8

• Merge branch 'cbd_abdot' into dev_discrete-time-based-evo

  Show description for f4737c5
  lzkelley

  committed
  f4737c5

  Copy full SHA for f4737c5

• commenting out eccen cfl

  mssiwek

  committed
  ada4712

  Copy full SHA for ada4712

• Merge branch 'cbd_abdot' of https://github.com/nanograv/holodeck into cbd_abdot

  mssiwek

  committed
  b5c8107

  Copy full SHA for b5c8107

Commits on Oct 6, 2023

• Interpolate mdot in New_Evolution

  lzkelley

  committed
  d6bedcd

  Copy full SHA for d6bedcd

• Merge branch 'cbd_abdot' of https://github.com/nanograv/holodeck into cbd_abdot

  mssiwek

  committed
  30be4b0

  Copy full SHA for 30be4b0

• BUG: fix shape issue with mdot GWB calculation; update speed-test-cbd script for New_Evolution

  lzkelley

  committed
  0410222

  Copy full SHA for 0410222

• Merge branch 'cbd_abdot' of https://github.com/nanograv/holodeck into cbd_abdot

  mssiwek

  committed
  2617303

  Copy full SHA for 2617303

• BUG

  lzkelley

  committed
  744e214

  Copy full SHA for 744e214

• DF stops at 10pc

  mssiwek

  committed
  4e61d92

  Copy full SHA for 4e61d92

• pre-calculating tables for df

  mssiwek

  committed
  0241c8f

  Copy full SHA for 0241c8f

• Merge branch 'cbd_abdot' of https://github.com/nanograv/holodeck into cbd_abdot

  mssiwek

  committed
  1b1b064

  Copy full SHA for 1b1b064

• revert to previous interpolation due to bug in pre-calculated values

  mssiwek

  committed
  32f1329

  Copy full SHA for 32f1329

Commits on Oct 11, 2023

• interpolate pre-calculated tables for DF

  mssiwek

  committed
  31a8435

  Copy full SHA for 31a8435

• removed a printf

  mssiwek

  committed
  f093682

  Copy full SHA for f093682

• added sample_universe calculation

  mssiwek

  committed
  0c8b73b

  Copy full SHA for 0c8b73b

• skip df hardening for sub-parsec binaries

  mssiwek

  committed
  f0ffd7e

  Copy full SHA for f0ffd7e

• replace np.digitize with data_fobs[interp_idx]

  mssiwek

  committed
  e46aa10

  Copy full SHA for e46aa10

• debug dfdt_mdot

  mssiwek

  committed
  a696637

  Copy full SHA for a696637

Commits on Jan 19, 2024

• absolute value of dfdt when softening happens

  mssiwek

  committed
  b1c0bbb

  Copy full SHA for b1c0bbb

Commits on Jan 23, 2024

• DOCS: minor notes and cleanup

  lzkelley

  committed
  7f746d8

  Copy full SHA for 7f746d8

Commits on Feb 19, 2024

• take absolute dlnf values for floars or arr

  mssiwek

  committed
  8b1f2a1

  Copy full SHA for 8b1f2a1

• merge conflict

  mssiwek

  committed
  b26b848

  Copy full SHA for b26b848

• merge

  mssiwek

  committed
  96b4d69

  Copy full SHA for 96b4d69

• step is now a required argument

  mssiwek

  committed
  ab1906a

  Copy full SHA for ab1906a