Merge pull request #485 from danieljprice/test-suite-issues

fix slow test suite issue #484 + minor cleanups

.github/workflows/mpi.yml

@@ -19,7 +19,7 @@ jobs:
           - yes
         ntasks:
           - 1
-          - 4
+          - 2
         input: # [SETUP, phantom_tests]
           - ['test', '']
           - ['testkd', '']
@@ -43,7 +43,7 @@ jobs:
 
     env:
       OMP_STACKSIZE: 512M
-      OMP_NUM_THREADS: 4
+      OMP_NUM_THREADS: 2
 
     steps:
 

.mailmap

@@ -21,12 +21,13 @@ Rebecca Nealon <rebecca.nealon@warwick.ac.uk> Nealon <rln12@ph-tag-pgr1.uol.le.a
 Alex Pettitt <alex@astro1.sci.hokudai.ac.jp> Alex <alex@astro1.sci.hokudai.ac.jp>
 Alex Pettitt <alex@astro1.sci.hokudai.ac.jp> <alex@astro.ex.ac.uk>
 Alex Pettitt <alex@astro1.sci.hokudai.ac.jp> <alexpettitt@Izanagi.local>
-Terrence Tricco <ttricco@cita.utoronto.ca>
-<ttricco@cita.utoronto.ca> <ttricco@astro.ex.ac.uk>
-<ttricco@cita.utoronto.ca> <tricco@solo.(none)>
-<ttricco@cita.utoronto.ca> <tricco@rin.(none)>
-<ttricco@cita.utoronto.ca> <ttricco@g2.hpc.swin.edu.au>
-<ttricco@cita.utoronto.ca> <terrence.tricco@monash.edu>
+<tstricco@mun.ca> <ttricco@cita.utoronto.ca>
+<tstricco@mun.ca> <ttricco@astro.ex.ac.uk>
+<tstricco@mun.ca> <tricco@solo.(none)>
+<tstricco@mun.ca> <tricco@rin.(none)>
+<tstricco@mun.ca> <ttricco@g2.hpc.swin.edu.au>
+<tstricco@mun.ca> <terrence.tricco@monash.edu>
+Terrence Tricco <tstricco@mun.ca> <ttricco@cita.utoronto.ca> 
 James Wurster <jhw5@st-andrews.ac.uk> James Wurster <j.wurster@exeter.ac.uk>
 James Wurster <jhw5@st-andrews.ac.uk> jameswurster <jameswurster@bitbucket.org>
 James Wurster <jhw5@st-andrews.ac.uk> jameswurster <james.wurster@monash.edu>
@@ -46,12 +47,12 @@ Stéven Toupin <steven.toupin@gmail.com> stoupin <devnull@localhost>
 Guillaume Laibe <guillaume.laibe@gmail.com> glaibe <guillaume.laibe@monash.edu>
 Guillaume Laibe <guillaume.laibe@gmail.com> glaibe <guillaume.laibe@gmail.com>
 Alice Cerioli <alice.cerioli@gmail.com> ALICE CERIOLI <alice.cerioli@gmail.com>
+Alice Cerioli <alice.cerioli@gmail.com> <alice.cerioli@atlfarm014.mi.infn.it>
 Thomas Reichardt <thomas.reichardt@students.mq.edu.au>
 Thomas Reichardt <thomas.reichardt@students.mq.edu.au> Thomas  Reichardt <tr@science.mq.edu.au>
 Thomas Reichardt <thomas.reichardt@students.mq.edu.au> Mr Thomas Reichardt <mq42458269@science.mq.edu.au>
 Roberto Iaconi <riaconi@science.mq.edu.au> Roberto Iaconi <rxi552@raijin6.(none)>
 Roberto Iaconi <riaconi@science.mq.edu.au> Roberto Iaconi <roberto.iaconi@students.mq.edu.au>
-Alice Cerioli <alice.cerioli@gmail.com> <alice.cerioli@atlfarm014.mi.infn.it>
 Daniel Mentiplay <daniel.mentiplay@protonmail.com> <daniel.mentiplay@monash.edu>
 Daniel Mentiplay <daniel.mentiplay@protonmail.com> <d.mentiplay@gmail.com>
 Daniel Mentiplay <daniel.mentiplay@protonmail.com> <dmentipl@g2.hpc.swin.edu.au>
