Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow a gamma of -3 in error_check #661

Merged
merged 1 commit into from
Aug 13, 2024

Conversation

TomWagg
Copy link
Contributor

@TomWagg TomWagg commented Aug 13, 2024

I missed the check for different allowed gamma values sorry!

@katiebreivik
Copy link
Collaborator

👍

@katiebreivik katiebreivik merged commit 4ef9012 into COSMIC-PopSynth:develop Aug 13, 2024
2 checks passed
@TomWagg TomWagg deleted the fix_gamma branch August 30, 2024 22:37
katiebreivik added a commit that referenced this pull request Sep 11, 2024
* offner22 primary mass dependent binary fraction (#644)

* added offner22 primary mass dependent binary fraction

* pinning numpy version because of new numpy version released on june 16 (https://stackoverflow.com/questions/78634235/numpy-dtype-size-changed-may-indicate-binary-incompatibility-expected-96-from)

* pinned numpy version so 3.7 works

---------

Co-authored-by: katiebreivik <kbreivik@flatironinstitute.org>

* Update utils.py (#648)

* Update utils.py

fix trapezoid import

* Update utils.py

missed one trapz

* version bump and dropping below python3.9 (#653)

* version bump and dropping below python3.9

* forward to numpy 1.26.0

* trying a different version

* fix trapz import

* Update build_wheels_and_publish.yml

explicitly install gcc

* Update build_wheels_and_publish.yml

trying to fix gfortran

* Update build_wheels_and_publish.yml

specifying path with symlink, checking path

* Update build_wheels_and_publish.yml (#654)

* Update build_wheels_and_publish.yml

* Update _version.py

* Update meson.build

* Update pyproject.toml (#655)

* Version bump for pip (#656)

* Update meson.build

* Update _version.py

* Add power law sampling options for ``porb`` and ``q`` (#651)

* add `q_power_law` parameter to change the power law of the mass ratio distribution

* allow custom power laws for orbital periods

* add mass ratio sampling test

* add test for custom porb power laws

* add to changelog

* New ``gamma`` option for circumbinary discs (#652)

* add new gamma prescription, add some int() statements

* add  details to docs page

* update ini files

* * Modifying the init file to include the commit hash. (#659)

*Created get_commit_hash file that finds the commit hash.

*Modified the meson.build file to run get_commit_hash when cosmic is installed.

* Created maximum wall time option (#620)

* Added compression options for pandas

* Created maximum wall time argument

* Add debugging setup, avoid NaNs from timestep issue (#647)

* setup debugging environment

* ignore a bunch of files

* add a testing fortran script

* move debugging to its own folder

* add a python script for creating the input

* add a simple makefile for testing

* important change: use `loop` instead of `1000` for timestep condition

* add a note about settings

* clean up vscode setup

* I can't count 🙃

* added new test suite location

* fixing numpy pinned version

* forcing numpy version I guess

---------

Co-authored-by: katiebreivik <kbreivik@flatironinstitute.org>
Co-authored-by: Katie Breivik <kbreivik@andrew.cmu.edu>

* allow a gamma of -3 in error_check (#661)

* fixing wheel build for pypi, hopefully

* tiny version bump (#665)

* Update _version.py

* Update pyproject.toml

add @TomWagg as dev

* Update meson.build

bump version

* Update build_wheels_and_publish.yml

* Update build_wheels_and_publish.yml

removing gfortran symlink

* Update build_wheels_and_publish.yml

* Update build_wheels_and_publish.yml (#666)

* Update build_wheels_and_publish.yml

* this should be a working build.

* add meson to requirements

* Fixing linux only wheel  (#667)

* Update build_wheels_and_publish.yml

* adding in python versions

* Update build_wheels_and_publish.yml

* Update meson.build

* Update meson.build

* Update pyproject.toml

* Pip fix (#669)

* add DS_Store to ignore

* finalllllly got the platform specific wheels built with a pure: false

* tiny bump in version for tag

* Update build_wheels_and_publish.yml

need to repair linux build with cibuildwheel for PyPI

* Update meson.build

forgot to bump version here

* build wheels and publish fix (#670)

* pins cibuildwheel==2.17.0 so that we can build across macOS versions.
* allow push to pypi

* add x_86 and arch compatibility for wheels (#671)

* Update build_wheels_and_publish.yml

* Update build_wheels_and_publish.yml

* Update meson.build version

* Update _version.py version

* Update pyproject.toml version

* Bump actions/download-artifact from 3 to 4.1.7 in /.github/workflows (#672)

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4.1.7.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](actions/download-artifact@v3...v4.1.7)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: MarkGM02 <90350113+MarkGM02@users.noreply.github.com>
Co-authored-by: Tom Wagg <tomjwagg@gmail.com>
Co-authored-by: elenagonzalez870 <52000594+elenagonzalez870@users.noreply.github.com>
Co-authored-by: Vera Eris Del Favero <77068792+xevra@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants