Merge pull request #545 from danieljprice/grdisc-with-stars

set_orbit: Add arbitrary stars on arbitrary orbits; add stars orbiting the black hole to a grdisc simulation; cleanup of SETUP=binary

.github/workflows/krome.yml

@@ -12,6 +12,7 @@ env:
   PREFIX: /usr/local/
   PHANTOM_DIR: ${{ github.workspace }}
   KROMEPATH: ${{ github.workspace }}/krome
+  FC: gfortran  # default if not overwritten by matrix
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -27,10 +28,21 @@ jobs:
             toolchain: {compiler: intel-classic}
 
     steps:
-      - uses: fortran-lang/setup-fortran@v1
+      # Install the Fortran compiler (workaround for broken setup-fortran action on macOS)
+      - name: install Fortran compiler
+        if: matrix.os == 'ubuntu-latest'
+        uses: fortran-lang/setup-fortran@v1
         with:
           compiler: ${{ matrix.toolchain.compiler }}
 
+      - name: install Fortran compiler on macOS
+        if: matrix.os == 'macos-latest'
+        run: brew install gfortran
+
+      #- uses: fortran-lang/setup-fortran@v1
+      #  with:
+      #    compiler: ${{ matrix.toolchain.compiler }}
+
       - name: "Clone phantom"
         uses: actions/checkout@v4
 

.github/workflows/mcfost.yml

@@ -23,9 +23,22 @@ jobs:
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-    - uses: fortran-lang/setup-fortran@v1
-      with:
-         compiler: gcc
+    - name: install gfortran
+      run: brew install gfortran
+
+    - name: soft link gfortran and check version
+      run: |
+        brew link gfortran
+
+    #ls $PREFIX/bin/gfortran-*
+    #ln -s `ls "$PREFIX/bin/gfortran-*" | tail -1` $PREFIX/bin/gfortran
+    #gfortran -v
+
+    - name: Check gfortran version
+      run: gfortran --version
+    #- uses: fortran-lang/setup-fortran@v1
+    #  with:
+    #     compiler: gcc
 
     - name: Check gfortran version
       run: gfortran --version

AUTHORS

@@ -21,52 +21,53 @@ Rebecca Nealon <rebecca.nealon@warwick.ac.uk>
 Elisabeth Borchert <elisabeth.borchert@monash.edu>
 Ward Homan <ward.homan@kuleuven.be>
 Christophe Pinte <christophe.pinte@univ-grenoble-alpes.fr>
+Yrisch <yannbernard13@gmail.com>
 Terrence Tricco <tstricco@mun.ca>
 Stephane Michoulier <stephane.michoulier@gmail.com>
 Simone Ceppi <simo.ceppi@gmail.com>
-Yrisch <yannbernard13@gmail.com>
 Spencer Magnall <spencermagnall@gmail.com>
 Enrico Ragusa <enr.ragusa@gmail.com>
 Caitlyn Hardiman <caitlyn.hardiman1@monash.edu>
 Sergei Biriukov <svbiriukov@gmail.com>
 Cristiano Longarini <cristiano.longarini@unimi.it>
 Giovanni Dipierro <giovanni.dipierro@leicester.ac.uk>
 Roberto Iaconi <robertoiaconi1@gmail.com>
-Amena Faruqi <Amena.Faruqi@warwick.ac.uk>
 Hauke Worpel <hworpel@aip.de>
+Amena Faruqi <Amena.Faruqi@warwick.ac.uk>
 Alison Young <alison.young@ed.ac.uk>
 Stephen Neilson <36410751+s-neilson@users.noreply.github.com>
 Martina Toscani <mtoscani94@gmail.com>
 Benedetta Veronesi <benedetta.veronesi@unimi.it>
-Simon Glover <glover@uni-heidelberg.de>
-Sahl Rowther <sahl.rowther@leicester.ac.uk>
 Thomas Reichardt <thomas.reichardt@students.mq.edu.au>
+Sahl Rowther <sahl.rowther@leicester.ac.uk>
+Simon Glover <glover@uni-heidelberg.de>
 Jean-François Gonzalez <Jean-Francois.Gonzalez@ens-lyon.fr>
 Christopher Russell <crussell@udel.edu>
+Phantom benchmark bot <ubuntu@phantom-benchmarks.novalocal>
+Jolien Malfait <jolien.malfait@kuleuven.be>
 Alex Pettitt <alex@astro1.sci.hokudai.ac.jp>
 Alessia Franchini <alessia.franchini@unlv.edu>
-Jolien Malfait <jolien.malfait@kuleuven.be>
-Phantom benchmark bot <ubuntu@phantom-benchmarks.novalocal>
-Nicole Rodrigues <nicole.rodrigues@monash.edu>
 Kieran Hirsh <kieran.hirsh1@monash.edu>
-Farzana Meru <f.meru@warwick.ac.uk>
+Nicole Rodrigues <nicole.rodrigues@monash.edu>
+Mike Lau <mike.lau@h-its.org>
 Nicolás Cuello <cuello.nicolas@gmail.com>
+Farzana Meru <f.meru@warwick.ac.uk>
 David Trevascus <dtre10@student.monash.edu>
-Mike Lau <mike.lau@h-its.org>
-Miguel Gonzalez-Bolivar <miguelgb@astro.unam.mx>
 Chris Nixon <cjn@leicester.ac.uk>