@@ -85,8 +86,13 @@ Fangyi (Fitz) Hu <fhuu0005@student.monash.edu> Fitz-Hu <54089891+Fitz-Hu@users.n
 Fangyi (Fitz) Hu <fhuu0005@student.monash.edu> root <root@Heartie的小电脑.localdomain>
 Fangyi (Fitz) Hu <fhuu0005@student.monash.edu> root <root@Heartie的小电脑.localdomain>
 Fangyi (Fitz) Hu <fhuu0005@student.monash.edu> fitzHu <54089891+Fitz-Hu@users.noreply.github.com>
+Fangyi (Fitz) Hu <fhuu0005@student.monash.edu> Fitz Hu <fhuu0005@student.monash.edu>
+Fangyi (Fitz) Hu <fhuu0005@student.monash.edu> fhu <fhuu0005@student.monash.edu>
 Megha Sharma <msha0023@student.monash.edu> Megha Sharma <40732335+msha0023@users.noreply.github.com>
 Megha Sharma <msha0023@student.monash.edu> megha sharma <rem.shiku@gmail.com>
+Megha Sharma <msha0023@student.monash.edu> Megha Sharma <megha@dyn-49-127-43-125.its.monash.edu.au>
+Megha Sharma <msha0023@student.monash.edu> Megha Sharma <megha@meghas-air.home>
+Megha Sharma <msha0023@student.monash.edu> Megha Sharma <megha.sharma@monash.edu> 
 Mike Lau <mike.lau@monash.edu> Mike Lau <55525335+themikelau@users.noreply.github.com>
 Elisabeth Borchert <elisabeth.borchert@monash.edu> emborchert <69176538+emborchert@users.noreply.github.com>
 Ward Homan <ward.homan@kuleuven.be> ward <ward@leda.ster.kuleuven.be>
@@ -103,3 +109,9 @@ Sahl Rowther <sahl.rowther@leicester.ac.uk> <sr627@spectre11.cm.cluster>
 Sahl Rowther <sahl.rowther@leicester.ac.uk> sahl95 <sahl_rs@yahoo.com>
 Caitlyn Hardiman <caitlyn.hardiman1@monash.edu> caitlynhardiman <72479852+caitlynhardiman@users.noreply.github.com>
 Amena Faruqi <Amena.Faruqi@warwick.ac.uk> <42060670+amenafaruqi@users.noreply.github.com>
+Amena Faruqi <Amena.Faruqi@warwick.ac.uk> Amena Faruqi <afaruqi.97@gmail.com>
+Alison Young <alison.young@ed.ac.uk> Alison Young <ayoung@astro.ex.ac.uk>
+Simone Ceppi <simo.ceppi@gmail.com> Simone Ceppi <simone.ceppi@unimi.it>
+Mats Esseldeurs <matsesseldeurs@yahoo.com> mats esseldeurs <matse@naos.ster.kuleuven.be>
+Mats Esseldeurs <matsesseldeurs@yahoo.com> MatsEsseldeurs <matsesseldeurs@yahoo.com>
+Nicolás Cuello <cuello.nicolas@gmail.com> Nicolas Cuello <cuellonicolas@gmail.com>

AUTHORS

@@ -11,68 +11,56 @@ Conrad Chan <conradchan@hotmail.com.au>
 James Wurster <jhw5@st-andrews.ac.uk>
 David Liptai <dliptai@swin.edu.au>
 Lionel Siess <lionel.siess@astro.ulb.ac.be>
+Fangyi (Fitz) Hu <fhuu0005@student.monash.edu>
 Daniel Mentiplay <daniel.mentiplay@protonmail.com>
+Megha Sharma <msha0023@student.monash.edu>
 Arnaud Vericel <arnaud.vericel@univ-lyon1.fr>
 Mark Hutchison <markahutch@gmail.com>
-Fitz Hu <fhuu0005@student.monash.edu>
-Megha Sharma <megha.sharma@monash.edu>
+Mats Esseldeurs <matsesseldeurs@yahoo.com>
 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>
