Add interface to AMUSE #10
Closed
Conversation
This file contains 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
- remove functions previously used for testing - comment out function with conflicting name - add AMUSE ifndef to prevent I/O when using AMUSE - Add helper function to calculate dt (adapted from step)
# Conflicts: # src/main/initial.F90
- no units should be added, as all values will already be in code units - can now delete particles - detect high densities unless it's the first step in an evolve loop [skip ci]
*: AMUSE defaults will override this. [skip ci]
Regular particles (gas, dm, ...) will receive a positive ID, while ptmass particles (sinks) will receive a negative ID. This ID is not used in Phantom, but only by AMUSE (or anything else that would use these subroutines) [skip ci]
[skip ci]
[skip ci]
[skip ci]
[skip ci]
|
I will try to run the full nightly build on this, so then we should be able to merge automatically |
|
Ok. I will try to merge upstream changes back in soon.
|
Set some different defaults and make sure defaults are set after initialising so they aren't overwritten
todo: make this changeable from AMUSE
# Conflicts: # src/main/eos.F90 # src/utils/libphantom-evolve.F90
update from main
# Conflicts: # src/main/initial.F90
# Conflicts: # .github/workflows/benchmarks.yml # .github/workflows/build.yml # .github/workflows/mpi.yml # .github/workflows/release.yml # .github/workflows/test.yml # build/Makefile
# Conflicts: # src/utils/libphantom-evolve.F90
# Conflicts: # src/main/initial.F90 # src/utils/libphantom-evolve.F90
|
@danieljprice another project and Covid got me "a bit" delayed merging upstream changes back into this branch (:, but I've done so now. I would still like to see if we can merge this back into the main branch in some form. |
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.
Changes to libphantom for the AMUSE interface (work in progress)