-Orsola De Marco <orsola.demarco@mq.edu.au>
+Miguel Gonzalez-Bolivar <miguelgb@astro.unam.mx>
 Maxime Lombart <maxime.lombart@ens-lyon.fr>
 Joe Fisher <jwfis1@student.monash.edu>
 Giulia Ballabio <giulia.ballabio2@studenti.unimi.it>
-Benoit Commercon <benoit.commercon@gmail.com>
 Zachary Pellow <zpel1@student.monash.edu>
 s-neilson <36410751+s-neilson@users.noreply.github.com>
-Steven Rieder <steven@rieder.nl>
-Taj Jankovič <taj.jankovic@gmail.com>
-Chunliang Mu <Mclliang7326@outlook.com>
+Benoit Commercon <benoit.commercon@gmail.com>
+Orsola De Marco <orsola.demarco@mq.edu.au>
 MICHOULIER Stephane <smichoulier@sidus11>
-Jorge Cuadra <jcuadra@astro.puc.cl>
+Stéven Toupin <steven.toupin@gmail.com>
+Taj Jankovič <taj.jankovic@gmail.com>
 Cox, Samuel <sc676@leicester.ac.uk>
 Jeremy Smallwood <drjeremysmallwood@gmail.com>
-Stéven Toupin <steven.toupin@gmail.com>
+Hugh Griffiths <hgri0008@student.monash.edu>
+Chunliang Mu <Mclliang7326@outlook.com>
+Jorge Cuadra <jcuadra@astro.puc.cl>
+Steven Rieder <steven@rieder.nl>

build/Makefile

@@ -653,7 +653,7 @@ phantomsetup: setup
 SRCSETUP= prompting.f90 utils_omp.F90 setup_params.f90 \
           set_dust_options.f90 set_units.f90 \
           density_profiles.f90 readwrite_kepler.f90 readwrite_mesa.f90 \
-          set_slab.f90 set_disc.F90 \
+          set_slab.f90 set_disc.F90 set_orbit.f90 \
           set_cubic_core.f90 set_fixedentropycore.f90 set_softened_core.f90 \
           set_star_utils.f90 relax_star.f90 set_star.f90 set_hierarchical.f90 \
           set_vfield.f90 set_Bfield.f90 \

scripts/buildbot.sh

@@ -13,7 +13,7 @@
 #
 # Written by Daniel Price, 2012-2023, daniel.price@monash.edu
 #
-if [ X$SYSTEM == X ]; then
+if [ "X$SYSTEM" == "X" ]; then
    echo "Error: Need SYSTEM environment variable set to check PHANTOM build";
    echo "Usage: $0 [max idim to check] [url]";
    exit;
@@ -77,7 +77,6 @@ listofcomponents='main setup analysis utils';
 # get list of targets, components and setups to check
 #
 allsetups=`grep 'ifeq ($(SETUP)' $phantomdir/build/Makefile_setups | grep -v skip | cut -d, -f 2 | cut -d')' -f 1`
-#allsetups='star'
 setuparr=($allsetups)
 batchsize=$(( ${#setuparr[@]} / $nbatch + 1 ))
 offset=$(( ($batch-1) * $batchsize ))

src/main/checkconserved.f90

@@ -132,10 +132,10 @@ subroutine check_magnetic_stability(hdivBonB_ave,hdivBonB_max)
  real, intent(in) :: hdivBonB_ave,hdivBonB_max
 
  if (hdivBonB_max > 100 .or. hdivBonB_ave > 0.1) then
-   ! Tricco, Price & Bate (2016) suggest the average should remain lower than 0.01,
-   ! but we will increase it here due to the nature of the exiting the code
-   ! The suggestion of 512 was empirically determined in Dobbs & Wurster (2021)
-   call do_not_publish_crap('evolve','h|divb|/b is too large; recommend to increase the overcleanfac')
+    ! Tricco, Price & Bate (2016) suggest the average should remain lower than 0.01,
+    ! but we will increase it here due to the nature of the exiting the code
+    ! The suggestion of 512 was empirically determined in Dobbs & Wurster (2021)
+    call do_not_publish_crap('evolve','h|divb|/b is too large; recommend to increase the overcleanfac')
  endif
 
 end subroutine check_magnetic_stability

src/main/energies.F90

@@ -18,8 +18,8 @@ module energies
 !
 ! :Dependencies: boundary_dyn, centreofmass, dim, dust, eos, eos_piecewise,
 !   externalforces, gravwaveutils, io, kernel, metric_tools, mpiutils,
-!   nicil, options, part, ptmass, timestep, units, utils_gr, vectorutils,
-!   viscosity
+!   nicil, options, part, ptmass, subgroup, timestep, units, utils_gr,
+!   vectorutils, viscosity
 !
  use dim,   only:maxdusttypes,maxdustsmall
  use units, only:utime

src/main/initial.F90

@@ -22,7 +22,7 @@ module initial
 !   krome_interface, linklist, metric_tools, mf_write, mpibalance,
 !   mpidomain, mpimemory, mpitree, mpiutils, nicil, nicil_sup, omputils,
 !   options, part, partinject, porosity, ptmass, radiation_utils,
-!   readwrite_dumps, readwrite_infile, timestep, timestep_ind,
+!   readwrite_dumps, readwrite_infile, subgroup, timestep, timestep_ind,
 !   timestep_sts, timing, tmunu2grid, units, writeheader
 !