-Fangyi (Fitz) Hu <fhuu0005@student.monash.edu>
-Megha Sharma <msha0023@student.monash.edu>
-Terrence Tricco <ttricco@cita.utoronto.ca>
-Mats Esseldeurs <matsesseldeurs@yahoo.com>
+Terrence Tricco <tstricco@mun.ca>
+Simone Ceppi <simo.ceppi@gmail.com>
 Stephane Michoulier <stephane.michoulier@gmail.com>
-Simone Ceppi <simone.ceppi@unimi.it>
-MatsEsseldeurs <matsesseldeurs@yahoo.com>
+Spencer Magnall <spencermagnall@gmail.com>
 Caitlyn Hardiman <caitlyn.hardiman1@monash.edu>
 Enrico Ragusa <enr.ragusa@gmail.com>
-Spencer Magnall <spencermagnall@gmail.com>
-fhu <fhuu0005@student.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>
 Hauke Worpel <hworpel@aip.de>
+Amena Faruqi <Amena.Faruqi@warwick.ac.uk>
 Alison Young <alison.young@ed.ac.uk>
-Simone Ceppi <simo.ceppi@gmail.com>
-Amena Faruqi <afaruqi.97@gmail.com>
 Stephen Neilson <36410751+s-neilson@users.noreply.github.com>
 Martina Toscani <mtoscani94@gmail.com>
 Benedetta Veronesi <benedetta.veronesi@unimi.it>
 Sahl Rowther <sahl.rowther@leicester.ac.uk>
-Simon Glover <glover@uni-heidelberg.de>
 Thomas Reichardt <thomas.reichardt@students.mq.edu.au>
+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>
 Alessia Franchini <alessia.franchini@unlv.edu>
 Alex Pettitt <alex@astro1.sci.hokudai.ac.jp>
-Jolien Malfait <jolien.malfait@kuleuven.be>
-Phantom benchmark bot <ubuntu@phantom-benchmarks.novalocal>
-Kieran Hirsh <kieran.hirsh1@monash.edu>
 Nicole Rodrigues <nicole.rodrigues@monash.edu>
-Amena Faruqi <Amena.Faruqi@warwick.ac.uk>
-David Trevascus <dtre10@student.monash.edu>
+Kieran Hirsh <kieran.hirsh1@monash.edu>
+Nicolás Cuello <cuello.nicolas@gmail.com>
 Farzana Meru <f.meru@warwick.ac.uk>
+David Trevascus <dtre10@student.monash.edu>
 Chris Nixon <cjn@leicester.ac.uk>
-Megha Sharma <megha@meghas-air.home>
-Nicolas Cuello <cuellonicolas@gmail.com>
-Benoit Commercon <benoit.commercon@gmail.com>
 Giulia Ballabio <giulia.ballabio2@studenti.unimi.it>
-Joe Fisher <jwfis1@student.monash.edu>
+Miguel Gonzalez-Bolivar <miguelgb@astro.unam.mx>
 Maxime Lombart <maxime.lombart@ens-lyon.fr>
-Megha Sharma <megha@dyn-49-127-43-125.its.monash.edu.au>
+Benoit Commercon <benoit.commercon@gmail.com>
 Orsola De Marco <orsola.demarco@mq.edu.au>
-Terrence Tricco <tstricco@mun.ca>
-Zachary Pellow <zpel1@student.monash.edu>
+Joe Fisher <jwfis1@student.monash.edu>
 s-neilson <36410751+s-neilson@users.noreply.github.com>
-Alison Young <ayoung@astro.ex.ac.uk>
+Zachary Pellow <zpel1@student.monash.edu>
 Cox, Samuel <sc676@leicester.ac.uk>
-Jorge Cuadra <jcuadra@astro.puc.cl>
-Miguel Gonzalez-Bolivar <miguelgb@astro.unam.mx>
-Nicolás Cuello <cuello.nicolas@gmail.com>
 Steven Rieder <steven@rieder.nl>
 Stéven Toupin <steven.toupin@gmail.com>
-mats esseldeurs <matse@naos.ster.kuleuven.be>
+Jorge Cuadra <jcuadra@astro.puc.cl>

build/Makefile_defaults_gfortran

@@ -12,7 +12,7 @@
 #  endif
 #
 FC= gfortran
