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

Adding adaptive particle refinement #569

Closed
wants to merge 311 commits into from

Conversation

becnealon
Copy link
Contributor

Type of PR:
new feature

Description:
Adding adaptive particle refinement as described in Nealon and Price submitted.

Testing:
Regular test suite runs, standalone apr test runs as well.

Did you run the bots? yes/no

Did you update relevant documentation in the docs directory? yes/no

Yrisch and others added 30 commits May 17, 2024 11:41
Yrisch and others added 24 commits August 8, 2024 16:17
update to exact integration scheme for radiative cooling
Slow down method and few fixes on the new star formation prescription
(substepping) reverse 0e0cc6d patch on the particle type sent to ptmass_accrete
@danieljprice
Copy link
Owner

danieljprice commented Oct 9, 2024

@becnealon I fixed the merge conflicts here, so this branch is now up-to-date (ie. your branch is only ahead, not behind)

As there are quite a lot of changes and so you retain ownership over the relevant lines of code, please can you run the bots on this branch as per instructions below?

https://phantomsph.readthedocs.io/en/latest/developer-guide/bots.html

@danieljprice
Copy link
Owner

I'm also slightly confused why the merged changes appear like new commits... did history get rewritten here at some point?

@becnealon
Copy link
Contributor Author

becnealon commented Oct 10, 2024 via email

@danieljprice
Copy link
Owner

I think it's ok, if I git diff against master then it shows only your changes, so I think it's all good. Please can you run the bots though ?

@danieljprice
Copy link
Owner

superseded by #595

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.

8 participants