Merging Cbd abdot branch to dev#125
Merged
Merged
Conversation
…onics) to GW_Discrete instance
…softening instead of hardening-only)
Use time (lookback time) as independent variable instead of binary separation to allow for binary 'softening' (i.e. da/dt > 0). Integrate each binary, one at a time, from initial conditions until either coalescence or redshift zero. Evolution arrays thus are no longer always the same size. Currently evolution arrays are 1D objects, flattened for all binaries, and the appropriate indices are stored (Evolution._last_index). This *seems* to be working (first full implementation). Lots more changes will be needed to allow for interpolation, universe-realization, etc. Its also extremely slow. There are numerous obvious problematic places, e.g. interpolation of CBD_Torques and Dynamical Friction halo relations. Cython could also speed things up a lot, but the issue will be external function calls. Really, this should be a second Evolution class, so that both implementations are preserved for the moment... I'll add the old one back in later.
Collaborator
Author
|
@copilot resolve the merge conflicts in this pull request |
# Conflicts: # notebooks/devs/discrete/accretion.ipynb # notebooks/devs/sams/double-schechter.ipynb # notebooks/librarian.ipynb # notebooks/semi-analytic-models.ipynb Co-authored-by: pranav-satheesh <45477472+pranav-satheesh@users.noreply.github.com>
Resolved the merge conflicts in commit
For each, I kept the |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Merging the updated cbd hardening model to the dev branch
This branch uses an entirely different evolution class:
cEvolutionTodos
Notable points that this PR has either accomplished or will accomplish.
Questions
Status