-FFLAGS+= -O3 -Wall -Wno-unused-dummy-argument -frecord-marker=4 -gdwarf-2 \
+FFLAGS+= -O3 -Wall -Wno-unused-dummy-argument -frecord-marker=4 -g \
         -finline-functions-called-once -finline-limit=1500 -funroll-loops -ftree-vectorize \
         -std=f2008 -fall-intrinsics
 DBLFLAG= -fdefault-real-8 -fdefault-double-8

src/main/config.F90

@@ -277,7 +277,7 @@ module dim
  logical, parameter :: nr = .true.
 #else
  logical, parameter :: nr = .false.
-#endif  
+#endif
 
 !--------------------
 ! Supertimestepping

src/main/extern_gr.F90

@@ -14,8 +14,7 @@ module extern_gr
 !
 ! :Runtime parameters: None
 !
-! :Dependencies: eos, fastmath, io, metric_tools, part, physcon, timestep,
-!   utils_gr
+! :Dependencies: eos, io, metric_tools, part, physcon, timestep, utils_gr
 !
  implicit none
 
@@ -87,22 +86,22 @@ subroutine dt_grforce(xyzh,fext,dtf)
  real, intent(out) :: dtf
  real :: r,r2,dtf1,dtf2,f2i
  integer, parameter :: steps_per_orbit = 100
- 
+
  f2i = fext(1)*fext(1) + fext(2)*fext(2) + fext(3)*fext(3)
- if (f2i > 0.) then 
-   dtf1 = sqrt(xyzh(4)/sqrt(f2i)) ! This is not really accurate since fi is a component of dp/dt, not da/dt
+ if (f2i > 0.) then
+    dtf1 = sqrt(xyzh(4)/sqrt(f2i)) ! This is not really accurate since fi is a component of dp/dt, not da/dt
  else
-   dtf1 = huge(dtf1)
+    dtf1 = huge(dtf1)
  endif
 
  select case (imetric)
  case (imet_schwarzschild,imet_kerr)
     r2   = xyzh(1)*xyzh(1) + xyzh(2)*xyzh(2) + xyzh(3)*xyzh(3)
     r    = sqrt(r2)
     dtf2 = (2.*pi*sqrt(r*r2))/steps_per_orbit
- case default 
+ case default
     dtf2 = huge(dtf2)
- end select 
+ end select
 
  dtf = min(dtf1,dtf2)
 

src/main/initial.F90

@@ -16,13 +16,14 @@ module initial
 !
 ! :Dependencies: analysis, boundary, boundary_dyn, centreofmass,
 !   checkconserved, checkoptions, checksetup, cons2prim, cooling, cpuinfo,
-!   damping, densityforce, deriv, dim, dust, dust_formation, energies, eos,
-!   evwrite, extern_gr, externalforces, fastmath, fileutils, forcing,
-!   growth, inject, io, io_summary, krome_interface, linklist,
-!   metric_tools, mf_write, mpibalance, mpidomain, mpimemory, mpitree,
-!   mpiutils, nicil, nicil_sup, omputils, options, part, partinject,
-!   ptmass, radiation_utils, readwrite_dumps, readwrite_infile, timestep,
-!   timestep_ind, timestep_sts, timing, units, writeheader
+!   damping, densityforce, deriv, dim, dust, dust_formation,
+!   einsteintk_utils, energies, eos, evwrite, extern_gr, externalforces,
+!   fastmath, fileutils, forcing, growth, inject, io, io_summary,
+!   krome_interface, linklist, metric_tools, mf_write, mpibalance,
+!   mpidomain, mpimemory, mpitree, mpiutils, nicil, nicil_sup, omputils,
+!   options, part, partinject, ptmass, radiation_utils, readwrite_dumps,
+!   readwrite_infile, timestep, timestep_ind, timestep_sts, timing,
+!   tmunu2grid, units, writeheader
 !
 
  implicit none

src/main/inject_windtunnel.f90

@@ -9,14 +9,19 @@ module inject
 ! Handles injection for gas sphere in wind tunnel
 !
 !
+! :References: None
+!
 ! :Owner: Mike Lau
 !
 ! :Runtime parameters:
