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 <[email protected]>
 Elisabeth Borchert <[email protected]>
 Ward Homan <[email protected]>
 Christophe Pinte <[email protected]>
+Yrisch <[email protected]>
 Terrence Tricco <[email protected]>
 Stephane Michoulier <[email protected]>
 Simone Ceppi <[email protected]>
-Yrisch <[email protected]>
 Spencer Magnall <[email protected]>
 Enrico Ragusa <[email protected]>
 Caitlyn Hardiman <[email protected]>
 Sergei Biriukov <[email protected]>
 Cristiano Longarini <[email protected]>
 Giovanni Dipierro <[email protected]>
 Roberto Iaconi <[email protected]>
-Amena Faruqi <[email protected]>
 Hauke Worpel <[email protected]>
+Amena Faruqi <[email protected]>
 Alison Young <[email protected]>
 Stephen Neilson <[email protected]>
 Martina Toscani <[email protected]>
 Benedetta Veronesi <[email protected]>
-Simon Glover <[email protected]>
-Sahl Rowther <[email protected]>
 Thomas Reichardt <[email protected]>
+Sahl Rowther <[email protected]>
+Simon Glover <[email protected]>
 Jean-François Gonzalez <[email protected]>
 Christopher Russell <[email protected]>
+Phantom benchmark bot <[email protected]>
+Jolien Malfait <[email protected]>
 Alex Pettitt <[email protected]>
 Alessia Franchini <[email protected]>
-Jolien Malfait <[email protected]>
-Phantom benchmark bot <[email protected]>
-Nicole Rodrigues <[email protected]>
 Kieran Hirsh <[email protected]>
-Farzana Meru <[email protected]>
+Nicole Rodrigues <[email protected]>
+Mike Lau <[email protected]>
 Nicolás Cuello <[email protected]>
+Farzana Meru <[email protected]>
 David Trevascus <[email protected]>
-Mike Lau <[email protected]>
-Miguel Gonzalez-Bolivar <[email protected]>
 Chris Nixon <[email protected]>
-Orsola De Marco <[email protected]>
+Miguel Gonzalez-Bolivar <[email protected]>
 Maxime Lombart <[email protected]>
 Joe Fisher <[email protected]>
 Giulia Ballabio <[email protected]>
-Benoit Commercon <[email protected]>
 Zachary Pellow <[email protected]>
 s-neilson <[email protected]>
-Steven Rieder <[email protected]>
-Taj Jankovič <[email protected]>
-Chunliang Mu <[email protected]>
+Benoit Commercon <[email protected]>
+Orsola De Marco <[email protected]>
 MICHOULIER Stephane <smichoulier@sidus11>
-Jorge Cuadra <[email protected]>
+Stéven Toupin <[email protected]>
+Taj Jankovič <[email protected]>
 Cox, Samuel <[email protected]>
 Jeremy Smallwood <[email protected]>
-Stéven Toupin <[email protected]>
+Hugh Griffiths <[email protected]>
+Chunliang Mu <[email protected]>
+Jorge Cuadra <[email protected]>
+Steven Rieder <[email protected]>

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, [email protected]
 #
-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
 !