Kb peri#8
Merged
Merged
Conversation
…OSMIC-PopSynth#770) * Added compression options for pandas * Created maximum wall time argument * added new physics * updated solar wind assumptions different from Vink * fixed wind * changed wind to be fixed * added new WR winds * undid bad decisions * added Chris's ppisn * added weak pisn * created common block variables * worked on block variables * worked on documents * bugfix (issue 698) * Added preSN mass tracking * removed preSN from assign_remnant * Removed preSN from comenv * updated comenv * adding in some tiny modifications that allow cosmic-pop to run; none of these modify the contents of this PR * Worked on adding options to cosmic. * Udated test data and cosmic-settings to fix bug * tiny additions to bump version, add hyperlinks in the docs, and version highlights for new settings * add version addition to PISN -5 * add extra remnant flag descriptions that were missing * remove commit hash; we need to figure this out in a future PR * add in new dummy fryer flags to kick initC table * add version tags and hyperlinks for winds update * update Params.ini --------- Co-authored-by: Vera Delfavero <vera.delfavero.nasa.gov> Co-authored-by: Katie Breivik <kbreivik@andrew.cmu.edu> Co-authored-by: Vera <vdfavero@cita.utoronto.ca> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
…#776) * Updated comenv.f with alpha choice for binding energy * Updated alpha/acclim in const_bse.h * Finished updates for evolv1.f * Finished updates for evolv2.f * Added alpha1/acclim updates to evolve.py * Updated utils.py with alpha1/acc_lim raised ValueError * Updated to have multi alpha1/acc_lim * Fixed issues with acc_lim raised error; test passed when generating/evolving population * Fixed typo in raised ValueError message for alpha * Fixed alpha1 index * Added columns for split alpha1/acclim' * Updated split alpha/acc_lim for docs * tyring to get tests to pass * acutally fixed the tests; needed 0 and 1 not 1 and 2; this is consistent with the metisse-integrate-merge convention * small fix to make the docs look right --------- Co-authored-by: Katie Breivik <kbreivik@andrew.cmu.edu>
github-actions
Bot
added
the
needs-cmc-review
|
🚨 CMC review requested This pull request modifies one or more of:
Trigger: evolve file changed, probably needs CMC review A CMC developer should review this PR to ensure corresponding changes are propagated upstream as needed. |
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
4 participants
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.
bumping the version and fixing some merge conflicts that came up due to previous merges.