-!   - lattice_type     : *0: cubic distribution, 1: closepacked distribution*
-!   - handled_layers   : *(integer) number of handled BHL wind layers*
-!   - v_inf            : *BHL wind speed*
-!   - Rstar            : *BHL star radius (in accretion radii)*
 !   - BHL_radius       : *radius of the wind cylinder (in star radii)*
+!   - Rstar            : *sphere radius (code units)*
+!   - handled_layers   : *(integer) number of handled BHL wind layers*
+!   - lattice_type     : *0: cubic distribution, 1: closepacked distribution*
+!   - nstar            : *No. of particles making up sphere*
+!   - pres_inf         : *ambient pressure (code units)*
+!   - rho_inf          : *ambient density (code units)*
+!   - v_inf            : *wind speed (code units)*
 !   - wind_injection_x : *x position of the wind injection boundary (in star radii)*
 !   - wind_length      : *crude wind length (in star radii)*
 !
@@ -84,7 +89,7 @@ subroutine init_inject(ierr)
  if (lattice_type == 1) then
     psep = (sqrt(2.)*element_volume)**(1./3.)
  elseif (lattice_type == 0) then
-    psep = element_volume**(1./3.) 
+    psep = element_volume**(1./3.)
  else
     call fatal("init_inject",'unknown lattice_type (must be 0 or 1)')
  endif
@@ -263,16 +268,16 @@ subroutine print_summary(v_inf,cs_inf,rho_inf,pres_inf,mach,pmass,distance_betwe
  integer, intent(in) :: max_layers,nstar,max_particles
 
  print*, 'wind speed: ',v_inf * unit_velocity / 1e5," km s^-1"
- print*, 'wind cs: ',cs_inf * unit_velocity / 1e5," km s^-1" 
- print*, 'wind density: ',rho_inf * unit_density," g cm^-3" 
- print*, 'wind pressure: ',pres_inf * unit_pressure," dyn cm^-2" 
+ print*, 'wind cs: ',cs_inf * unit_velocity / 1e5," km s^-1"
+ print*, 'wind density: ',rho_inf * unit_density," g cm^-3"
+ print*, 'wind pressure: ',pres_inf * unit_pressure," dyn cm^-2"
  print*, 'wind mach number: ', mach
 
  print*, 'maximum wind layers: ', max_layers
  print*, 'pmass: ',pmass
  print*, 'nstar: ',nstar
  print*, 'nstar + max. wind particles: ', max_particles
- print*, 'distance_between_layers: ',distance_between_layers  
+ print*, 'distance_between_layers: ',distance_between_layers
  print*, 'time_between_layers: ',time_between_layers
 
  print*, 'planet crossing time: ',2*Rstar/v_inf

src/main/interp_metric.F90

@@ -2,7 +2,7 @@
 ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. !
 ! Copyright (c) 2007-2023 The Authors (see AUTHORS)                        !
 ! See LICENCE file for usage and distribution conditions                   !
-! http://phantomsph.bitbucket.io/                                          !
+! http://phantomsph.github.io/                                             !
 !--------------------------------------------------------------------------!
 module metric_interp
 !

src/main/metric_et.f90

@@ -2,7 +2,7 @@
 ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. !
 ! Copyright (c) 2007-2023 The Authors (see AUTHORS)                        !
 ! See LICENCE file for usage and distribution conditions                   !
-! http://phantomsph.bitbucket.io/                                          !
+! http://phantomsph.github.io/                                             !
 !--------------------------------------------------------------------------!
 module metric
 !
@@ -20,7 +20,7 @@ module metric
  character(len=*), parameter :: metric_type = 'et'
  integer,          parameter :: imetric     = 6
  ! This are dummy parameters to stop the compiler complaing
- ! Not used anywhere in the code - Needs a fix! 
+ ! Not used anywhere in the code - Needs a fix!
  real, public  :: mass1 = 1.       ! mass of central object
  real, public  :: a     = 0.0       ! spin of central object
 contains

src/main/metric_flrw.f90

@@ -2,7 +2,7 @@
 ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. !
 ! Copyright (c) 2007-2023 The Authors (see AUTHORS)                        !
 ! See LICENCE file for usage and distribution conditions                   !
-! http://phantomsph.bitbucket.io/                                          !
+! http://phantomsph.github.io/                                             !
 !--------------------------------------------------------------------------!
 module metric
 !