Skip to content
Snippets Groups Projects
Commit a410a0f1 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Merge branch 'revaz/dev' into 'master'

tiny improvements

See merge request !2096
parents e01bea72 95c42c6e
No related branches found
No related tags found
3 merge requests!2112Prep for remix merge,!2109Catching the zoom branch up with master,!2096tiny improvements
...@@ -105,6 +105,16 @@ GRACKLE ...@@ -105,6 +105,16 @@ GRACKLE
GRACKLE cooling is implemented in SWIFT. If you wish to take advantage of it, you GRACKLE cooling is implemented in SWIFT. If you wish to take advantage of it, you
will need it installed. It can be found `here <https://github.com/grackle-project/grackle>`_. will need it installed. It can be found `here <https://github.com/grackle-project/grackle>`_.
.. warning::
(State 2023) Grackle is experiencing current development, and the API is subject
to changes in the future. For convenience, a frozen version is hosted as a fork
on github here: https://github.com/mladenivkovic/grackle-swift .
The version available there will be tried and tested and ensured to work with
SWIFT.
Additionally, that repository hosts files necessary to install that specific
version of grackle with spack.
HEALPix C library HEALPix C library
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
......
...@@ -6,7 +6,7 @@ Basic model (others) ...@@ -6,7 +6,7 @@ Basic model (others)
==================== ====================
Sinks: Simple Bondi-Hoyle accretion Sinks: Simple Bondi-Hoyle accretion
~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The ``Basic`` sink model provides a foundation on which new sink implementations could be built. It includes a prescription for Bondi-Hoyle gas accretion, and a method for sink-sink mergers that is a slightly simplified version of the implementation used in GEAR. The ``Basic`` sink model provides a foundation on which new sink implementations could be built. It includes a prescription for Bondi-Hoyle gas accretion, and a method for sink-sink mergers that is a slightly simplified version of the implementation used in GEAR.
......
...@@ -63,10 +63,14 @@ In order to compile SWIFT with Grackle, you need to provide the options ``with-c ...@@ -63,10 +63,14 @@ In order to compile SWIFT with Grackle, you need to provide the options ``with-c
where ``$GRACKLE_ROOT`` is the root of the install directory (not the ``lib``). where ``$GRACKLE_ROOT`` is the root of the install directory (not the ``lib``).
.. warning:: .. warning::
The actual Grackle version fully supported by SWIFT is 3.2.1. It can be downloaded from (State 2023) Grackle is experiencing current development, and the API is subject
`the official Grackle git repository <https://github.com/grackle-project/grackle/archive/refs/tags/grackle-3.2.1.tar.gz>`_. to changes in the future. For convenience, a frozen version is hosted as a fork
However, this version still had a bug when using threadsafe functions. Alternately, it is possible to get a fixed version on github here: https://github.com/mladenivkovic/grackle-swift .
using `the following fork frozen for compatibility with SWIFT <https://github.com/mladenivkovic/grackle-swift>`_. The version available there will be tried and tested and ensured to work with
SWIFT.
Additionally, that repository hosts files necessary to install that specific
version of grackle with spack.
To compile it, run To compile it, run
......
...@@ -557,7 +557,7 @@ nb3.set_tpe("stars_1") # position expected by swift ...@@ -557,7 +557,7 @@ nb3.set_tpe("stars_1") # position expected by swift
nb4 = nb.select("gas") nb4 = nb.select("gas")
if hydro == 0: if hydro == 0:
nb4.set_tpe("bndry") nb4.set_tpe("stars_1")
nb = nb1 + nb2 + nb3 + nb4 nb = nb1 + nb2 + nb3 + nb4
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment