diff --git a/.gitignore b/.gitignore index 89565ba53..cc24d67a1 100644 --- a/.gitignore +++ b/.gitignore @@ -36,4 +36,4 @@ build/test000 *.cmod *.ilm *.stb - +eos_lom.dat \ No newline at end of file diff --git a/AUTHORS b/AUTHORS index 78279c152..979f8bf7c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -16,6 +16,7 @@ Yann Bernard Daniel Mentiplay Megha Sharma Arnaud Vericel +Alison Young Mark Hutchison Mats Esseldeurs Rebecca Nealon @@ -34,7 +35,6 @@ Giovanni Dipierro Roberto Iaconi Amena Faruqi Hauke Worpel -Alison Young Stephen Nielson Martina Toscani Benedetta Veronesi diff --git a/build/Makefile b/build/Makefile index e03c86fa2..e53883287 100644 --- a/build/Makefile +++ b/build/Makefile @@ -506,6 +506,7 @@ SRCCHEM= fs_data.f90 mol_data.f90 utils_spline.f90 \ cooling_koyamainutsuka.f90 \ cooling_ism.f90 \ cooling_molecular.f90 \ + cooling_radapprox.f90\ cooling_functions.f90 \ cooling_solver.f90 \ h2chem.f90 cooling.f90 @@ -513,7 +514,7 @@ SRCCHEM= fs_data.f90 mol_data.f90 utils_spline.f90 \ # equations of state # SRCMESA= eos_mesa_microphysics.f90 eos_mesa.f90 -SRCEOS = eos_barotropic.f90 eos_stratified.f90 eos_piecewise.f90 ${SRCMESA} eos_shen.f90 eos_helmholtz.f90 eos_idealplusrad.f90 ionization.F90 eos_gasradrec.f90 eos_HIIR.f90 eos.f90 +SRCEOS = eos_barotropic.f90 eos_stratified.f90 eos_piecewise.f90 ${SRCMESA} eos_shen.f90 eos_helmholtz.f90 eos_idealplusrad.f90 ionization.F90 eos_gasradrec.f90 eos_HIIR.f90 eos_stamatellos.f90 eos.f90 ifeq ($(HDF5), yes) SRCREADWRITE_DUMPS= utils_hdf5.f90 utils_dumpfiles_hdf5.f90 readwrite_dumps_common.f90 readwrite_dumps_fortran.F90 readwrite_dumps_hdf5.F90 readwrite_dumps.F90 diff --git a/data/eos/lombardi/README b/data/eos/lombardi/README new file mode 100644 index 000000000..9120e52cb --- /dev/null +++ b/data/eos/lombardi/README @@ -0,0 +1,10 @@ +The data tables for the equation of state and opacities for the modified Lombardi radiative cooling approximation are too large to be stored in the Phantom git repository. +They will be downloaded automatically when you run the code + +or can be retrieved manually using wget from Zenodo, e.g.: + +wget https://zenodo.org/records/13842491/files/eos_lom.dat + +The files are: + +eos_lom.dat diff --git a/docs/examples/selfgravity_gravitationalinstability.rst b/docs/examples/selfgravity_gravitationalinstability.rst index 8146e009e..effb82630 100644 --- a/docs/examples/selfgravity_gravitationalinstability.rst +++ b/docs/examples/selfgravity_gravitationalinstability.rst @@ -17,3 +17,10 @@ In the *setup* file there are the disc parameters, and in the *input* file it is - ieos = 2 , to choose an adiabatic equation of state - icooling = 3, to choose a β cooling prescription with constant β (icooling = 7 prescribes a varying β cooling with the radius) - beta_cool = #, to choose the value of β cooling + +To use the radiative cooling approximation of Young et al. (2024) use: + +- ieos = 23 +- icooling = 9 + +See :doc:`Radiation hydrodynamics in phantom `. \ No newline at end of file diff --git a/docs/physics/eos-list.rst b/docs/physics/eos-list.rst index be573c5a4..977bae36f 100644 --- a/docs/physics/eos-list.rst +++ b/docs/physics/eos-list.rst @@ -124,3 +124,9 @@ | | from HORMONE, Hirai+2020, as used in Lau+2022b | | | | +-----------+----------------------------------------------------------------------------------+ + | 23 | **Tabulated EoS of Stamatellos et al. 2007 (includes opacities)** | + | | | + | | Tabulated equation of state with opacities from Lombardi et al. 2015. For use | + | | with icooling = 9, the radiative cooling approximation (Young et al. 2024). | | + | | | + +-----------+----------------------------------------------------------------------------------+ \ No newline at end of file diff --git a/docs/physics/radiation.rst b/docs/physics/radiation.rst index fdd6b94b4..7cbe49ec2 100644 --- a/docs/physics/radiation.rst +++ b/docs/physics/radiation.rst @@ -103,6 +103,28 @@ the star will just steadily cool. For red giants with a sink particle core a sim is to supply a constant luminosity input from the core (:doc:`sink heating `). This is experimental. Another option would be to include a nuclear burning network (please somebody contribute this). + +Polytropic radiative cooling approximation +------------------------------------------- +This is an alternative to computationally expensive radiative transfer in regimes where radiative cooling is +important. This method estimates the optical depth for each particle and its equilibrium temperature. From +these the new temperature and internal energy is updated at each timestep. The method implemented here is +the "modified Lombardi" method of `Young et al. (2024) `__, + which was based on Stamatellos et al. (2007) and Lombardi et al. (2015). This method is designed for + self-gravitating discs around a central star. Stellar heating is included from the most massive sink particle. + +Use icooling = 9 and ieos = 23 to use the tabulated equation of state which has the opacity tables required +for the cooling calculation. The additional parameters are:: + + EOS_file = myeos.dat ! File containing tabulated EOS values + Lstar = 0.440 ! Luminosity of host star for calculating Tmin (Lsun) + Tfloor = 5.000 ! temperature floor (K); on if > 0 + + +N.B. This version does not currently include radiation from more than one sink particle. This version does not +couple with flux-limited diffusion at the moment. + + Irradiation from stars with phantom + MCFOST --------------------------------------------- In regimes where the radiation diffusion time is relatively short, anything not inside stars diff --git a/src/main/H2regions.f90 b/src/main/H2regions.f90 index 06c762819..b0d0096c9 100644 --- a/src/main/H2regions.f90 +++ b/src/main/H2regions.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/apr.f90 b/src/main/apr.f90 index b645ade72..43a7a2b5f 100644 --- a/src/main/apr.f90 +++ b/src/main/apr.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/apr_region.f90 b/src/main/apr_region.f90 index 947ce0464..e802ad6ad 100644 --- a/src/main/apr_region.f90 +++ b/src/main/apr_region.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/bondiexact.f90 b/src/main/bondiexact.f90 index e39ddd970..032fd394b 100644 --- a/src/main/bondiexact.f90 +++ b/src/main/bondiexact.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/bondiexact_gr.f90 b/src/main/bondiexact_gr.f90 index 869fc061a..e25a3a844 100644 --- a/src/main/bondiexact_gr.f90 +++ b/src/main/bondiexact_gr.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/boundary.f90 b/src/main/boundary.f90 index 08bb0fd34..b28a99d6a 100644 --- a/src/main/boundary.f90 +++ b/src/main/boundary.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/boundary_dynamic.f90 b/src/main/boundary_dynamic.f90 index 88642a872..04d44a1f6 100644 --- a/src/main/boundary_dynamic.f90 +++ b/src/main/boundary_dynamic.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/centreofmass.f90 b/src/main/centreofmass.f90 index 20e905ed0..9104dd36f 100644 --- a/src/main/centreofmass.f90 +++ b/src/main/centreofmass.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/checkconserved.f90 b/src/main/checkconserved.f90 index 4def126fc..f49d065e2 100644 --- a/src/main/checkconserved.f90 +++ b/src/main/checkconserved.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/checkoptions.F90 b/src/main/checkoptions.F90 index d230f40bf..ae69bf5ec 100644 --- a/src/main/checkoptions.F90 +++ b/src/main/checkoptions.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/checksetup.f90 b/src/main/checksetup.f90 index b7bcc4e3b..50e0bc3f0 100644 --- a/src/main/checksetup.f90 +++ b/src/main/checksetup.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/config.F90 b/src/main/config.F90 index 1238e1ea6..11b2924f0 100644 --- a/src/main/config.F90 +++ b/src/main/config.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/cons2prim.f90 b/src/main/cons2prim.f90 index 700734b1f..a7e04ed1a 100644 --- a/src/main/cons2prim.f90 +++ b/src/main/cons2prim.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/cons2primsolver.f90 b/src/main/cons2primsolver.f90 index 10e81529d..701983c73 100644 --- a/src/main/cons2primsolver.f90 +++ b/src/main/cons2primsolver.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/cooling.f90 b/src/main/cooling.f90 index 90514dd7f..f3b0c20f5 100644 --- a/src/main/cooling.f90 +++ b/src/main/cooling.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! @@ -15,6 +15,7 @@ module cooling ! 5 = Koyama & Inutuska (2002) [explicit] ! 6 = Koyama & Inutuska (2002) [implicit] ! 7 = Gammie cooling power law [explicit] +! 9 = Young et al. (2024) [implicit] ! ! :References: ! Gail & Sedlmayr textbook Physics and chemistry of Circumstellar dust shells @@ -27,8 +28,9 @@ module cooling ! - icooling : *cooling function (0=off, 1=library (step), 2=library (force),* ! ! :Dependencies: chem, cooling_gammie, cooling_gammie_PL, cooling_ism, -! cooling_koyamainutsuka, cooling_molecular, cooling_solver, dim, eos, -! infile_utils, io, options, part, physcon, timestep, units +! cooling_koyamainutsuka, cooling_molecular, cooling_radapprox, +! cooling_solver, dim, eos, infile_utils, io, options, part, physcon, +! timestep, units, viscosity ! use options, only:icooling @@ -61,12 +63,14 @@ subroutine init_cooling(id,master,iprint,ierr) use dim, only:maxvxyzu use units, only:unit_ergg use physcon, only:mass_proton_cgs,kboltz - use io, only:error - use eos, only:gamma,gmw + use io, only:error,fatal,warning + use eos, only:gamma,gmw,ieos use part, only:iHI use cooling_ism, only:init_cooling_ism,abund_default use cooling_koyamainutsuka, only:init_cooling_KI02 use cooling_solver, only:init_cooling_solver + use cooling_radapprox, only:init_star + use viscosity, only:irealvisc integer, intent(in) :: id,master,iprint integer, intent(out) :: ierr @@ -79,6 +83,12 @@ subroutine init_cooling(id,master,iprint,ierr) abund_default(iHI) = 1. call init_cooling_ism() if (icooling==8) cooling_in_step = .false. + case(9) + if (ieos /= 23 ) call fatal('cooling','icooling=9 requires ieos=23',& + var='ieos',ival=ieos) + if (irealvisc > 0) call warning('cooling',& + 'Using real viscosity will affect optical depth estimate',var='irealvisc',ival=irealvisc) + call init_star() case(6) call init_cooling_KI02(ierr) case(5) @@ -95,7 +105,9 @@ subroutine init_cooling(id,master,iprint,ierr) end select !--calculate the energy floor in code units - if (Tfloor > 0.) then + if (icooling == 9) then + ufloor = 0. ! because we calculate & use umin separately + elseif (Tfloor > 0.) then if (gamma > 1.) then ufloor = kboltz*Tfloor/((gamma-1.)*gmw*mass_proton_cgs)/unit_ergg else @@ -113,7 +125,8 @@ end subroutine init_cooling ! this routine returns the effective cooling rate du/dt ! !----------------------------------------------------------------------- -subroutine energ_cooling(xi,yi,zi,ui,rho,dt,divv,dudt,Tdust_in,mu_in,gamma_in,K2_in,kappa_in,abund_in) + +subroutine energ_cooling(xi,yi,zi,ui,rho,dt,divv,dudt,Tdust_in,mu_in,gamma_in,K2_in,kappa_in,abund_in,duhydro,ipart) use io, only:fatal use dim, only:nabundances use eos, only:gmw,gamma,ieos,get_temperature_from_u @@ -124,11 +137,13 @@ subroutine energ_cooling(xi,yi,zi,ui,rho,dt,divv,dudt,Tdust_in,mu_in,gamma_in,K2 use cooling_solver, only:energ_cooling_solver use cooling_koyamainutsuka, only:cooling_KoyamaInutsuka_explicit,& cooling_KoyamaInutsuka_implicit + use cooling_radapprox, only:radcool_update_du real(kind=4), intent(in) :: divv ! in code units real, intent(in) :: xi,yi,zi,ui,rho,dt ! in code units real, intent(in), optional :: Tdust_in,mu_in,gamma_in,K2_in,kappa_in ! in cgs - real, intent(in), optional :: abund_in(nabn) + real, intent(in), optional :: abund_in(nabn),duhydro + integer,intent(in),optional:: ipart real, intent(out) :: dudt ! in code units real :: mui,gammai,Tgas,Tdust,K2,kappa real :: abundi(nabn) @@ -165,6 +180,8 @@ subroutine energ_cooling(xi,yi,zi,ui,rho,dt,divv,dudt,Tdust_in,mu_in,gamma_in,K2 call cooling_Gammie_explicit(xi,yi,zi,ui,dudt) case (7) call cooling_Gammie_PL_explicit(xi,yi,zi,ui,dudt) + case (9) + call radcool_update_du(ipart,xi,yi,zi,rho,ui,duhydro,Tfloor) case default call energ_cooling_solver(ui,dudt,rho,dt,mui,gammai,Tdust,K2,kappa) end select @@ -183,12 +200,13 @@ subroutine write_options_cooling(iunit) use cooling_gammie_PL, only:write_options_cooling_gammie_PL use cooling_molecular, only:write_options_molecularcooling use cooling_solver, only:write_options_cooling_solver + use cooling_radapprox, only:write_options_cooling_radapprox integer, intent(in) :: iunit write(iunit,"(/,a)") '# options controlling cooling' call write_inopt(C_cool,'C_cool','factor controlling cooling timestep',iunit) call write_inopt(icooling,'icooling','cooling function (0=off, 1=library (step), 2=library (force),'// & - '3=Gammie, 4=ISM, 5,6=KI02, 7=powerlaw)',iunit) + '3=Gammie, 4=ISM, 5,6=KI02, 7=powerlaw, 9=radiative approx)',iunit) select case(icooling) case(0,5,6) ! do nothing @@ -198,6 +216,8 @@ subroutine write_options_cooling(iunit) call write_options_cooling_gammie(iunit) case(7) call write_options_cooling_gammie_PL(iunit) + case(9) + call write_options_cooling_radapprox(iunit) case default call write_options_cooling_solver(iunit) end select @@ -217,11 +237,12 @@ subroutine read_options_cooling(name,valstring,imatch,igotall,ierr) use cooling_ism, only:read_options_cooling_ism use cooling_molecular, only:read_options_molecular_cooling use cooling_solver, only:read_options_cooling_solver + use cooling_radapprox, only:read_options_cooling_radapprox character(len=*), intent(in) :: name,valstring logical, intent(out) :: imatch,igotall integer, intent(out) :: ierr integer, save :: ngot = 0 - logical :: igotallism,igotallmol,igotallgammie,igotallgammiePL,igotallfunc + logical :: igotallism,igotallmol,igotallgammie,igotallgammiePL,igotallfunc,igotallradapp imatch = .true. igotall = .false. ! cooling options are compulsory @@ -229,6 +250,7 @@ subroutine read_options_cooling(name,valstring,imatch,igotall,ierr) igotallmol = .true. igotallgammie = .true. igotallfunc = .true. + igotallradapp = .true. select case(trim(name)) case('icooling') @@ -251,12 +273,14 @@ subroutine read_options_cooling(name,valstring,imatch,igotall,ierr) call read_options_cooling_gammie(name,valstring,imatch,igotallgammie,ierr) case(7) call read_options_cooling_gammie_PL(name,valstring,imatch,igotallgammiePL,ierr) + case(9) + call read_options_cooling_radapprox(name,valstring,imatch,igotallradapp,ierr) case default call read_options_cooling_solver(name,valstring,imatch,igotallfunc,ierr) end select end select ierr = 0 - if (icooling >= 0 .and. ngot >= 2 .and. igotallgammie .and. igotallfunc .and. igotallism) then + if (icooling >= 0 .and. ngot >= 2 .and. igotallgammie .and. igotallfunc .and. igotallism .and. igotallradapp) then igotall = .true. else igotall = .false. diff --git a/src/main/cooling_functions.f90 b/src/main/cooling_functions.f90 index 229afeaef..c1184e860 100644 --- a/src/main/cooling_functions.f90 +++ b/src/main/cooling_functions.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/cooling_gammie.f90 b/src/main/cooling_gammie.f90 index 3fffe3565..0a5b983de 100644 --- a/src/main/cooling_gammie.f90 +++ b/src/main/cooling_gammie.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/cooling_gammie_PL.f90 b/src/main/cooling_gammie_PL.f90 index 15ae40733..3832bd30b 100644 --- a/src/main/cooling_gammie_PL.f90 +++ b/src/main/cooling_gammie_PL.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/cooling_ism.f90 b/src/main/cooling_ism.f90 index 60d574c75..8c0b6d6da 100644 --- a/src/main/cooling_ism.f90 +++ b/src/main/cooling_ism.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/cooling_koyamainutsuka.f90 b/src/main/cooling_koyamainutsuka.f90 index 2548d180c..91436b40f 100644 --- a/src/main/cooling_koyamainutsuka.f90 +++ b/src/main/cooling_koyamainutsuka.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/cooling_molecular.f90 b/src/main/cooling_molecular.f90 index e953a3175..26dc4f322 100644 --- a/src/main/cooling_molecular.f90 +++ b/src/main/cooling_molecular.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/cooling_radapprox.f90 b/src/main/cooling_radapprox.f90 new file mode 100644 index 000000000..0f7734b33 --- /dev/null +++ b/src/main/cooling_radapprox.f90 @@ -0,0 +1,252 @@ +!--------------------------------------------------------------------------! +! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! +! See LICENCE file for usage and distribution conditions ! +! http://phantomsph.github.io/ ! +!--------------------------------------------------------------------------! +module cooling_radapprox +! +! Cooling method of Stamatellos et al. 2007 +! +! :References: Stamatellos et al. 2007 +! +! :Owner: Alison Young +! +! :Runtime parameters: +! - EOS_file : *File containing tabulated EOS values* +! - Lstar : *Luminosity of host star for calculating Tmin (Lsun)* +! +! :Dependencies: eos_stamatellos, infile_utils, io, part, physcon, units +! + + implicit none + real :: Lstar = 0d0 ! in units of L_sun + real,parameter :: dtcool_crit = 0.0001 ! critical dt_rad/dt_hydro for not applying cooling + integer :: isink_star ! index of sink to use as illuminating star + public :: radcool_update_du,write_options_cooling_radapprox,read_options_cooling_radapprox + public :: init_star,radcool_evolve_ui + +contains + +subroutine init_star() + use part, only:nptmass,xyzmh_ptmass + use io, only:fatal + integer :: i,imin=0 + real :: rsink2,rsink2min + + rsink2min = 0d0 + + isink_star = 0 + if (nptmass == 0) then + print *, "NO central star" + elseif (nptmass == 0) then + print *, "No stellar heating." + elseif (nptmass == 1) then + isink_star = 1 + else + do i=1,nptmass + rsink2 = xyzmh_ptmass(1,i)**2 + xyzmh_ptmass(2,i)**2 + xyzmh_ptmass(3,i)**2 + if (i==1 .or. (rsink2 < rsink2min) ) then + rsink2min = rsink2 + imin = i + endif + enddo + isink_star = imin + endif + if (isink_star > 0) print *, "Using sink no. ", isink_star,& + "at (xyz)",xyzmh_ptmass(1:3,isink_star)!"as illuminating star." +end subroutine init_star + +subroutine radcool_evolve_ui(ui,dt,i,Tfloor,h,uout) + use eos_stamatellos, only:ttherm_store,ueqi_store,getintenerg_opdep + use io, only:warning + use units, only:unit_density,unit_ergg + use part, only:rhoh,massoftype,igas + real, intent(inout) :: ui + real, intent(in) :: dt,Tfloor,h + integer,intent(in) :: i + real,optional,intent(out) :: uout + real :: tthermi,ueqi,utemp,ufloor_cgs,rhoi_cgs + real :: expdtonttherm + + tthermi = ttherm_store(i) + ueqi = ueqi_store(i) + utemp = ui + rhoi_cgs = rhoh(h,massoftype(igas))*unit_density + call getintenerg_opdep(Tfloor**(1.0/4.0),rhoi_cgs,ufloor_cgs) + + if (tthermi > epsilon(tthermi) .and. ui /= ueqi) then + if (dt > 0d0) then + ! evolve energy + expdtonttherm = exp(-dt/tthermi) + utemp = ui*expdtonttherm + ueqi*(1.d0-expdtonttherm) + elseif (dt < 0d0) then + ! i.e. for the backwards step in the leapfrog integrator + expdtonttherm = exp(dt/tthermi) + utemp = (ui - ueqi*(1-expdtonttherm))/expdtonttherm + endif + + ! if tthermi ==0 or dt/thermi is neglible then ui doesn't change + if (isnan(utemp) .or. utemp < epsilon(utemp)) then + utemp = ui + endif + endif + if (utemp < ufloor_cgs/unit_ergg) utemp = ufloor_cgs/unit_ergg + if (utemp < 0d0) print *, "ERROR! i=",i, ui,ueqi + + if (present(uout)) then + uout = utemp + else + ui = utemp + endif + +end subroutine radcool_evolve_ui + + +! +! Do cooling calculation +! +! update tthermi and ueqi for ui update +subroutine radcool_update_du(i,xi,yi,zi,rhoi,ui,duhydro,Tfloor) + use io, only:warning + use physcon, only:steboltz,pi,solarl,kb_on_mh,piontwo,rpiontwo + use units, only:umass,udist,unit_density,unit_ergg,utime,unit_pressure + use eos_stamatellos, only:getopac_opdep,getintenerg_opdep,gradP_cool,& + ttherm_store,ueqi_store,opac_store + use part, only:xyzmh_ptmass,igas,eos_vars,iTemp + integer,intent(in) :: i + real,intent(in) :: xi,yi,zi,rhoi + real,intent(in) :: ui,duhydro,Tfloor + real :: coldensi,kappaBari,kappaParti,ri2 + real :: gmwi,Tmini4,Ti,dudti_rad,Teqi,HLom,du_tot + real :: opaci,ueqi,umini,tthermi,presi,Hcomb + real :: cs2,Om2,Hmod2,rhoi_cgs,ui_cgs + + coldensi = huge(coldensi) + kappaBari = 0d0 + kappaParti = 0d0 + Teqi = huge(Teqi) + tthermi = huge(tthermi) + opaci = epsilon(opaci) + if (abs(ui) < epsilon(ui)) print *, "ui zero", i + + if (isink_star > 0) then + ri2 = (xi-xyzmh_ptmass(1,isink_star))**2d0 & + + (yi-xyzmh_ptmass(2,isink_star))**2d0 & + + (zi-xyzmh_ptmass(3,isink_star))**2d0 + else + ri2 = xi**2d0 + yi**2d0 + zi**2d0 + endif + + ! get opacities & Ti for ui + ui_cgs = ui*unit_ergg + rhoi_cgs = rhoi*unit_density + call getopac_opdep(ui_cgs,rhoi_cgs,kappaBari,kappaParti,& + Ti,gmwi) + eos_vars(iTemp,i) = Ti ! save temperature + presi = kb_on_mh*rhoi*unit_density*Ti/gmwi ! cgs + presi = presi/unit_pressure !code units + +! Modified Lombardi method + HLom = presi/abs(gradP_cool(i))/rhoi + cs2 = presi/rhoi + if (isink_star > 0 .and. ri2 > 0d0) then + Om2 = xyzmh_ptmass(4,isink_star)/(ri2**(1.5)) !NB we are using spherical radius here + else + Om2 = 0d0 + endif + Hmod2 = cs2 * piontwo / (Om2 + 8d0*rpiontwo*rhoi) + Hcomb = 1.d0/sqrt((1.0d0/HLom)**2.0d0 + (1.0d0/Hmod2)) + coldensi = 1.014d0 * Hcomb *rhoi*umass/udist/udist ! physical units + +! Tfloor is from input parameters and is background heating +! Stellar heating + if (isink_star > 0 .and. Lstar > 0.d0) then + Tmini4 = Tfloor**4d0 + exp(-coldensi*kappaBari)*(Lstar*solarl/(16d0*pi*steboltz*ri2*udist*udist)) + else + Tmini4 = Tfloor**4d0 + endif + + call getintenerg_opdep(Tmini4**(1.0/4.0),rhoi_cgs,umini) + umini = umini/unit_ergg + opaci = (coldensi**2d0)*kappaBari + (1.d0/kappaParti) ! physical units + opac_store(i) = opaci + dudti_rad = 4.d0*steboltz*(Tmini4 - Ti**4.d0)/opaci/unit_ergg*utime! code units + + du_tot = duhydro + + Teqi = du_tot * opaci*unit_ergg/utime ! physical units + Teqi = Teqi/4.d0/steboltz + Teqi = Teqi + Tmini4 + du_tot = du_tot + dudti_rad + !Check if we need to use the temperature floor + if (Teqi < Tmini4) then + Teqi = Tmini4**(1.0/4.0) + else + Teqi = Teqi**(1.0/4.0) + endif + + rhoi_cgs = rhoi*unit_density + call getintenerg_opdep(Teqi,rhoi_cgs,ueqi) + ueqi = ueqi/unit_ergg + ueqi_store(i) = ueqi + ! calculate thermalization timescale + if ((du_tot) == 0.d0) then + tthermi = 0d0 + else + tthermi = abs((ueqi - ui)/(du_tot)) + endif + + ttherm_store(i) = tthermi + + if (isnan(tthermi) .or. isnan(ueqi)) then + call warning("In Stamatellos cooling","energ=NaN or 0. ui=",val=ui) + endif + +end subroutine radcool_update_du + + +subroutine write_options_cooling_radapprox(iunit) + use infile_utils, only:write_inopt + use eos_stamatellos, only: eos_file + integer, intent(in) :: iunit + + !N.B. Tfloor handled in cooling.F90 + call write_inopt(eos_file,'EOS_file','File containing tabulated EOS values',iunit) + call write_inopt(Lstar,'Lstar','Luminosity of host star for calculating Tmin (Lsun)',iunit) + +end subroutine write_options_cooling_radapprox + + +subroutine read_options_cooling_radapprox(name,valstring,imatch,igotallra,ierr) + use io, only:warning,fatal + use eos_stamatellos, only: eos_file + character(len=*), intent(in) :: name,valstring + logical, intent(out) :: imatch,igotallra + integer, intent(out) :: ierr + integer :: ieosread + integer, save :: ngot = 0 + + imatch = .true. + igotallra = .false. ! cooling options are compulsory + select case(trim(name)) + case('Lstar') + read(valstring,*,iostat=ierr) Lstar + if (Lstar < 0.) call fatal('Lstar','Luminosity cannot be negative') + ngot = ngot + 1 + case('EOS_file') + read(valstring,*,iostat=ierr) eos_file + ngot = ngot + 1 + case('ieos') + read(valstring,*,iostat=ierr) ieosread + if (ieosread /= 23) call fatal('ieosread','For icooling=9, you need ieos=23') + case default + imatch = .false. + end select + + if (ngot >= 2) igotallra = .true. + +end subroutine read_options_cooling_radapprox + +end module cooling_radapprox + diff --git a/src/main/cooling_solver.f90 b/src/main/cooling_solver.f90 index 9203b4aae..d3892c8ac 100644 --- a/src/main/cooling_solver.f90 +++ b/src/main/cooling_solver.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/cullendehnen.f90 b/src/main/cullendehnen.f90 index b8c5d2946..42cce4c5d 100644 --- a/src/main/cullendehnen.f90 +++ b/src/main/cullendehnen.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/damping.f90 b/src/main/damping.f90 index d7c83f925..83b552436 100644 --- a/src/main/damping.f90 +++ b/src/main/damping.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/datafiles.f90 b/src/main/datafiles.f90 index df791da0b..82266c041 100644 --- a/src/main/datafiles.f90 +++ b/src/main/datafiles.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! @@ -75,6 +75,8 @@ function map_dir_to_web(search_dir) result(url) url = 'https://zenodo.org/records/13162815/files/' case('data/starcluster') url = 'https://zenodo.org/records/13164858/files/' + case('data/eos/lombardi') + url = 'https://zenodo.org/records/13842491/files/' case default url = 'https://users.monash.edu.au/~dprice/'//trim(search_dir) end select diff --git a/src/main/dens.F90 b/src/main/dens.F90 index d81bc4d5f..a0e14c64a 100644 --- a/src/main/dens.F90 +++ b/src/main/dens.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! @@ -27,6 +27,8 @@ module densityforce use timing, only:getused,printused,print_time implicit none + character(len=80), parameter, public :: & ! module version + modid="$Id$" public :: densityiterate,get_neighbour_stats @@ -137,7 +139,7 @@ subroutine densityiterate(icall,npart,nactive,xyzh,vxyzu,divcurlv,divcurlB,Bevol use io_summary,only:summary_variable,iosumhup,iosumhdn use timing, only:increment_timer,get_timings,itimer_dens_local,itimer_dens_remote use omputils, only:omp_thread_num,omp_num_threads - integer, intent(in) :: icall,npart,nactive + integer, intent(in) :: icall,npart,nactive integer(kind=1), intent(in) :: apr_level(:) real, intent(inout) :: xyzh(:,:) real, intent(in) :: vxyzu(:,:),fxyzu(:,:),fext(:,:) @@ -299,6 +301,7 @@ subroutine densityiterate(icall,npart,nactive,xyzh,vxyzu,divcurlv,divcurlB,Bevol !$omp reduction(max:rhomax) & !$omp private(i) + call init_cell_exchange(xrecvbuf,irequestrecv,thread_complete,ncomplete_mpi,mpitype) !$omp master @@ -904,6 +907,7 @@ pure subroutine calculate_rmatrix_from_sums(rhosum,denom,rmatrix,idone) rmatrix(6) = rxxi*ryyi - rxyi*rxyi ! zz idone = .true. + return end subroutine calculate_rmatrix_from_sums !---------------------------------------------------------------- @@ -1273,7 +1277,6 @@ pure subroutine compute_cell(cell,listneigh,nneigh,getdv,getdB,Bevol,xyzh,vxyzu, cell%nneightry = nneigh cell%nneigh(i) = nneighi - enddo over_parts end subroutine compute_cell diff --git a/src/main/deriv.F90 b/src/main/deriv.F90 index cd7149405..59b3740e4 100644 --- a/src/main/deriv.F90 +++ b/src/main/deriv.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/dtype_kdtree.F90 b/src/main/dtype_kdtree.F90 index fcb1a04f5..9312269b1 100644 --- a/src/main/dtype_kdtree.F90 +++ b/src/main/dtype_kdtree.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/dust.f90 b/src/main/dust.f90 index 8270c5ea9..53973ebb5 100644 --- a/src/main/dust.f90 +++ b/src/main/dust.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/dust_formation.f90 b/src/main/dust_formation.f90 index f32754011..c581209d7 100644 --- a/src/main/dust_formation.f90 +++ b/src/main/dust_formation.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/energies.F90 b/src/main/energies.F90 index acea5414a..0afe7fb6a 100644 --- a/src/main/energies.F90 +++ b/src/main/energies.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/eos.f90 b/src/main/eos.f90 index bd4318dab..c0a82fb4b 100644 --- a/src/main/eos.f90 +++ b/src/main/eos.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! @@ -27,6 +27,7 @@ module eos ! 16 = Shen eos ! 17 = polytropic EOS with varying mu (depending on H2 formation) ! 20 = Ideal gas + radiation + various forms of recombination energy from HORMONE (Hirai et al., 2020) +! 23 = read tabulated eos (for use with icooling == 9) ! ! :References: ! Lodato & Pringle (2007) @@ -43,14 +44,14 @@ module eos ! ! :Dependencies: dim, dump_utils, eos_HIIR, eos_barotropic, eos_gasradrec, ! eos_helmholtz, eos_idealplusrad, eos_mesa, eos_piecewise, eos_shen, -! eos_stratified, infile_utils, io, mesa_microphysics, part, physcon, -! units +! eos_stamatellos, eos_stratified, infile_utils, io, mesa_microphysics, +! part, physcon, units ! use part, only:ien_etotal,ien_entropy,ien_type use dim, only:gr use eos_gasradrec, only:irecomb implicit none - integer, parameter, public :: maxeos = 22 + integer, parameter, public :: maxeos = 23 real, public :: polyk, polyk2, gamma real, public :: qfacdisc = 0.75, qfacdisc2 = 0.75 logical, public :: extract_eos_from_hdr = .false. @@ -110,7 +111,7 @@ subroutine equationofstate(eos_type,ponrhoi,spsoundi,rhoi,xi,yi,zi,tempi,eni,gam use io, only:fatal,error,warning use part, only:xyzmh_ptmass, nptmass use units, only:unit_density,unit_pressure,unit_ergg,unit_velocity - use physcon, only:Rg,radconst + use physcon, only:Rg,radconst,kb_on_mh use eos_mesa, only:get_eos_pressure_temp_gamma1_mesa,get_eos_1overmu_mesa use eos_helmholtz, only:eos_helmholtz_pres_sound use eos_shen, only:eos_shen_NL3 @@ -119,6 +120,7 @@ subroutine equationofstate(eos_type,ponrhoi,spsoundi,rhoi,xi,yi,zi,tempi,eni,gam use eos_stratified, only:get_eos_stratified use eos_barotropic, only:get_eos_barotropic use eos_piecewise, only:get_eos_piecewise + use eos_stamatellos use eos_HIIR, only:get_eos_HIIR_iso,get_eos_HIIR_adiab integer, intent(in) :: eos_type real, intent(in) :: rhoi,xi,yi,zi @@ -133,7 +135,7 @@ subroutine equationofstate(eos_type,ponrhoi,spsoundi,rhoi,xi,yi,zi,tempi,eni,gam real :: mass_r, mass ! defined for generalised Farris prescription real :: gammai,temperaturei,mui,imui,X_i,Z_i real :: cgsrhoi,cgseni,cgspresi,presi,gam1,cgsspsoundi - real :: uthermconst + real :: uthermconst,kappaBar,kappaPart real :: enthi,pondensi logical :: isionisedi ! @@ -430,14 +432,28 @@ subroutine equationofstate(eos_type,ponrhoi,spsoundi,rhoi,xi,yi,zi,tempi,eni,gam tempi = temperaturei if (present(mu_local)) mu_local = 1./imui if (present(gamma_local)) gamma_local = gammai - case(21) + case(21) call get_eos_HIIR_iso(polyk,temperature_coef,mui,tempi,ponrhoi,spsoundi,isionisedi) - case(22) + case(22) call get_eos_HIIR_adiab(polyk,temperature_coef,mui,tempi,ponrhoi,rhoi,eni,gammai,spsoundi,isionisedi) - + case(23) +! +!--interpolate tabulated eos from Stamatellos+(2007). For use with icooling=9 +! + if (eni < 0.) then + call fatal('eos (stamatellos)','utherm < 0',var='u',val=eni) + endif + cgsrhoi = rhoi * unit_density + cgseni = eni * unit_ergg + call getopac_opdep(cgseni,cgsrhoi,kappaBar,kappaPart,tempi,mui) + cgspresi = kb_on_mh*cgsrhoi*tempi/mui + presi = cgspresi/unit_pressure + ponrhoi = presi/rhoi + gammai = 1.d0 + presi/(eni*rhoi) + spsoundi = sqrt(gammai*ponrhoi) case default spsoundi = 0. ! avoids compiler warnings @@ -463,11 +479,12 @@ subroutine init_eos(eos_type,ierr) use eos_barotropic, only:init_eos_barotropic use eos_shen, only:init_eos_shen_NL3 use eos_gasradrec, only:init_eos_gasradrec + use eos_stamatellos,only:read_optab,init_coolra,eos_file use eos_HIIR, only:init_eos_HIIR use dim, only:maxvxyzu,do_radiation integer, intent(in) :: eos_type integer, intent(out) :: ierr - integer :: ierr_mesakapp + integer :: ierr_mesakapp,ierr_ra ierr = 0 ! @@ -544,6 +561,12 @@ subroutine init_eos(eos_type,ierr) call init_eos_HIIR() + case(23) + + call read_optab(eos_file,ierr_ra) + if (ierr_ra > 0) call warning('init_eos','Failed to read EOS file') + call init_coolra + end select done_init_eos = .true. @@ -562,7 +585,7 @@ end subroutine init_eos !----------------------------------------------------------------------- subroutine finish_eos(eos_type,ierr) use eos_mesa, only: finish_eos_mesa - + use eos_stamatellos, only: finish_coolra integer, intent(in) :: eos_type integer, intent(out) :: ierr @@ -574,6 +597,11 @@ subroutine finish_eos(eos_type,ierr) !--MESA EoS deallocation ! call finish_eos_mesa + + case(23) + ! Stamatellos deallocation + call finish_coolra + end select done_init_eos=.false. @@ -609,6 +637,7 @@ subroutine get_TempPresCs(eos_type,xyzi,vxyzui,rhoi,tempi,presi,spsoundi,gammai, endif if (maxvxyzu==4) then + if (vxyzui(4) < 0d0) print *, "ui NEGATIVE in eos" if (use_gamma) then call equationofstate(eos_type,ponrhoi,csi,rhoi,xyzi(1),xyzi(2),xyzi(3),tempi,vxyzui(4),& gamma_local=gammai,mu_local=mu,Xlocal=X,Zlocal=Z) @@ -1275,6 +1304,8 @@ logical function eos_outputs_mu(ieos) select case(ieos) case(20) eos_outputs_mu = .true. + case(23) + eos_outputs_mu = .true. case default eos_outputs_mu = .false. end select @@ -1310,6 +1341,7 @@ subroutine eosinfo(eos_type,iprint) use eos_barotropic, only:eos_info_barotropic use eos_piecewise, only:eos_info_piecewise use eos_gasradrec, only:eos_info_gasradrec + use eos_stamatellos, only:eos_file integer, intent(in) :: eos_type,iprint if (id/=master) return @@ -1357,6 +1389,9 @@ subroutine eosinfo(eos_type,iprint) else write(*,'(1x,a,f10.6,a,f10.6)') 'Using fixed composition X = ',X_in,", Z = ",Z_in endif + + case(23) + write(iprint,"(/,a,a)") 'Using tabulated Eos from file:', eos_file, 'and calculated gamma.' end select write(iprint,*) @@ -1411,6 +1446,8 @@ subroutine read_headeropts_eos(ieos,hdr,ierr) if (maxvxyzu >= 4) then if (use_krome) then write(iprint,*) 'KROME eos: initial gamma = 1.666667' + elseif (ieos==23) then + write(iprint,*) 'Tabulated eos with derived gamma' else write(iprint,*) 'adiabatic eos: gamma = ',gamma endif diff --git a/src/main/eos_HIIR.f90 b/src/main/eos_HIIR.f90 index a0ec8b61c..128c1f57a 100644 --- a/src/main/eos_HIIR.f90 +++ b/src/main/eos_HIIR.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/eos_barotropic.f90 b/src/main/eos_barotropic.f90 index 93f32e64c..461785a6f 100644 --- a/src/main/eos_barotropic.f90 +++ b/src/main/eos_barotropic.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/eos_gasradrec.f90 b/src/main/eos_gasradrec.f90 index 831a9302e..d36e8ef9f 100644 --- a/src/main/eos_gasradrec.f90 +++ b/src/main/eos_gasradrec.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/eos_helmholtz.f90 b/src/main/eos_helmholtz.f90 index 882967eba..97b90a2c3 100644 --- a/src/main/eos_helmholtz.f90 +++ b/src/main/eos_helmholtz.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/eos_idealplusrad.f90 b/src/main/eos_idealplusrad.f90 index 72ecc22db..1b7e302bc 100644 --- a/src/main/eos_idealplusrad.f90 +++ b/src/main/eos_idealplusrad.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/eos_mesa.f90 b/src/main/eos_mesa.f90 index 216f04deb..d562107fe 100644 --- a/src/main/eos_mesa.f90 +++ b/src/main/eos_mesa.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/eos_mesa_microphysics.f90 b/src/main/eos_mesa_microphysics.f90 index 903fef912..f12d50290 100644 --- a/src/main/eos_mesa_microphysics.f90 +++ b/src/main/eos_mesa_microphysics.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/eos_piecewise.f90 b/src/main/eos_piecewise.f90 index 8462e4bcf..8797dc8eb 100644 --- a/src/main/eos_piecewise.f90 +++ b/src/main/eos_piecewise.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/eos_shen.f90 b/src/main/eos_shen.f90 index 7c2548677..30d7a10df 100644 --- a/src/main/eos_shen.f90 +++ b/src/main/eos_shen.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/eos_stamatellos.f90 b/src/main/eos_stamatellos.f90 new file mode 100644 index 000000000..297d86e92 --- /dev/null +++ b/src/main/eos_stamatellos.f90 @@ -0,0 +1,276 @@ +!--------------------------------------------------------------------------! +! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! +! See LICENCE file for usage and distribution conditions ! +! http://phantomsph.github.io/ ! +!--------------------------------------------------------------------------! +module eos_stamatellos +! +! eos_stamatellos +! +! :References: None +! +! :Owner: Alison Young +! +! :Runtime parameters: None +! +! :Dependencies: allocutils, datafiles, dim, io +! + + implicit none + real,allocatable,public :: optable(:,:,:) + real,allocatable,public :: gradP_cool(:)!gradP_cool=gradP/rho + real,allocatable,public :: ttherm_store(:),ueqi_store(:),opac_store(:),duSPH(:) + character(len=25), public :: eos_file= 'eos_lom.dat' !default name of tabulated EOS file + logical,public :: floor_energy = .False. + integer,public :: iunitst=19 + integer,save :: nx,ny ! dimensions of optable read in + + public :: read_optab,getopac_opdep,init_coolra,getintenerg_opdep,finish_coolra + +contains + + +subroutine init_coolra() + use dim, only:maxp + use allocutils, only:allocate_array + + print *, "Allocating cooling arrays for maxp=",maxp + call allocate_array('gradP_cool',gradP_cool,maxp) + call allocate_array('ttherm_store',ttherm_store,maxp) + call allocate_array('ueqi_store',ueqi_store,maxp) + call allocate_array('opac_store',opac_store,maxp) + call allocate_array('duSPH',duSPH,maxp) + + gradP_cool(:) = 0d0 + ueqi_store(:) = 0d0 + ttherm_store(:) = 0d0 + opac_store(:) = 0d0 + duSPH(:) = 0d0 + + print *, "NOT using FLD. Using cooling only" + +end subroutine init_coolra + +subroutine finish_coolra() + + if (allocated(optable)) deallocate(optable) + if (allocated(gradP_cool)) deallocate(gradP_cool) + if (allocated(ttherm_store)) deallocate(ttherm_store) + if (allocated(ueqi_store)) deallocate(ueqi_store) + if (allocated(opac_store)) deallocate(opac_store) + if (allocated(duSPH)) deallocate(duSPH) + +end subroutine finish_coolra + + + + +subroutine read_optab(eos_file,ierr) + use datafiles, only:find_phantom_datafile + character(len=*),intent(in) :: eos_file + integer, intent(out) :: ierr + integer i,j,errread + character(len=120) :: filepath,junk + + ! read in EOS and opacity data file for interpolation + filepath=find_phantom_datafile(eos_file,'eos/lombardi') + print *,"EOS file: FILEPATH:",filepath + open(10,file=filepath,form="formatted",status="old",iostat=ierr) + if (ierr > 0) return + do + read(10,'(A120)') junk + print *, junk + if (len(trim(adjustl(junk))) == 0) cycle ! blank line + if ((index(adjustl(junk),"::") == 0) .and. (index(adjustl(junk),"#") /= 1 )) then !ignore comment lines + junk = adjustl(junk) + read(junk, *,iostat=errread) nx, ny + exit + endif + enddo +! allocate array for storing opacity tables + allocate(optable(nx,ny,6)) + do i = 1,nx + do j = 1,ny + read(10,*) OPTABLE(i,j,1),OPTABLE(i,j,2),OPTABLE(i,j,3),& + OPTABLE(i,j,4),OPTABLE(i,j,5),OPTABLE(i,j,6) + enddo + enddo +end subroutine read_optab + +! +! Main subroutine for interpolating tables to get EOS values +! +subroutine getopac_opdep(ui,rhoi,kappaBar,kappaPart,Ti,gmwi) + use io, only:fatal + real, intent(in) :: ui,rhoi + real, intent(out) :: kappaBar,kappaPart,Ti,gmwi + + integer i,j + real m,c + real kbar1,kbar2 + real kappa1,kappa2 + real Tpart1,Tpart2 + real gmw1,gmw2 + real ui_, rhoi_,rhomin,umin + + rhomin = OPTABLE(1,1,1) + umin = OPTABLE(1,1,3) + ! interpolate through OPTABLE to find corresponding kappaBar, kappaPart and T + + ! check values are in range of tables + if (rhoi > OPTABLE(nx,1,1) .or. rhoi < OPTABLE(1,1,1)) then + print *, "optable rho min =", rhomin + call fatal('getopac_opdep','rhoi out of range. Collapsing clump?',var='rhoi',val=rhoi) + elseif (ui > OPTABLE(1,ny,3) .or. ui < OPTABLE(1,1,3)) then + call fatal('getopac_opdep','ui out of range',var='ui',val=ui) + endif + + if (rhoi < rhomin) then + rhoi_ = rhomin + else + rhoi_ = rhoi + endif + + i = 2 + do while((OPTABLE(i,1,1) <= rhoi_).and.(i < nx)) + i = i + 1 + enddo + + if (ui < umin) then + ui_ = umin + else + ui_ = ui + endif + + j = 2 + do while ((OPTABLE(i-1,j,3) <= ui_).and.(j < ny)) + j = j + 1 + enddo + + m = (OPTABLE(i-1,j-1,5) - OPTABLE(i-1,j,5))/(OPTABLE(i-1,j-1,3) - OPTABLE(i-1,j,3)) + c = OPTABLE(i-1,j,5) - m*OPTABLE(i-1,j,3) + + kbar1 = m*ui_ + c + + m = (OPTABLE(i-1,j-1,6) - OPTABLE(i-1,j,6))/(OPTABLE(i-1,j-1,3) - OPTABLE(i-1,j,3)) + c = OPTABLE(i-1,j,6) - m*OPTABLE(i-1,j,3) + + kappa1 = m*ui_ + c + + m = (OPTABLE(i-1,j-1,2) - OPTABLE(i-1,j,2))/(OPTABLE(i-1,j-1,3) - OPTABLE(i-1,j,3)) + c = OPTABLE(i-1,j,2) - m*OPTABLE(i-1,j,3) + + Tpart1 = m*ui_ + c + + m = (OPTABLE(i-1,j-1,4) - OPTABLE(i-1,j,4))/(OPTABLE(i-1,j-1,3) - OPTABLE(i-1,j,3)) + c = OPTABLE(i-1,j,4) - m*OPTABLE(i-1,j,3) + + gmw1 = m*ui_ + c + + j = 2 + do while ((OPTABLE(i,j,3) <= ui).and.(j < ny)) + j = j + 1 + enddo + + m = (OPTABLE(i,j-1,5) - OPTABLE(i,j,5))/(OPTABLE(i,j-1,3) - OPTABLE(i,j,3)) + c = OPTABLE(i,j,5) - m*OPTABLE(i,j,3) + + kbar2 = m*ui_ + c + + m = (OPTABLE(i,j-1,6) - OPTABLE(i,j,6))/(OPTABLE(i,j-1,3) - OPTABLE(i,j,3)) + c = OPTABLE(i,j,6) - m*OPTABLE(i,j,3) + + kappa2 = m*ui_ + c + + m = (OPTABLE(i,j-1,2) - OPTABLE(i,j,2))/(OPTABLE(i,j-1,3) - OPTABLE(i,j,3)) + c = OPTABLE(i,j,2) - m*OPTABLE(i,j,3) + + Tpart2 = m*ui_ + c + + m = (OPTABLE(i,j-1,4) - OPTABLE(i,j,4))/(OPTABLE(i,j-1,3) - OPTABLE(i,j,3)) + c = OPTABLE(i,j,4) - m*OPTABLE(i,j,3) + + gmw2 = m*ui_ + c + + m = (kappa2 - kappa1)/(OPTABLE(i,1,1)-OPTABLE(i-1,1,1)) + c = kappa2 - m*OPTABLE(i,1,1) + + kappaPart = m*rhoi_ + c + + m = (kbar2 - kbar1)/(OPTABLE(i,1,1)-OPTABLE(i-1,1,1)) + c = kbar2 - m*OPTABLE(i,1,1) + + kappaBar = m*rhoi_ + c + + m = (Tpart2 - Tpart1)/(OPTABLE(i,1,1)-OPTABLE(i-1,1,1)) + c = Tpart2 - m*OPTABLE(i,1,1) + + Ti = m*rhoi_ + c + + m = (gmw2 - gmw1)/(OPTABLE(i,1,1)-OPTABLE(i-1,1,1)) + c = gmw2 - m*OPTABLE(i,1,1) + + gmwi = m*rhoi_ + c +end subroutine getopac_opdep + +subroutine getintenerg_opdep(Teqi, rhoi, ueqi) + use io, only:warning + real, intent(out) :: ueqi + real, intent(in) :: Teqi,rhoi + + real u1, u2 + real m, c + integer i, j + real rhoi_ + + if (rhoi > OPTABLE(nx,1,1) .or. rhoi < OPTABLE(1,1,1)) then + call warning('getintenerg_opdep','rhoi out of range',var='rhoi',val=rhoi) + elseif (Teqi > OPTABLE(1,ny,2) .or. Teqi < OPTABLE(1,1,2)) then + call warning('getintenerg_opdep','Ti out of range',var='Ti',val=Teqi) + endif + + + ! interpolate through OPTABLE to obtain equilibrium internal energy + + if (rhoi < 1.0e-24) then + rhoi_ = 1.0e-24 + else + rhoi_ = rhoi + endif + + i = 2 + do while((OPTABLE(i,1,1) <= rhoi_).and.(i < nx)) + i = i + 1 + enddo + + j = 2 + do while ((OPTABLE(i-1,j,2) <= Teqi).and.(j < ny)) + j = j + 1 + enddo + + + m = (OPTABLE(i-1,j-1,3) - OPTABLE(i-1,j,3))/(OPTABLE(i-1,j-1,2) - OPTABLE(i-1,j,2)) + c = OPTABLE(i-1,j,3) - m*OPTABLE(i-1,j,2) + + u1 = m*Teqi + c + + j = 2 + do while ((OPTABLE(i,j,2) <= Teqi).and.(j < ny)) + j = j + 1 + enddo + + m = (OPTABLE(i,j-1,3) - OPTABLE(i,j,3))/(OPTABLE(i,j-1,2) - OPTABLE(i,j,2)) + c = OPTABLE(i,j,3) - m*OPTABLE(i,j,2) + + u2 = m*Teqi + c + + m = (u2 - u1)/(OPTABLE(i,1,1)-OPTABLE(i-1,1,1)) + c = u2 - m*OPTABLE(i,1,1) + + ueqi = m*rhoi_ + c +end subroutine getintenerg_opdep + +end module eos_stamatellos + + diff --git a/src/main/eos_stratified.f90 b/src/main/eos_stratified.f90 index 37f9bcd14..ed1e556c8 100644 --- a/src/main/eos_stratified.f90 +++ b/src/main/eos_stratified.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/evolve.F90 b/src/main/evolve.F90 index b899b6d5a..c7bee8645 100644 --- a/src/main/evolve.F90 +++ b/src/main/evolve.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/evwrite.f90 b/src/main/evwrite.f90 index 8c8e5b76f..6014ead89 100644 --- a/src/main/evwrite.f90 +++ b/src/main/evwrite.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/extern_Bfield.f90 b/src/main/extern_Bfield.f90 index 1b4319e70..7314b7364 100644 --- a/src/main/extern_Bfield.f90 +++ b/src/main/extern_Bfield.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/extern_binary.f90 b/src/main/extern_binary.f90 index 1602453fc..c14f4cabb 100644 --- a/src/main/extern_binary.f90 +++ b/src/main/extern_binary.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/extern_binary_gw.f90 b/src/main/extern_binary_gw.f90 index db906d239..a1638d00f 100644 --- a/src/main/extern_binary_gw.f90 +++ b/src/main/extern_binary_gw.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/extern_corotate.f90 b/src/main/extern_corotate.f90 index e8d9bfff8..0d7165966 100644 --- a/src/main/extern_corotate.f90 +++ b/src/main/extern_corotate.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/extern_densprofile.f90 b/src/main/extern_densprofile.f90 index c106668f8..f203ddd37 100644 --- a/src/main/extern_densprofile.f90 +++ b/src/main/extern_densprofile.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/extern_geopot.f90 b/src/main/extern_geopot.f90 index f56ecb54a..6188bb3ec 100644 --- a/src/main/extern_geopot.f90 +++ b/src/main/extern_geopot.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/extern_gnewton.f90 b/src/main/extern_gnewton.f90 index 8d60fe62e..54cf20862 100644 --- a/src/main/extern_gnewton.f90 +++ b/src/main/extern_gnewton.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/extern_gr.f90 b/src/main/extern_gr.f90 index 7043299e2..04f5ca1bf 100644 --- a/src/main/extern_gr.f90 +++ b/src/main/extern_gr.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/extern_gwinspiral.f90 b/src/main/extern_gwinspiral.f90 index 460cb5c3b..3cbe98ba8 100644 --- a/src/main/extern_gwinspiral.f90 +++ b/src/main/extern_gwinspiral.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/extern_lensethirring.f90 b/src/main/extern_lensethirring.f90 index e1f318e46..3c71db58a 100644 --- a/src/main/extern_lensethirring.f90 +++ b/src/main/extern_lensethirring.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/extern_prdrag.f90 b/src/main/extern_prdrag.f90 index da3f311ff..4e068b85d 100644 --- a/src/main/extern_prdrag.f90 +++ b/src/main/extern_prdrag.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/extern_spiral.f90 b/src/main/extern_spiral.f90 index f27a06d9f..3b787f06d 100644 --- a/src/main/extern_spiral.f90 +++ b/src/main/extern_spiral.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/extern_staticsine.f90 b/src/main/extern_staticsine.f90 index 8d71b1c14..1eb65eceb 100644 --- a/src/main/extern_staticsine.f90 +++ b/src/main/extern_staticsine.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/externalforces.f90 b/src/main/externalforces.f90 index aa5aad3ba..d8decef4f 100644 --- a/src/main/externalforces.f90 +++ b/src/main/externalforces.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/externalforces_gr.f90 b/src/main/externalforces_gr.f90 index 4219f96ae..d98c843bc 100644 --- a/src/main/externalforces_gr.f90 +++ b/src/main/externalforces_gr.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/fastmath.f90 b/src/main/fastmath.f90 index 59bb2a052..2bb053879 100644 --- a/src/main/fastmath.f90 +++ b/src/main/fastmath.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/force.F90 b/src/main/force.F90 index 38852ec98..209f62f2c 100644 --- a/src/main/force.F90 +++ b/src/main/force.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! @@ -39,11 +39,12 @@ module forces ! ! :Runtime parameters: None ! -! :Dependencies: boundary, cooling, dim, dust, eos, eos_shen, fastmath, -! growth, io, io_summary, kdtree, kernel, linklist, metric_tools, -! mpiderivs, mpiforce, mpimemory, mpiutils, nicil, omputils, options, -! part, physcon, ptmass, ptmass_heating, radiation_utils, timestep, -! timestep_ind, timestep_sts, timing, units, utils_gr, viscosity +! :Dependencies: boundary, cooling, dim, dust, eos, eos_shen, +! eos_stamatellos, fastmath, growth, io, io_summary, kdtree, kernel, +! linklist, metric_tools, mpiderivs, mpiforce, mpimemory, mpiutils, +! nicil, omputils, options, part, physcon, ptmass, ptmass_heating, +! radiation_utils, timestep, timestep_ind, timestep_sts, timing, units, +! utils_gr, viscosity ! use dim, only:maxfsum,maxxpartveciforce,maxp,ndivcurlB,ndivcurlv,& maxdusttypes,maxdustsmall,do_radiation @@ -909,6 +910,7 @@ subroutine compute_forces(i,iamgasi,iamdusti,xpartveci,hi,hi1,hi21,hi41,gradhi,g use part, only:rhoh,dvdx,aprmassoftype use nicil, only:nimhd_get_jcbcb,nimhd_get_dBdt use eos, only:ieos,eos_is_non_ideal + use eos_stamatellos, only:gradP_cool,getopac_opdep #ifdef GRAVITY use kernel, only:kernel_softening use ptmass, only:ptmass_not_obscured @@ -920,7 +922,7 @@ subroutine compute_forces(i,iamgasi,iamdusti,xpartveci,hi,hi1,hi21,hi41,gradhi,g use dust, only:get_ts,idrag,icut_backreaction,ilimitdustflux,irecon,drag_implicit use kernel, only:wkern_drag,cnormk_drag,wkern,cnormk use part, only:ndustsmall,grainsize,graindens,ndustsmall,grainsize,graindens,filfac - use options, only:use_porosity + use options, only:use_porosity,icooling use growth, only:get_size use kernel, only:wkern,cnormk #ifdef IND_TIMESTEPS @@ -933,6 +935,7 @@ subroutine compute_forces(i,iamgasi,iamdusti,xpartveci,hi,hi1,hi21,hi41,gradhi,g use metric_tools,only:imet_minkowski,imetric use utils_gr, only:get_bigv use radiation_utils, only:get_rad_R + use io, only:fatal integer, intent(in) :: i logical, intent(in) :: iamgasi,iamdusti real, intent(in) :: xpartveci(:) @@ -1030,6 +1033,7 @@ subroutine compute_forces(i,iamgasi,iamdusti,xpartveci,hi,hi1,hi21,hi41,gradhi,g real :: dlorentzv,lorentzj,lorentzi_star,lorentzj_star,projbigvi,projbigvj real :: bigvj(1:3),velj(3),metricj(0:3,0:3,2),projbigvstari,projbigvstarj real :: radPj,fgravxi,fgravyi,fgravzi + real :: gradpx,gradpy,gradpz,gradP_cooli=0d0,gradP_coolj=0d0 ! unpack xi = xpartveci(ixi) @@ -1189,6 +1193,12 @@ subroutine compute_forces(i,iamgasi,iamdusti,xpartveci,hi,hi1,hi21,hi41,gradhi,g fgravxi = 0. fgravyi = 0. fgravzi = 0. + if (icooling == 9) then + gradP_cool(i) = 0d0 + gradpx = 0d0 + gradpy = 0d0 + gradpz = 0d0 + endif loop_over_neighbours2: do n = 1,nneigh @@ -1584,6 +1594,14 @@ subroutine compute_forces(i,iamgasi,iamdusti,xpartveci,hi,hi1,hi21,hi41,gradhi,g !--add av term to pressure gradpi = pmassj*(pro2i + qrho2i)*grkerni if (usej) gradpj = pmassj*(pro2j + qrho2j)*grkernj + !-- calculate grad P from gas pressure alone for cooling + if (icooling == 9) then + gradP_cooli = pmassj*pri*rho1i*rho1i*grkerni + gradP_coolj = 0d0 + if (usej) then + gradp_coolj = pmassj*prj*rho1j*rho1j*grkernj + endif + endif !--artificial thermal conductivity (need j term) if (maxvxyzu >= 4) then @@ -1693,6 +1711,11 @@ subroutine compute_forces(i,iamgasi,iamdusti,xpartveci,hi,hi1,hi21,hi41,gradhi,g fsum(ifyi) = fsum(ifyi) - runiy*(gradp + fgrav) - projsy fsum(ifzi) = fsum(ifzi) - runiz*(gradp + fgrav) - projsz fsum(ipot) = fsum(ipot) + pmassj*phii ! no need to symmetrise (see PM07) + if (icooling == 9) then + gradpx = gradpx + runix*(gradP_cooli + gradP_coolj) + gradpy = gradpy + runiy*(gradP_cooli + gradP_coolj) + gradpz = gradpz + runiz*(gradP_cooli + gradP_coolj) + endif !--calculate divv for use in du, h prediction, av switch etc. fsum(idrhodti) = fsum(idrhodti) + projv*grkerni @@ -1974,6 +1997,8 @@ subroutine compute_forces(i,iamgasi,iamdusti,xpartveci,hi,hi1,hi21,hi41,gradhi,g enddo loop_over_neighbours2 + if (icooling == 9) gradP_cool(i) = sqrt(gradpx*gradpx + gradpy*gradpy + gradpz*gradpz) + if (gr .and. gravity .and. ien_type == ien_etotal) then fsum(idudtdissi) = fsum(idudtdissi) + vxi*fgravxi + vyi*fgravyi + vzi*fgravzi endif @@ -2584,6 +2609,7 @@ subroutine finish_cell_and_store_results(icall,cell,fxyzu,xyzh,vxyzu,poten,dt,dv use part, only:Omega_k use io, only:warning use physcon, only:c,kboltz + use eos_stamatellos, only:duSPH integer, intent(in) :: icall type(cellforce), intent(inout) :: cell real, intent(inout) :: fxyzu(:,:) @@ -2653,7 +2679,6 @@ subroutine finish_cell_and_store_results(icall,cell,fxyzu,xyzh,vxyzu,poten,dt,dv real :: densi, vxi,vyi,vzi,u0i,dudtcool,dudtheat real :: posi(3),veli(3),gcov(0:3,0:3),metrici(0:3,0:3,2) integer :: ii,ia,ib,ic,ierror - eni = 0. realviscosity = (irealvisc > 0) @@ -2974,30 +2999,33 @@ subroutine finish_cell_and_store_results(icall,cell,fxyzu,xyzh,vxyzu,poten,dt,dv !fxyzu(4,i) = 0. else if (maxvxyzu >= 4) fxyzu(4,i) = fxyz4 + if (icooling == 9) then + call energ_cooling(xi,yi,zi,vxyzu(4,i),rhoi,dt,divcurlv(1,i),dudtcool,duhydro=fxyz4,ipart=i) + dusph(i) = fxyz4 + endif endif endif if (mhd) then ! - ! sum returns d(B/rho)/dt, just what we want! + ! sum returns d(b/rho)/dt, just what we want! ! - dBevol(1,i) = fsum(idBevolxi) - dBevol(2,i) = fsum(idBevolyi) - dBevol(3,i) = fsum(idBevolzi) + dbevol(1,i) = fsum(idbevolxi) + dbevol(2,i) = fsum(idbevolyi) + dbevol(3,i) = fsum(idbevolzi) ! - ! hyperbolic/parabolic cleaning terms (dpsi/dt) from Tricco & Price (2012) + ! hyperbolic/parabolic cleaning terms (dpsi/dt) from tricco & price (2012) ! if (psidecayfac > 0.) then vcleani = overcleanfac*vwavei dtau = psidecayfac*vcleani*hi1 ! - ! we clean using the difference operator for div B + ! we clean using the difference operator for div b ! psii = xpartveci(ipsi) ! new cleaning evolving d/dt (psi/c_h) dBevol(4,i) = -vcleani*fsum(idivBdiffi)*rho1i - psii*dtau - 0.5*psii*divvi - dtclean = C_cour*hi/(vcleani + tiny(0.)) endif endif @@ -3018,6 +3046,7 @@ subroutine finish_cell_and_store_results(icall,cell,fxyzu,xyzh,vxyzu,poten,dt,dv ! cooling timestep dt < fac*u/(du/dt) if (maxvxyzu >= 4 .and. .not. gr) then ! not with gr which uses entropy if (eni + dtc*fxyzu(4,i) < epsilon(0.) .and. eni > epsilon(0.)) dtcool = C_cool*abs(eni/fxyzu(4,i)) + if (dtcool < epsilon(0.) .or. isnan(dtcool)) print *, "dtcool=zero or NaN in force.F90", dtcool endif ! s entropy timestep to avoid too large s entropy leads to infinite temperature diff --git a/src/main/forcing.F90 b/src/main/forcing.F90 index a0db37a7a..fd1348ee2 100644 --- a/src/main/forcing.F90 +++ b/src/main/forcing.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/fs_data.f90 b/src/main/fs_data.f90 index 2e5c0718f..784df1d71 100644 --- a/src/main/fs_data.f90 +++ b/src/main/fs_data.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/geometry.f90 b/src/main/geometry.f90 index d90782a91..5502bdb50 100644 --- a/src/main/geometry.f90 +++ b/src/main/geometry.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/gitinfo.f90 b/src/main/gitinfo.f90 index 8ea06264e..e77601eda 100644 --- a/src/main/gitinfo.f90 +++ b/src/main/gitinfo.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/growth.f90 b/src/main/growth.f90 index a2d35aec7..4c8c46d3c 100644 --- a/src/main/growth.f90 +++ b/src/main/growth.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/growth_smol.f90 b/src/main/growth_smol.f90 index 0a818364f..c1a88b3f4 100644 --- a/src/main/growth_smol.f90 +++ b/src/main/growth_smol.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/h2chem.f90 b/src/main/h2chem.f90 index a79faa951..38f7580c2 100644 --- a/src/main/h2chem.f90 +++ b/src/main/h2chem.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/initial.F90 b/src/main/initial.F90 index 67b480e15..9c638fa74 100644 --- a/src/main/initial.F90 +++ b/src/main/initial.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/inject_BHL.f90 b/src/main/inject_BHL.f90 index ae41283de..37bde82e0 100644 --- a/src/main/inject_BHL.f90 +++ b/src/main/inject_BHL.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/inject_bondi.f90 b/src/main/inject_bondi.f90 index 1c2fc22bc..e23e24f0b 100644 --- a/src/main/inject_bondi.f90 +++ b/src/main/inject_bondi.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/inject_firehose.f90 b/src/main/inject_firehose.f90 index cf1e5bfb0..de0e176f6 100644 --- a/src/main/inject_firehose.f90 +++ b/src/main/inject_firehose.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/inject_galcen_winds.f90 b/src/main/inject_galcen_winds.f90 index d52baaf8a..c6e588617 100644 --- a/src/main/inject_galcen_winds.f90 +++ b/src/main/inject_galcen_winds.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/inject_keplerian.f90 b/src/main/inject_keplerian.f90 index 45376c6ba..45617faf4 100644 --- a/src/main/inject_keplerian.f90 +++ b/src/main/inject_keplerian.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/inject_keplerianshear.f90 b/src/main/inject_keplerianshear.f90 index 773fc7d72..56321d07d 100644 --- a/src/main/inject_keplerianshear.f90 +++ b/src/main/inject_keplerianshear.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/inject_randomwind.f90 b/src/main/inject_randomwind.f90 index cb8abf630..f7e55be2a 100644 --- a/src/main/inject_randomwind.f90 +++ b/src/main/inject_randomwind.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/inject_rochelobe.f90 b/src/main/inject_rochelobe.f90 index ab2861afe..75f27b783 100644 --- a/src/main/inject_rochelobe.f90 +++ b/src/main/inject_rochelobe.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/inject_sim.f90 b/src/main/inject_sim.f90 index 127d1805d..35f14e6ae 100644 --- a/src/main/inject_sim.f90 +++ b/src/main/inject_sim.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/inject_sne.f90 b/src/main/inject_sne.f90 index 867ad2b88..c97a17c15 100644 --- a/src/main/inject_sne.f90 +++ b/src/main/inject_sne.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/inject_steadydisc.f90 b/src/main/inject_steadydisc.f90 index d7071af77..6ad32175c 100644 --- a/src/main/inject_steadydisc.f90 +++ b/src/main/inject_steadydisc.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/inject_unifwind.f90 b/src/main/inject_unifwind.f90 index 80f203a63..13fd8e897 100644 --- a/src/main/inject_unifwind.f90 +++ b/src/main/inject_unifwind.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/inject_wind.f90 b/src/main/inject_wind.f90 index ed7597fcf..378e6df8a 100644 --- a/src/main/inject_wind.f90 +++ b/src/main/inject_wind.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/inject_windtunnel.f90 b/src/main/inject_windtunnel.f90 index 07f1fa166..f45131e06 100644 --- a/src/main/inject_windtunnel.f90 +++ b/src/main/inject_windtunnel.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! @@ -19,7 +19,6 @@ module inject ! - handled_layers : *(integer) number of handled BHL wind layers* ! - hold_star : *1: subtract CM velocity of star particles at each timestep* ! - 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)* @@ -298,10 +297,10 @@ subroutine subtract_star_vcom(nsphere,xyzh,vxyzu) vstar = vstar/real(nbulk) do i=1,nsphere - if (xyzh(1,i) < 2.*Rstar) then + if (xyzh(1,i) < 2.*Rstar) then vxyzu(1:3,i) = vxyzu(1:3,i) - vstar - endif -enddo + endif + enddo end subroutine subtract_star_vcom diff --git a/src/main/interp_metric.f90 b/src/main/interp_metric.f90 index a6037037d..e22c1a07a 100644 --- a/src/main/interp_metric.f90 +++ b/src/main/interp_metric.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/inverse4x4.f90 b/src/main/inverse4x4.f90 index 2107fae70..39fd24554 100644 --- a/src/main/inverse4x4.f90 +++ b/src/main/inverse4x4.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/io.F90 b/src/main/io.F90 index 97e2bb204..0f336c3ca 100644 --- a/src/main/io.F90 +++ b/src/main/io.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/ionization.f90 b/src/main/ionization.f90 index 7141b2d2f..5e22c1b14 100644 --- a/src/main/ionization.f90 +++ b/src/main/ionization.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/kdtree.F90 b/src/main/kdtree.F90 index 54d88049b..7b3a60314 100644 --- a/src/main/kdtree.F90 +++ b/src/main/kdtree.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/kernel_WendlandC2.f90 b/src/main/kernel_WendlandC2.f90 index 3b1c4f38c..f1b3167ab 100644 --- a/src/main/kernel_WendlandC2.f90 +++ b/src/main/kernel_WendlandC2.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/kernel_WendlandC4.f90 b/src/main/kernel_WendlandC4.f90 index 6a0ded877..2c6c899b7 100644 --- a/src/main/kernel_WendlandC4.f90 +++ b/src/main/kernel_WendlandC4.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/kernel_WendlandC6.f90 b/src/main/kernel_WendlandC6.f90 index c6e54af66..45255d139 100644 --- a/src/main/kernel_WendlandC6.f90 +++ b/src/main/kernel_WendlandC6.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/kernel_cubic.f90 b/src/main/kernel_cubic.f90 index 6ec8230a9..9b52948c6 100644 --- a/src/main/kernel_cubic.f90 +++ b/src/main/kernel_cubic.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/kernel_quartic.f90 b/src/main/kernel_quartic.f90 index de96a3432..9779b16fd 100644 --- a/src/main/kernel_quartic.f90 +++ b/src/main/kernel_quartic.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/kernel_quintic.f90 b/src/main/kernel_quintic.f90 index 82e735192..284b36048 100644 --- a/src/main/kernel_quintic.f90 +++ b/src/main/kernel_quintic.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/krome.f90 b/src/main/krome.f90 index 4ece40748..567b1611f 100644 --- a/src/main/krome.f90 +++ b/src/main/krome.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/linklist_kdtree.F90 b/src/main/linklist_kdtree.F90 index 96ea0ea7f..8e1ccca45 100644 --- a/src/main/linklist_kdtree.F90 +++ b/src/main/linklist_kdtree.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/memory.f90 b/src/main/memory.f90 index 809c17221..678390112 100644 --- a/src/main/memory.f90 +++ b/src/main/memory.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/metric_et.f90 b/src/main/metric_et.f90 index cd93c9c3b..f95e87c39 100644 --- a/src/main/metric_et.f90 +++ b/src/main/metric_et.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/metric_et_utils.f90 b/src/main/metric_et_utils.f90 index a3c3bebf5..6dc984f52 100644 --- a/src/main/metric_et_utils.f90 +++ b/src/main/metric_et_utils.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/metric_flrw.f90 b/src/main/metric_flrw.f90 index 67127f46e..ce5aa4751 100644 --- a/src/main/metric_flrw.f90 +++ b/src/main/metric_flrw.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/metric_kerr-schild.f90 b/src/main/metric_kerr-schild.f90 index 59ada6922..989386a3f 100644 --- a/src/main/metric_kerr-schild.f90 +++ b/src/main/metric_kerr-schild.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/metric_kerr.f90 b/src/main/metric_kerr.f90 index b270e4111..6ada2574c 100644 --- a/src/main/metric_kerr.f90 +++ b/src/main/metric_kerr.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/metric_minkowski.f90 b/src/main/metric_minkowski.f90 index 8164301c0..68532f133 100644 --- a/src/main/metric_minkowski.f90 +++ b/src/main/metric_minkowski.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/metric_schwarzschild.f90 b/src/main/metric_schwarzschild.f90 index 6add9d242..c48ea5c54 100644 --- a/src/main/metric_schwarzschild.f90 +++ b/src/main/metric_schwarzschild.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/metric_tools.f90 b/src/main/metric_tools.f90 index 05b485fcb..f7c66bf78 100644 --- a/src/main/metric_tools.f90 +++ b/src/main/metric_tools.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/mf_write.f90 b/src/main/mf_write.f90 index 486ec1bf7..070d9bab6 100644 --- a/src/main/mf_write.f90 +++ b/src/main/mf_write.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/mol_data.f90 b/src/main/mol_data.f90 index fe91bae89..6e50ce28b 100644 --- a/src/main/mol_data.f90 +++ b/src/main/mol_data.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/mpi_balance.F90 b/src/main/mpi_balance.F90 index 1679dda42..0ed1f725a 100644 --- a/src/main/mpi_balance.F90 +++ b/src/main/mpi_balance.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/mpi_dens.F90 b/src/main/mpi_dens.F90 index 9986c8219..c74710b58 100644 --- a/src/main/mpi_dens.F90 +++ b/src/main/mpi_dens.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/mpi_derivs.F90 b/src/main/mpi_derivs.F90 index 1847cbd6c..31a2dafe9 100644 --- a/src/main/mpi_derivs.F90 +++ b/src/main/mpi_derivs.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/mpi_domain.F90 b/src/main/mpi_domain.F90 index b58c49fed..ab339c61a 100644 --- a/src/main/mpi_domain.F90 +++ b/src/main/mpi_domain.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/mpi_force.F90 b/src/main/mpi_force.F90 index f4ff7722e..4e461bac3 100644 --- a/src/main/mpi_force.F90 +++ b/src/main/mpi_force.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/mpi_memory.f90 b/src/main/mpi_memory.f90 index 5d635f2d4..465ce6d07 100644 --- a/src/main/mpi_memory.f90 +++ b/src/main/mpi_memory.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/mpi_tree.F90 b/src/main/mpi_tree.F90 index 8b24ace8c..47088e71f 100644 --- a/src/main/mpi_tree.F90 +++ b/src/main/mpi_tree.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/mpi_utils.F90 b/src/main/mpi_utils.F90 index 03816c05d..561ab84f8 100644 --- a/src/main/mpi_utils.F90 +++ b/src/main/mpi_utils.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/nicil_supplement.f90 b/src/main/nicil_supplement.f90 index c0d5fbfd3..40c5fc49d 100644 --- a/src/main/nicil_supplement.f90 +++ b/src/main/nicil_supplement.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/options.f90 b/src/main/options.f90 index f49271fca..d16ae7d8a 100644 --- a/src/main/options.f90 +++ b/src/main/options.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/part.F90 b/src/main/part.F90 index 6f7655daa..d74023513 100644 --- a/src/main/part.F90 +++ b/src/main/part.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/partinject.F90 b/src/main/partinject.F90 index 697a46be1..3e97a8d2a 100644 --- a/src/main/partinject.F90 +++ b/src/main/partinject.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/phantom.f90 b/src/main/phantom.f90 index 798802b99..51bf2f8fd 100644 --- a/src/main/phantom.f90 +++ b/src/main/phantom.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/physcon.f90 b/src/main/physcon.f90 index 414ba9d14..ed22fdda0 100644 --- a/src/main/physcon.f90 +++ b/src/main/physcon.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/porosity.f90 b/src/main/porosity.f90 index a70b3801c..f10ac1c76 100755 --- a/src/main/porosity.f90 +++ b/src/main/porosity.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/ptmass.F90 b/src/main/ptmass.F90 index 4f4c9f995..cf1ceb869 100644 --- a/src/main/ptmass.F90 +++ b/src/main/ptmass.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! @@ -190,7 +190,6 @@ subroutine get_accel_sink_gas(nptmass,xi,yi,zi,hi,xyzmh_ptmass,fxi,fyi,fzi,phi, extrap = .false. endif - ftmpxi = 0. ! use temporary summation variable ftmpyi = 0. ! (better for round-off, plus we need this bit of ftmpzi = 0. ! the force to calculate the dtphi timestep) diff --git a/src/main/ptmass_heating.f90 b/src/main/ptmass_heating.f90 index 2095b88f3..009415edb 100644 --- a/src/main/ptmass_heating.f90 +++ b/src/main/ptmass_heating.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/ptmass_radiation.f90 b/src/main/ptmass_radiation.f90 index dc175ff8d..0913abc0f 100644 --- a/src/main/ptmass_radiation.f90 +++ b/src/main/ptmass_radiation.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/quitdump.f90 b/src/main/quitdump.f90 index 5f0159905..dc60f14fb 100644 --- a/src/main/quitdump.f90 +++ b/src/main/quitdump.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/radiation_implicit.f90 b/src/main/radiation_implicit.f90 index 0a79918d8..bf2de152d 100644 --- a/src/main/radiation_implicit.f90 +++ b/src/main/radiation_implicit.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/radiation_utils.f90 b/src/main/radiation_utils.f90 index 19b176db9..214045ce4 100644 --- a/src/main/radiation_utils.f90 +++ b/src/main/radiation_utils.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/random.f90 b/src/main/random.f90 index dd2ba97c1..fcc0b2f56 100644 --- a/src/main/random.f90 +++ b/src/main/random.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/readwrite_dumps.F90 b/src/main/readwrite_dumps.F90 index ff82e7935..20bf8bdcd 100644 --- a/src/main/readwrite_dumps.F90 +++ b/src/main/readwrite_dumps.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/readwrite_dumps_common.f90 b/src/main/readwrite_dumps_common.f90 index df6fc8a8b..b54f1f1e8 100644 --- a/src/main/readwrite_dumps_common.f90 +++ b/src/main/readwrite_dumps_common.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/readwrite_dumps_fortran.f90 b/src/main/readwrite_dumps_fortran.f90 index 80e5b7d75..4c098e8d5 100644 --- a/src/main/readwrite_dumps_fortran.f90 +++ b/src/main/readwrite_dumps_fortran.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! @@ -18,8 +18,13 @@ module readwrite_dumps_fortran ! ! :Runtime parameters: None ! -! :Dependencies: boundary_dyn, dim, dump_utils, eos, io, memory, -! metric_tools, mpiutils, options, part, readwrite_dumps_common, +! :Dependencies: boundary_dyn, dim, dump_utils, eos, eos_stamatellos, io, +! memory, metric_tools, mpiutils, options, part, readwrite_dumps_common, +! sphNGutils, timestep +! + +! :Dependencies: boundary_dyn, dim, dump_utils, eos, eos_stamatellos, io, +! memory, metric_tools, mpiutils, options, part, readwrite_dumps_common, ! sphNGutils, timestep ! use dump_utils, only:lenid,ndatatypes,i_int,i_int1,i_int2,i_int4,i_int8,& @@ -71,6 +76,7 @@ subroutine write_fulldump_fortran(t,dumpfile,ntotal,iorder,sphNG) use timestep, only:dtmax,idtmax_n,idtmax_frac use part, only:ibin,krome_nmols,T_gas_cool use metric_tools, only:imetric, imet_et + use eos_stamatellos, only:ttherm_store,ueqi_store,opac_store real, intent(in) :: t character(len=*), intent(in) :: dumpfile integer, intent(in), optional :: iorder(:) @@ -247,7 +253,12 @@ subroutine write_fulldump_fortran(t,dumpfile,ntotal,iorder,sphNG) call write_array(1,eos_vars,eos_vars_label,1,npart,k,ipass,idump,nums,nerr,index=iZ) endif endif - + ! write stamatellos cooling values + if (icooling == 9) then + call write_array(1,ueqi_store,'ueqi',npart,k,ipass,idump,nums,nerr) + call write_array(1,ttherm_store,'ttherm',npart,k,ipass,idump,nums,nerr) + call write_array(1,opac_store,'opacity',npart,k,ipass,idump,nums,nerr) + endif ! smoothing length written as real*4 to save disk space call write_array(1,xyzh,xyzh_label,1,npart,k,ipass,idump,nums,nerr,use_kind=4,index=4) if (maxalpha==maxp) call write_array(1,alphaind,(/'alpha'/),1,npart,k,ipass,idump,nums,nerr) diff --git a/src/main/readwrite_dumps_hdf5.F90 b/src/main/readwrite_dumps_hdf5.F90 index 3e929d7b4..9613c45c1 100644 --- a/src/main/readwrite_dumps_hdf5.F90 +++ b/src/main/readwrite_dumps_hdf5.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/readwrite_infile.F90 b/src/main/readwrite_infile.F90 index e173b7fe7..74494b1a1 100644 --- a/src/main/readwrite_infile.F90 +++ b/src/main/readwrite_infile.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! @@ -218,8 +218,8 @@ subroutine write_infile(infile,logfile,evfile,dumpfile,iwritein,iprint) ! thermodynamics ! call write_options_eos(iwritein) - if (maxvxyzu >= 4 .and. (ieos==2 .or. ieos==5 .or. ieos==10 .or. ieos==15 .or. & - ieos==12 .or. ieos==16 .or. ieos==17 .or. ieos==22) ) then + if (maxvxyzu >= 4 .and. (ieos==2 .or. ieos==5 .or. ieos==10 .or. ieos==15 .or. ieos==12 .or. ieos==16 & + .or. ieos==17 .or. ieos==21 .or. ieos==22 .or. ieos==23) ) then call write_inopt(ipdv_heating,'ipdv_heating','heating from PdV work (0=off, 1=on)',iwritein) call write_inopt(ishock_heating,'ishock_heating','shock heating (0=off, 1=on)',iwritein) if (mhd) then @@ -701,15 +701,16 @@ subroutine read_infile(infile,logfile,evfile,dumpfile) if (beta > 4.) call warn(label,'very high beta viscosity set') #ifndef MCFOST if (maxvxyzu >= 4 .and. (ieos /= 2 .and. ieos /= 5 .and. ieos /= 4 .and. ieos /= 10 .and. & - ieos /=11 .and. ieos /=12 .and. ieos /= 15 .and. ieos /= 16 .and. ieos /= 17 .and. & - ieos /= 20 .and. ieos/=22 .and. ieos /= 9)) & - call fatal(label,'only ieos=2 makes sense if storing thermal energy') + ieos /=11 .and. ieos /=12 .and. ieos /= 15 .and. ieos /= 16 .and. ieos /= 17 .and. & + ieos /= 20 .and. ieos/=22 .and. ieos/=9 .and. ieos/=23)) & + call fatal(label,'only ieos=2 makes sense if storing thermal energy') #endif if (irealvisc < 0 .or. irealvisc > 12) call fatal(label,'invalid setting for physical viscosity') if (shearparam < 0.) call fatal(label,'stupid value for shear parameter (< 0)') if (irealvisc==2 .and. shearparam > 1) call error(label,'alpha > 1 for shakura-sunyaev viscosity') if (iverbose > 99 .or. iverbose < -9) call fatal(label,'invalid verboseness setting (two digits only)') - if (icooling > 0 .and. .not.(ieos == 2 .or. ieos == 5 .or. ieos == 17 .or. ieos==22)) & + + if (icooling > 0 .and. .not.(ieos == 2 .or. ieos == 5 .or. ieos == 17 .or. ieos == 22 .or. ieos == 23)) & call fatal(label,'cooling requires adiabatic eos (ieos=2)') if (icooling > 0 .and. (ipdv_heating <= 0 .or. ishock_heating <= 0)) & call fatal(label,'cooling requires shock and work contributions') diff --git a/src/main/relaxem.f90 b/src/main/relaxem.f90 index f7cfe238f..ad1694c76 100644 --- a/src/main/relaxem.f90 +++ b/src/main/relaxem.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/sort_particles.f90 b/src/main/sort_particles.f90 index 89cba893a..da0b3ce0f 100644 --- a/src/main/sort_particles.f90 +++ b/src/main/sort_particles.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/step_leapfrog.F90 b/src/main/step_leapfrog.F90 index a399f495b..17743f106 100644 --- a/src/main/step_leapfrog.F90 +++ b/src/main/step_leapfrog.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! @@ -23,9 +23,9 @@ module step_lf_global ! :Runtime parameters: None ! ! :Dependencies: boundary_dyn, cons2prim, cons2primsolver, cooling, -! damping, deriv, dim, extern_gr, growth, io, io_summary, metric_tools, -! mpiutils, options, part, porosity, substepping, timestep, timestep_ind, -! timestep_sts, timing +! cooling_radapprox, damping, deriv, dim, eos, extern_gr, growth, io, +! io_summary, metric_tools, mpiutils, options, part, porosity, +! substepping, timestep, timestep_ind, timestep_sts, timing ! use dim, only:maxp,maxvxyzu,do_radiation,ind_timesteps use part, only:vpred,Bpred,dustpred,ppred @@ -117,15 +117,17 @@ subroutine step(npart,nactive,t,dtsph,dtextforce,dtnew) use metric_tools, only:imet_minkowski,imetric use cons2prim, only:cons2primall use extern_gr, only:get_grforce_all - use cooling, only:ufloor,cooling_in_step + use cooling, only:ufloor,cooling_in_step,Tfloor + use cooling_radapprox,only:radcool_evolve_ui use timing, only:increment_timer,get_timings,itimer_substep use growth, only:check_dustprop - use options, only:use_porosity + use options, only:use_porosity,icooling use porosity, only:get_filfac use damping, only:idamp use cons2primsolver, only:conservative2primitive,primitive2conservative + use eos, only:equationofstate use substepping, only:substep,substep_gr, & - substep_sph_gr,substep_sph + substep_sph_gr,substep_sph integer, intent(inout) :: npart integer, intent(in) :: nactive @@ -157,7 +159,6 @@ subroutine step(npart,nactive,t,dtsph,dtextforce,dtnew) ibin_dts(ittwas,i) = (int(time_now*ibin_dts(itdt1,i),kind=8) + 0.5)*ibin_dts(itdt,i) enddo endif - !-------------------------------------- ! velocity predictor step, using dtsph !-------------------------------------- @@ -167,18 +168,18 @@ subroutine step(npart,nactive,t,dtsph,dtextforce,dtnew) store_itype = (maxphase==maxp .and. ntypes > 1) ialphaloc = 2 nvfloorp = 0 - !$omp parallel do default(none) & !$omp shared(npart,xyzh,vxyzu,fxyzu,iphase,hdtsph,store_itype) & !$omp shared(rad,drad,pxyzu) & !$omp shared(Bevol,dBevol,dustevol,ddustevol,use_dustfrac) & - !$omp shared(dustprop,ddustprop,dustproppred,ufloor) & + !$omp shared(dustprop,ddustprop,dustproppred,ufloor,icooling,Tfloor) & !$omp shared(mprev,filfacprev,filfac,use_porosity) & !$omp shared(ibin,ibin_old,twas,timei) & !$omp firstprivate(itype) & !$omp private(i,hdti) & !$omp reduction(+:nvfloorp) predictor: do i=1,npart + ! print *, "predictor, i=", i if (.not.isdead_or_accreted(xyzh(4,i))) then if (ind_timesteps) then if (iactive(iphase(i))) ibin_old(i) = ibin(i) ! only required for ibin_neigh in force.F90 @@ -197,11 +198,16 @@ subroutine step(npart,nactive,t,dtsph,dtextforce,dtnew) if (gr) then pxyzu(:,i) = pxyzu(:,i) + hdti*fxyzu(:,i) else - vxyzu(:,i) = vxyzu(:,i) + hdti*fxyzu(:,i) + if (icooling == 9) then + vxyzu(1:3,i) = vxyzu(1:3,i) + hdti*fxyzu(1:3,i) + call radcool_evolve_ui(vxyzu(4,i),hdti,i,Tfloor,xyzh(4,i)) + else + vxyzu(:,i) = vxyzu(:,i) + hdti*fxyzu(:,i) + endif endif !--floor the thermal energy if requested and required - if (ufloor > 0.) then + if (ufloor > 0. .and. icooling /= 9) then if (vxyzu(4,i) < ufloor) then vxyzu(4,i) = ufloor nvfloorp = nvfloorp + 1 @@ -247,7 +253,6 @@ subroutine step(npart,nactive,t,dtsph,dtextforce,dtnew) endif else if (nptmass > 0 .or. iexternalforce > 0 .or. h2chemistry .or. cooling_in_step .or. idamp > 0) then - call substep(npart,ntypes,nptmass,dtsph,dtextforce,t,xyzh,vxyzu,& fext,xyzmh_ptmass,vxyz_ptmass,fxyz_ptmass,dsdt_ptmass,& dptmass,linklist_ptmass,fsink_old,nbinmax,ibin_wake,gtgrad, & @@ -276,7 +281,7 @@ subroutine step(npart,nactive,t,dtsph,dtextforce,dtnew) !$omp shared(dustevol,ddustprop,dustprop,dustproppred,dustfrac,ddustevol,dustpred,use_dustfrac) & !$omp shared(filfac,filfacpred,use_porosity) & !$omp shared(alphaind,ieos,alphamax,ialphaloc) & -!$omp shared(eos_vars,ufloor) & +!$omp shared(eos_vars,ufloor,icooling,Tfloor) & !$omp shared(twas,timei) & !$omp shared(rad,drad,radpred)& !$omp private(hi,rhoi,tdecay1,source,ddenom,hdti) & @@ -325,7 +330,12 @@ subroutine step(npart,nactive,t,dtsph,dtextforce,dtnew) if (gr) then ppred(:,i) = pxyzu(:,i) + hdti*fxyzu(:,i) else - vpred(:,i) = vxyzu(:,i) + hdti*fxyzu(:,i) + if (icooling == 9) then + vpred(1:3,i) = vxyzu(1:3,i) + hdti*fxyzu(1:3,i) + call radcool_evolve_ui(vxyzu(4,i),hdti,i,Tfloor,xyzh(4,i),vpred(4,i)) + else + vpred(:,i) = vxyzu(:,i) + hdti*fxyzu(:,i) + endif endif !--floor the thermal energy if requested and required @@ -390,15 +400,12 @@ subroutine step(npart,nactive,t,dtsph,dtextforce,dtnew) if (npart > 0) then if (gr) vpred = vxyzu ! Need primitive utherm as a guess in cons2prim dt_too_small = .false. - call derivs(1,npart,nactive,xyzh,vpred,fxyzu,fext,divcurlv,& divcurlB,Bpred,dBevol,radpred,drad,radprop,dustproppred,ddustprop,& dustpred,ddustevol,filfacpred,dustfrac,eos_vars,timei,dtsph,dtnew,& ppred,dens,metrics,apr_level) - if (do_radiation .and. implicit_radiation) then rad = radpred - vxyzu(4,1:npart) = vpred(4,1:npart) endif if (gr) vxyzu = vpred ! May need primitive variables elsewhere? @@ -410,6 +417,7 @@ subroutine step(npart,nactive,t,dtsph,dtextforce,dtnew) call fatal('step','step too small: bin would exceed maximum') endif endif + ! ! if using super-timestepping, determine what dt will be used on the next loop ! @@ -425,6 +433,7 @@ subroutine step(npart,nactive,t,dtsph,dtextforce,dtnew) ! any extra iterations, but to be reversible for velocity-dependent ! forces we must iterate until velocities agree. !------------------------------------------------------------------------- + its = 0 converged = .false. errmaxmean = 0.0 @@ -447,7 +456,7 @@ subroutine step(npart,nactive,t,dtsph,dtextforce,dtnew) !$omp shared(dustevol,ddustevol,use_dustfrac) & !$omp shared(dustprop,ddustprop,dustproppred) & !$omp shared(xyzmh_ptmass,vxyz_ptmass,fxyz_ptmass,nptmass,massoftype) & -!$omp shared(dtsph,ieos,ufloor) & +!$omp shared(dtsph,ieos,ufloor,icooling,Tfloor) & !$omp shared(ibin,ibin_old,ibin_sts,twas,timei,use_sts,dtsph_next,ibin_wake,sts_it_n) & !$omp shared(ibin_dts,nbinmax) & !$omp private(dti,hdti) & @@ -484,7 +493,12 @@ subroutine step(npart,nactive,t,dtsph,dtextforce,dtnew) if (gr) then pxyzu(:,i) = pxyzu(:,i) + dti*fxyzu(:,i) else - vxyzu(:,i) = vxyzu(:,i) + dti*fxyzu(:,i) + if (icooling == 9) then + vxyzu(1:3,i) = vxyzu(1:3,i) + dti*fxyzu(1:3,i) + call radcool_evolve_ui(vxyzu(4,i),dti,i,Tfloor,xyzh(4,i)) + else + vxyzu(:,i) = vxyzu(:,i) + dti*fxyzu(:,i) + endif endif if (use_dustgrowth .and. itype==idust) dustprop(:,i) = dustprop(:,i) + dti*ddustprop(:,i) @@ -506,12 +520,17 @@ subroutine step(npart,nactive,t,dtsph,dtextforce,dtnew) if (gr) then pxyzu(:,i) = pxyzu(:,i) + hdti*fxyzu(:,i) else - vxyzu(:,i) = vxyzu(:,i) + hdti*fxyzu(:,i) + if (icooling == 9) then + vxyzu(1:3,i) = vxyzu(1:3,i) + hdti*fxyzu(1:3,i) + call radcool_evolve_ui(vxyzu(4,i),hdti,i,Tfloor,xyzh(4,i)) + else + vxyzu(:,i) = vxyzu(:,i) + hdti*fxyzu(:,i) + endif endif !--floor the thermal energy if requested and required if (ufloor > 0.) then - if (vxyzu(4,i) < ufloor) then + if (vxyzu(4,i) < ufloor .and. icooling /= 9) then vxyzu(4,i) = ufloor nvfloorc = nvfloorc + 1 endif @@ -564,8 +583,13 @@ subroutine step(npart,nactive,t,dtsph,dtextforce,dtnew) vxi = vxyzu(1,i) + hdtsph*fxyzu(1,i) vyi = vxyzu(2,i) + hdtsph*fxyzu(2,i) vzi = vxyzu(3,i) + hdtsph*fxyzu(3,i) - if (maxvxyzu >= 4) eni = vxyzu(4,i) + hdtsph*fxyzu(4,i) - + if (maxvxyzu >= 4) then + if (icooling == 9) then + call radcool_evolve_ui(vxyzu(4,i),hdtsph,i,Tfloor,xyzh(4,i),eni) + else + eni = vxyzu(4,i) + hdtsph*fxyzu(4,i) + endif + endif erri = (vxi - vpred(1,i))**2 + (vyi - vpred(2,i))**2 + (vzi - vpred(3,i))**2 errmax = max(errmax,erri) @@ -618,7 +642,7 @@ subroutine step(npart,nactive,t,dtsph,dtextforce,dtnew) !$omp shared(Bevol,dBevol,Bpred,pxyzu,ppred) & !$omp shared(dustprop,ddustprop,dustproppred,use_dustfrac,dustevol,dustpred,ddustevol) & !$omp shared(filfac,filfacpred,use_porosity) & -!$omp shared(rad,drad,radpred) & +!$omp shared(rad,drad,radpred,icooling,Tfloor,xyzh) & !$omp firstprivate(itype) & !$omp schedule(static) until_converged: do i=1,npart @@ -627,7 +651,6 @@ subroutine step(npart,nactive,t,dtsph,dtextforce,dtnew) if (ind_timesteps) then if (iactive(iphase(i))) then - if (gr) then ppred(:,i) = pxyzu(:,i) else @@ -656,7 +679,12 @@ subroutine step(npart,nactive,t,dtsph,dtextforce,dtnew) if (gr) then pxyzu(:,i) = pxyzu(:,i) - hdtsph*fxyzu(:,i) else - vxyzu(:,i) = vxyzu(:,i) - hdtsph*fxyzu(:,i) + if (icooling == 9) then + call radcool_evolve_ui(vxyzu(4,i),-hdtsph,i,Tfloor,xyzh(4,i)) + vxyzu(1:3,i) = vxyzu(1:3,i) - hdtsph*fxyzu(1:3,i) + else + vxyzu(:,i) = vxyzu(:,i) - hdtsph*fxyzu(:,i) + endif endif if (itype==idust .and. use_dustgrowth) dustprop(:,i) = dustprop(:,i) - hdtsph*ddustprop(:,i) if (itype==igas) then @@ -690,6 +718,10 @@ subroutine step(npart,nactive,t,dtsph,dtextforce,dtnew) vxyzu(4,1:npart) = vpred(4,1:npart) endif endif + if (icooling == 9 .and. iverbose >=2) then + print *, "end of iteration", maxval(vpred(4,:)), minval(vpred(4,:)) + print *, "end of iteration", maxval(vxyzu(4,:)), minval(vxyzu(4,:)) + endif enddo iterations ! MPI reduce summary variables diff --git a/src/main/step_supertimestep.F90 b/src/main/step_supertimestep.F90 index 413f0615b..fcfac1af9 100644 --- a/src/main/step_supertimestep.F90 +++ b/src/main/step_supertimestep.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/subgroup.f90 b/src/main/subgroup.f90 index beaa78c08..e1f657582 100644 --- a/src/main/subgroup.f90 +++ b/src/main/subgroup.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/substepping.F90 b/src/main/substepping.F90 index 08f5d88a5..50bf93222 100644 --- a/src/main/substepping.F90 +++ b/src/main/substepping.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! @@ -336,6 +336,9 @@ subroutine substep_gr(npart,ntypes,dtsph,dtextforce,xyzh,vxyzu,pxyzu,dens,metric pmassi = aprmassoftype(igas,apr_level(i)) endif + if (vxyzu(4,i) < 0d0) then + print *, "u is NEGATIVE in SUBSTEPPING!", vxyzu(4,i),i,dens(i) + endif call equationofstate(ieos,pondensi,spsoundi,dens(i),xyzh(1,i),xyzh(2,i),xyzh(3,i),tempi,vxyzu(4,i)) pri = pondensi*dens(i) call get_grforce(xyzh(:,i),metrics(:,:,:,i),metricderivs(:,:,:,i),vxyzu(1:3,i),dens(i),vxyzu(4,i),pri,fext(1:3,i),dtf) @@ -1148,7 +1151,7 @@ subroutine cooling_abundances_update(i,pmassi,xyzh,vxyzu,eos_vars,abundance,nucl ! ! COOLING ! - if (icooling > 0 .and. cooling_in_step) then + if (icooling > 0 .and. cooling_in_step .and. icooling/=9) then if (h2chemistry) then ! ! Call cooling routine, requiring total density, some distance measure and @@ -1174,7 +1177,7 @@ subroutine cooling_abundances_update(i,pmassi,xyzh,vxyzu,eos_vars,abundance,nucl endif #endif ! update internal energy - if (isionisedi) dudtcool = 0. + if (isionisedi .or. icooling == 9) dudtcool = 0. if (cooling_in_step .or. use_krome) vxyzu(4,i) = vxyzu(4,i) + dt * dudtcool diff --git a/src/main/timestep.f90 b/src/main/timestep.f90 index 99bd0e172..4b98485eb 100644 --- a/src/main/timestep.f90 +++ b/src/main/timestep.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/tmunu2grid.f90 b/src/main/tmunu2grid.f90 index 754f63a6d..a208373e3 100644 --- a/src/main/tmunu2grid.f90 +++ b/src/main/tmunu2grid.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/units.f90 b/src/main/units.f90 index a859c768d..67c5b290d 100644 --- a/src/main/units.f90 +++ b/src/main/units.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/utils_allocate.f90 b/src/main/utils_allocate.f90 index d3c704cc1..e3b7e425e 100644 --- a/src/main/utils_allocate.f90 +++ b/src/main/utils_allocate.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/utils_binary.f90 b/src/main/utils_binary.f90 index 5f9ca8851..d7f8f920c 100644 --- a/src/main/utils_binary.f90 +++ b/src/main/utils_binary.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/utils_cpuinfo.f90 b/src/main/utils_cpuinfo.f90 index 5e50794c9..d1ec67a2a 100644 --- a/src/main/utils_cpuinfo.f90 +++ b/src/main/utils_cpuinfo.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/utils_datafiles.f90 b/src/main/utils_datafiles.f90 index 2e6173808..ec5f1f6f4 100644 --- a/src/main/utils_datafiles.f90 +++ b/src/main/utils_datafiles.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/utils_deriv.f90 b/src/main/utils_deriv.f90 index d45676930..2b00f52ef 100644 --- a/src/main/utils_deriv.f90 +++ b/src/main/utils_deriv.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/utils_dumpfiles.f90 b/src/main/utils_dumpfiles.f90 index 81b669cc8..dad40e34d 100644 --- a/src/main/utils_dumpfiles.f90 +++ b/src/main/utils_dumpfiles.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/utils_dumpfiles_hdf5.f90 b/src/main/utils_dumpfiles_hdf5.f90 index 581d06cd8..f091cd564 100644 --- a/src/main/utils_dumpfiles_hdf5.f90 +++ b/src/main/utils_dumpfiles_hdf5.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/utils_filenames.f90 b/src/main/utils_filenames.f90 index 108eb2a52..b7d1e3145 100644 --- a/src/main/utils_filenames.f90 +++ b/src/main/utils_filenames.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/utils_gr.f90 b/src/main/utils_gr.f90 index 6ecc4be43..76bf593a4 100644 --- a/src/main/utils_gr.f90 +++ b/src/main/utils_gr.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/utils_hdf5.f90 b/src/main/utils_hdf5.f90 index 2afa77842..4bc07b1e9 100644 --- a/src/main/utils_hdf5.f90 +++ b/src/main/utils_hdf5.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/utils_healpix.f90 b/src/main/utils_healpix.f90 index 407761514..d0793740d 100644 --- a/src/main/utils_healpix.f90 +++ b/src/main/utils_healpix.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! @@ -20,7 +20,7 @@ module healpix ! ! :References: K. M. Górski et al, 2005, ApJ, 622, 759 ! -! :Owner: Mats Esseldeurs +! :Owner: Lionel Siess ! ! :Runtime parameters: None ! diff --git a/src/main/utils_implicit.f90 b/src/main/utils_implicit.f90 index 63fc4e843..7622f9bd2 100644 --- a/src/main/utils_implicit.f90 +++ b/src/main/utils_implicit.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/utils_indtimesteps.F90 b/src/main/utils_indtimesteps.F90 index 14ad9f826..43d52a6cf 100644 --- a/src/main/utils_indtimesteps.F90 +++ b/src/main/utils_indtimesteps.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/utils_infiles.f90 b/src/main/utils_infiles.f90 index 4134a8114..8f197386a 100644 --- a/src/main/utils_infiles.f90 +++ b/src/main/utils_infiles.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/utils_inject.f90 b/src/main/utils_inject.f90 index ca43b16ff..a11d2173b 100644 --- a/src/main/utils_inject.f90 +++ b/src/main/utils_inject.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/utils_kepler.f90 b/src/main/utils_kepler.f90 index dfed7696b..abfa10d0d 100644 --- a/src/main/utils_kepler.f90 +++ b/src/main/utils_kepler.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/utils_mathfunc.f90 b/src/main/utils_mathfunc.f90 index e133bdbb7..e23c719c1 100644 --- a/src/main/utils_mathfunc.f90 +++ b/src/main/utils_mathfunc.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/utils_omp.F90 b/src/main/utils_omp.F90 index eca6876fc..3e2155bfb 100644 --- a/src/main/utils_omp.F90 +++ b/src/main/utils_omp.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/utils_raytracer.f90 b/src/main/utils_raytracer.f90 index fe327480b..d2c8e59f0 100644 --- a/src/main/utils_raytracer.f90 +++ b/src/main/utils_raytracer.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! @@ -16,7 +16,7 @@ module raytracer ! ! :References: Esseldeurs M., Siess L. et al, 2023, A&A, 674, A122 ! -! :Owner: Mats Esseldeurs +! :Owner: Lionel Siess ! ! :Runtime parameters: None ! diff --git a/src/main/utils_shuffleparticles.F90 b/src/main/utils_shuffleparticles.F90 index 21f57473b..5a5429a4e 100644 --- a/src/main/utils_shuffleparticles.F90 +++ b/src/main/utils_shuffleparticles.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/utils_sort.f90 b/src/main/utils_sort.f90 index 4ffbf6bd3..f0e191f27 100644 --- a/src/main/utils_sort.f90 +++ b/src/main/utils_sort.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/utils_sphNG.f90 b/src/main/utils_sphNG.f90 index c0fe72c0a..b2c7958fa 100644 --- a/src/main/utils_sphNG.f90 +++ b/src/main/utils_sphNG.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/utils_spline.f90 b/src/main/utils_spline.f90 index 2d97899f7..c5b0e78a2 100644 --- a/src/main/utils_spline.f90 +++ b/src/main/utils_spline.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/utils_subgroup.f90 b/src/main/utils_subgroup.f90 index 91f20f713..5b9c5cbb7 100644 --- a/src/main/utils_subgroup.f90 +++ b/src/main/utils_subgroup.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/utils_summary.F90 b/src/main/utils_summary.F90 index e3c780c39..5c5610503 100644 --- a/src/main/utils_summary.F90 +++ b/src/main/utils_summary.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/utils_supertimestep.F90 b/src/main/utils_supertimestep.F90 index 4f59faa67..38132efb2 100644 --- a/src/main/utils_supertimestep.F90 +++ b/src/main/utils_supertimestep.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/utils_system.f90 b/src/main/utils_system.f90 index 35c718e1b..2d127b352 100644 --- a/src/main/utils_system.f90 +++ b/src/main/utils_system.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/utils_tables.f90 b/src/main/utils_tables.f90 index 747b7663e..1c053e4a1 100644 --- a/src/main/utils_tables.f90 +++ b/src/main/utils_tables.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/utils_timing.f90 b/src/main/utils_timing.f90 index 9e2de5d71..69952d00c 100644 --- a/src/main/utils_timing.f90 +++ b/src/main/utils_timing.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/utils_vectors.f90 b/src/main/utils_vectors.f90 index e529d5f36..8273a8f0b 100644 --- a/src/main/utils_vectors.f90 +++ b/src/main/utils_vectors.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/viscosity.f90 b/src/main/viscosity.f90 index c5d17fbba..f380c7a13 100644 --- a/src/main/viscosity.f90 +++ b/src/main/viscosity.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/wind.F90 b/src/main/wind.F90 index 3bb364228..a87fc9bac 100644 --- a/src/main/wind.F90 +++ b/src/main/wind.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/wind_equations.f90 b/src/main/wind_equations.f90 index db79e9431..3ecf38737 100644 --- a/src/main/wind_equations.f90 +++ b/src/main/wind_equations.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/main/writeheader.F90 b/src/main/writeheader.F90 index 9361aeb6f..81f850b67 100644 --- a/src/main/writeheader.F90 +++ b/src/main/writeheader.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/density_profiles.f90 b/src/setup/density_profiles.f90 index 6189b73bc..bf661310e 100644 --- a/src/setup/density_profiles.f90 +++ b/src/setup/density_profiles.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/libsetup.f90 b/src/setup/libsetup.f90 index fc36e5e26..03ae823c1 100644 --- a/src/setup/libsetup.f90 +++ b/src/setup/libsetup.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/phantomsetup.F90 b/src/setup/phantomsetup.F90 index e24b9669a..a37ab0460 100644 --- a/src/setup/phantomsetup.F90 +++ b/src/setup/phantomsetup.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/readwrite_kepler.f90 b/src/setup/readwrite_kepler.f90 index 41f73b86f..436f4192b 100644 --- a/src/setup/readwrite_kepler.f90 +++ b/src/setup/readwrite_kepler.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/readwrite_mesa.f90 b/src/setup/readwrite_mesa.f90 index 70bb69dbd..6223034dc 100644 --- a/src/setup/readwrite_mesa.f90 +++ b/src/setup/readwrite_mesa.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! @@ -194,7 +194,7 @@ subroutine read_mesa(filepath,rho,r,pres,m,ene,temp,X_in,Z_in,Xfrac,Yfrac,Mstar, enddo over_directions close(iu) - if(min(minval(pres),minval(rho))<0d0)ierr = 1 + if (min(minval(pres),minval(rho))<0d0)ierr = 1 if (ierr /= 0) then print "(a,/)",' ERROR reading MESA file [missing required columns]' diff --git a/src/setup/relax_star.f90 b/src/setup/relax_star.f90 index 3512837cc..4a3f8b685 100644 --- a/src/setup/relax_star.f90 +++ b/src/setup/relax_star.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/set_Bfield.f90 b/src/setup/set_Bfield.f90 index 489904342..07ac2606f 100644 --- a/src/setup/set_Bfield.f90 +++ b/src/setup/set_Bfield.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/set_binary.f90 b/src/setup/set_binary.f90 index d5ae33da4..f6cd7d46b 100644 --- a/src/setup/set_binary.f90 +++ b/src/setup/set_binary.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/set_cubic_core.f90 b/src/setup/set_cubic_core.f90 index 0daa194be..f2ea911ef 100644 --- a/src/setup/set_cubic_core.f90 +++ b/src/setup/set_cubic_core.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/set_disc.F90 b/src/setup/set_disc.F90 index 505713346..e7ad09e09 100644 --- a/src/setup/set_disc.F90 +++ b/src/setup/set_disc.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/set_dust.f90 b/src/setup/set_dust.f90 index 346b1ae8b..2dd02905f 100644 --- a/src/setup/set_dust.f90 +++ b/src/setup/set_dust.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/set_dust_options.f90 b/src/setup/set_dust_options.f90 index c97bbf0ca..2c887de00 100644 --- a/src/setup/set_dust_options.f90 +++ b/src/setup/set_dust_options.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/set_fixedentropycore.f90 b/src/setup/set_fixedentropycore.f90 index 5466782fd..6f6dae91d 100644 --- a/src/setup/set_fixedentropycore.f90 +++ b/src/setup/set_fixedentropycore.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/set_flyby.f90 b/src/setup/set_flyby.f90 index 783ae37a9..b7c1e8dbb 100644 --- a/src/setup/set_flyby.f90 +++ b/src/setup/set_flyby.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/set_hierarchical.f90 b/src/setup/set_hierarchical.f90 index c52aeabd6..719d21de6 100644 --- a/src/setup/set_hierarchical.f90 +++ b/src/setup/set_hierarchical.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/set_hierarchical_utils.f90 b/src/setup/set_hierarchical_utils.f90 index 6921d5daa..6ec8e40f9 100644 --- a/src/setup/set_hierarchical_utils.f90 +++ b/src/setup/set_hierarchical_utils.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/set_orbit.f90 b/src/setup/set_orbit.f90 index 605a8a467..0650dc4a4 100644 --- a/src/setup/set_orbit.f90 +++ b/src/setup/set_orbit.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/set_planets.f90 b/src/setup/set_planets.f90 index 8abcb545c..e845a1c6a 100644 --- a/src/setup/set_planets.f90 +++ b/src/setup/set_planets.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/set_shock.f90 b/src/setup/set_shock.f90 index e0623f797..52ee7fcac 100644 --- a/src/setup/set_shock.f90 +++ b/src/setup/set_shock.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/set_slab.f90 b/src/setup/set_slab.f90 index 61c00f7ce..af98e0519 100644 --- a/src/setup/set_slab.f90 +++ b/src/setup/set_slab.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/set_softened_core.f90 b/src/setup/set_softened_core.f90 index a7d546658..79ae80d79 100644 --- a/src/setup/set_softened_core.f90 +++ b/src/setup/set_softened_core.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/set_sphere.f90 b/src/setup/set_sphere.f90 index e3358f9fd..9b945ec1e 100644 --- a/src/setup/set_sphere.f90 +++ b/src/setup/set_sphere.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/set_star.f90 b/src/setup/set_star.f90 index 52a412be1..8423c3a94 100644 --- a/src/setup/set_star.f90 +++ b/src/setup/set_star.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/set_star_utils.f90 b/src/setup/set_star_utils.f90 index 400ea6a19..a9b704fa6 100644 --- a/src/setup/set_star_utils.f90 +++ b/src/setup/set_star_utils.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/set_unifdis.f90 b/src/setup/set_unifdis.f90 index 782d6c3af..3b9d07d8a 100644 --- a/src/setup/set_unifdis.f90 +++ b/src/setup/set_unifdis.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/set_units.f90 b/src/setup/set_units.f90 index 218eedae7..6cb6bf2b8 100644 --- a/src/setup/set_units.f90 +++ b/src/setup/set_units.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/set_vfield.f90 b/src/setup/set_vfield.f90 index 68d2d03e3..7370bbe77 100644 --- a/src/setup/set_vfield.f90 +++ b/src/setup/set_vfield.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_BHL.f90 b/src/setup/setup_BHL.f90 index 560081f1b..b014bc51d 100644 --- a/src/setup/setup_BHL.f90 +++ b/src/setup/setup_BHL.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_alfvenwave.f90 b/src/setup/setup_alfvenwave.f90 index 8bc9e10f9..d3c145e26 100644 --- a/src/setup/setup_alfvenwave.f90 +++ b/src/setup/setup_alfvenwave.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_asteroidwind.f90 b/src/setup/setup_asteroidwind.f90 index de849ec48..a8581f17c 100644 --- a/src/setup/setup_asteroidwind.f90 +++ b/src/setup/setup_asteroidwind.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_binary.f90 b/src/setup/setup_binary.f90 index 37d450fbf..2b7e7fe37 100644 --- a/src/setup/setup_binary.f90 +++ b/src/setup/setup_binary.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_blob.f90 b/src/setup/setup_blob.f90 index d569cfb5b..6ff6cca8d 100644 --- a/src/setup/setup_blob.f90 +++ b/src/setup/setup_blob.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_bondi.f90 b/src/setup/setup_bondi.f90 index f543019fd..c76c41ff5 100644 --- a/src/setup/setup_bondi.f90 +++ b/src/setup/setup_bondi.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_bondiinject.f90 b/src/setup/setup_bondiinject.f90 index cd39849b1..3b4556aba 100644 --- a/src/setup/setup_bondiinject.f90 +++ b/src/setup/setup_bondiinject.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_chinchen.f90 b/src/setup/setup_chinchen.f90 index 66c97168a..ee3267698 100644 --- a/src/setup/setup_chinchen.f90 +++ b/src/setup/setup_chinchen.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_cluster.f90 b/src/setup/setup_cluster.f90 index 157414cfa..4e6ae3331 100644 --- a/src/setup/setup_cluster.f90 +++ b/src/setup/setup_cluster.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_collidingclouds.f90 b/src/setup/setup_collidingclouds.f90 index ff9553b42..a7c7758ab 100644 --- a/src/setup/setup_collidingclouds.f90 +++ b/src/setup/setup_collidingclouds.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_common.f90 b/src/setup/setup_common.f90 index 9a51767e0..b372f17ac 100644 --- a/src/setup/setup_common.f90 +++ b/src/setup/setup_common.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_disc.f90 b/src/setup/setup_disc.f90 index 171b7e404..89b414d11 100644 --- a/src/setup/setup_disc.f90 +++ b/src/setup/setup_disc.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! @@ -65,6 +65,7 @@ module setup ! - ibinary : *binary orbit (0=bound,1=unbound [flyby])* ! - ipotential : *potential (1=central point mass,* ! - istrat : *temperature prescription (0=MAPS, 1=Dartois)* +! - lumdisc : *Set qindex from stellar luminosity (ieos=23) (0=no 1=yes)* ! - m1 : *first hierarchical level primary mass* ! - m2 : *first hierarchical level secondary mass* ! - mass_unit : *mass unit (e.g. solarm,jupiterm,earthm)* @@ -87,12 +88,12 @@ module setup ! - use_mcfost : *use the mcfost library* ! - z0 : *z scaling factor* ! -! :Dependencies: centreofmass, dim, dust, eos, extern_binary, -! extern_corotate, extern_lensethirring, externalforces, fileutils, -! growth, infile_utils, io, kernel, memory, options, part, physcon, -! porosity, prompting, radiation_utils, set_dust, set_dust_options, -! setbinary, setdisc, setflyby, sethierarchical, spherical, timestep, -! units, vectorutils +! :Dependencies: centreofmass, dim, dust, eos, eos_stamatellos, +! extern_binary, extern_corotate, extern_lensethirring, externalforces, +! fileutils, growth, infile_utils, io, kernel, memory, options, part, +! physcon, porosity, prompting, radiation_utils, set_dust, +! set_dust_options, setbinary, setdisc, setflyby, sethierarchical, +! spherical, timestep, units, vectorutils ! use dim, only:use_dust,maxalpha,use_dustgrowth,maxdusttypes,& maxdustlarge,maxdustsmall,compiled_with_mcfost @@ -185,6 +186,7 @@ module setup real :: R_in(maxdiscs),R_out(maxdiscs),R_ref(maxdiscs),R_c(maxdiscs) real :: pindex(maxdiscs),disc_m(maxdiscs),sig_ref(maxdiscs),sig_norm(maxdiscs) + real :: T_bg,L_star(maxdiscs) real :: qindex(maxdiscs),H_R(maxdiscs) real :: posangl(maxdiscs),incl(maxdiscs) real :: annulus_m(maxdiscs),R_inann(maxdiscs),R_outann(maxdiscs) @@ -211,7 +213,7 @@ module setup (/'1','2','3','4','5','6','7','8','9' /) logical :: istratify - integer :: nplanets,discstrat + integer :: nplanets,discstrat,lumdisc real :: mplanet(maxplanets),rplanet(maxplanets) real :: accrplanet(maxplanets),inclplan(maxplanets) real :: J2planet(maxplanets),spin_period(maxplanets),obliquity(maxplanets) @@ -442,6 +444,9 @@ subroutine set_default_options()!id) annulus_m = 0.05 R_inann = 1. R_outann = 150. + lumdisc = 0 + L_star(:) = 1. + T_bg = 5. !--dust disc R_indust = 1. @@ -616,6 +621,8 @@ subroutine equation_of_state(gamma) use eos, only:isink,qfacdisc,qfacdisc2,polyk2,beta_z,z0 use options, only:ieos,icooling use options, only:nfulldump,alphau,ipdv_heating,ishock_heating + use eos_stamatellos, only:init_coolra + use physcon, only:rpiontwo real, intent(out) :: gamma real :: H_R_atm, cs @@ -711,11 +718,27 @@ subroutine equation_of_state(gamma) endif else - - !--adiabatic - ieos = 2 - gamma = 5./3. - icooling = 3 + !-- adiabatic + if (lumdisc > 0) then + !--for radapprox cooling + print "(/,a)", ' setting ieos=23 and icooling=9 for radiative cooling approximation' + ieos = 23 + icooling = 9 + gamma = 5./3. ! in case it's needed + call init_coolra() + if (ndiscs > 1) then + print *, "We can't set up multiple radapprox discs yet :,(" + stop + else + cs = get_cs_from_lum(L_star(1),R_ref(1)) / rpiontwo + H_R(1) = cs * R_ref(1)**0.5 / sqrt(m1) ! single central star, G=1 + endif + else + !--adiabatic + ieos = 2 + gamma = 5./3. + icooling = 3 + endif if (use_mcfost) then icooling = 0 @@ -2249,8 +2272,20 @@ subroutine setup_interactive(id) ! to be changed also in the the setpart function. !-------------------------------------------------------------------------- if (.not. use_global_iso) then - call prompt('Enter q_index',qindex(1)) - qindex=qindex(1) + if (maxvxyzu > 3) then + call prompt("Do you want to set the disc temperatures from the stellar"// & + "luminosity? (0=no 1=yes",lumdisc) + endif + if (lumdisc > 0) then + !get luminosity ... + call prompt("Enter the luminosity of star",L_star(1)) + call prompt("Enter the background temperature e.g. 10 (K)", T_bg) + qindex(1) = 0.25 + qindex = 0.25 + else + call prompt('Enter q_index',qindex(1)) + qindex=qindex(1) + endif if (nsinks<5) then if (iuse_disc(1)) then call prompt('Enter H/R of circumbinary at R_ref',H_R(1)) @@ -2703,7 +2738,7 @@ subroutine write_setupfile(filename) endif call write_inopt(isetgas(i),'isetgas'//trim(disclabel),'how to set gas density profile' // & ' (0=total disc mass,1=mass within annulus,2=surface density normalisation,' // & - '3=surface density at reference radius,4=minimum Toomre Q)',iunit) + '3=surface density at reference radius,4=minimum Toomre Q,5=minimum Toomre Q and Lstar)',iunit) call write_inopt(itapergas(i),'itapergas'//trim(disclabel), & 'exponentially taper the outer disc profile',iunit) if (itapergas(i)) call write_inopt(itapersetgas(i),'itapersetgas'//trim(disclabel), & @@ -2741,12 +2776,22 @@ subroutine write_setupfile(filename) call write_inopt(sig_ref(i),'sig_ref'//trim(disclabel),'sigma at reference radius',iunit) case (4) call write_inopt(Q_min(i),'Q_min'//trim(disclabel),'minimum Toomre Q',iunit) + end select + call write_inopt(lumdisc,'lumdisc', 'Set qindex from stellar luminosity (ieos=23) (0=no 1=yes)',iunit) + if (lumdisc > 0) then + call write_inopt(L_star(i),'L_star'//trim(disclabel),'Stellar luminosity (Lsun)',iunit) + call write_inopt(T_bg,'T_bg'//trim(disclabel),'background Temperature (K)',iunit) + endif call write_inopt(pindex(i),'pindex'//trim(disclabel),'power law index of surface density sig=sig0*r^-p',iunit) - call write_inopt(qindex(i),'qindex'//trim(disclabel),'power law index of sound speed cs=cs0*r^-q',iunit) + if (lumdisc == 0) then + call write_inopt(qindex(i),'qindex'//trim(disclabel),'power law index of sound speed cs=cs0*r^-q',iunit) + endif call write_inopt(posangl(i),'posangl'//trim(disclabel),'position angle (deg)',iunit) call write_inopt(incl(i),'incl'//trim(disclabel),'inclination (deg)',iunit) - if (discstrat == 0) call write_inopt(H_R(i),'H_R'//trim(disclabel),'H/R at R=R_ref',iunit) + if (discstrat == 0 .and. lumdisc == 0) then + call write_inopt(H_R(i),'H_R'//trim(disclabel),'H/R at R=R_ref',iunit) + endif if (iwarp(i)) then call write_inopt(R_warp(i),'R_warp'//trim(disclabel),'warp radius',iunit) call write_inopt(H_warp(i),'H_warp'//trim(disclabel),'warp smoothing length',iunit) @@ -3031,6 +3076,8 @@ subroutine read_setupfile(filename,ierr) end select call read_inopt(discstrat,'discstrat',db,errcount=nerr) + call read_inopt(lumdisc,'lumdisc',db,errcount=nerr) + if (discstrat==1) then call read_inopt(istrat,'istrat',db,errcount=nerr) call read_inopt(z0_ref,'z0',db,errcount=nerr) @@ -3142,10 +3189,12 @@ subroutine read_setupfile(filename,ierr) call read_inopt(Q_min(i),'Q_min'//trim(disclabel),db,min=0.,errcount=nerr) end select call read_inopt(pindex(i),'pindex'//trim(disclabel),db,errcount=nerr) - call read_inopt(qindex(i),'qindex'//trim(disclabel),db,errcount=nerr) + if (lumdisc == 0) call read_inopt(qindex(i),'qindex'//trim(disclabel),db,errcount=nerr) call read_inopt(posangl(i),'posangl'//trim(disclabel),db,min=0.,max=360.,errcount=nerr) call read_inopt(incl(i),'incl'//trim(disclabel),db,min=0.,max=180.,errcount=nerr) - if (discstrat == 0) call read_inopt(H_R(i),'H_R'//trim(disclabel),db,min=0.,errcount=nerr) + if (discstrat == 0 .and. lumdisc == 0) then + call read_inopt(H_R(i),'H_R'//trim(disclabel),db,min=0.,errcount=nerr) + endif call read_inopt(iwarp(i),'iwarp'//trim(disclabel),db,errcount=nerr) if (iwarp(i)) then call read_inopt(R_warp(i),'R_warp'//trim(disclabel),db,min=0.,errcount=nerr) @@ -3220,6 +3269,11 @@ subroutine read_setupfile(filename,ierr) if (do_radiation) call read_inopt(iradkappa,'radkappa',db,err=ierr) + if (lumdisc > 0) then + call read_inopt(L_star(1),'L_star',db,min=0.,errcount=nerr) + call read_inopt(T_bg,'T_bg',db,min=0.,errcount=nerr) + endif + call close_db(db) ierr = nerr if (nerr > 0) then @@ -3498,5 +3552,16 @@ subroutine get_hier_disc_label(i, disclabel) end subroutine get_hier_disc_label +real function get_cs_from_lum(L_star,r) + use physcon, only:kb_on_mh,steboltz,solarl,fourpi + use units, only:udist,unit_velocity + real,intent(in) :: L_star,r + real :: mu + + mu = 2.381 !mean molecular mass + get_cs_from_lum = sqrt(kb_on_mh/mu) * ( (L_star*solarl/(fourpi*steboltz))**0.125 / & + (r*udist)**0.25 + sqrt(T_bg) ) + get_cs_from_lum = get_cs_from_lum/unit_velocity +end function get_cs_from_lum end module setup diff --git a/src/setup/setup_dustsettle.f90 b/src/setup/setup_dustsettle.f90 index 5a58e68c5..3d560d2a6 100644 --- a/src/setup/setup_dustsettle.f90 +++ b/src/setup/setup_dustsettle.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_dustybox.f90 b/src/setup/setup_dustybox.f90 index 00d9bae08..89f49dabc 100644 --- a/src/setup/setup_dustybox.f90 +++ b/src/setup/setup_dustybox.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_dustysedov.f90 b/src/setup/setup_dustysedov.f90 index 918becd15..d953c7c63 100644 --- a/src/setup/setup_dustysedov.f90 +++ b/src/setup/setup_dustysedov.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_empty.f90 b/src/setup/setup_empty.f90 index 22c3a0893..cba1d2711 100644 --- a/src/setup/setup_empty.f90 +++ b/src/setup/setup_empty.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_firehose.f90 b/src/setup/setup_firehose.f90 index c6256bcf0..795ea58b4 100644 --- a/src/setup/setup_firehose.f90 +++ b/src/setup/setup_firehose.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_flrw.f90 b/src/setup/setup_flrw.f90 index 5dab4626a..9776a71fa 100644 --- a/src/setup/setup_flrw.f90 +++ b/src/setup/setup_flrw.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_flrwpspec.f90 b/src/setup/setup_flrwpspec.f90 index 69aa34256..163b44b3b 100644 --- a/src/setup/setup_flrwpspec.f90 +++ b/src/setup/setup_flrwpspec.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_galaxies.f90 b/src/setup/setup_galaxies.f90 index ea8d68924..4dccae5a7 100644 --- a/src/setup/setup_galaxies.f90 +++ b/src/setup/setup_galaxies.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_galcen_stars.f90 b/src/setup/setup_galcen_stars.f90 index b7d08a395..6573c1fcf 100644 --- a/src/setup/setup_galcen_stars.f90 +++ b/src/setup/setup_galcen_stars.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_galdisc.f90 b/src/setup/setup_galdisc.f90 index 37e1ac6c2..604c8db3d 100644 --- a/src/setup/setup_galdisc.f90 +++ b/src/setup/setup_galdisc.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_grdisc.F90 b/src/setup/setup_grdisc.F90 index 605d9daa3..54bfa00ef 100644 --- a/src/setup/setup_grdisc.F90 +++ b/src/setup/setup_grdisc.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_grtde.f90 b/src/setup/setup_grtde.f90 index 1fb776d80..9339f613f 100644 --- a/src/setup/setup_grtde.f90 +++ b/src/setup/setup_grtde.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_gwdisc.f90 b/src/setup/setup_gwdisc.f90 index 6f74be36a..4ae33cfdc 100644 --- a/src/setup/setup_gwdisc.f90 +++ b/src/setup/setup_gwdisc.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_hierarchical.f90 b/src/setup/setup_hierarchical.f90 index cad18867d..450387455 100644 --- a/src/setup/setup_hierarchical.f90 +++ b/src/setup/setup_hierarchical.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_jadvect.f90 b/src/setup/setup_jadvect.f90 index 15b8fc00e..f4139a227 100644 --- a/src/setup/setup_jadvect.f90 +++ b/src/setup/setup_jadvect.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_kh.f90 b/src/setup/setup_kh.f90 index 5e847d5f8..b89ace95f 100644 --- a/src/setup/setup_kh.f90 +++ b/src/setup/setup_kh.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_masstransfer.f90 b/src/setup/setup_masstransfer.f90 index 15bf86aed..0f87b254d 100644 --- a/src/setup/setup_masstransfer.f90 +++ b/src/setup/setup_masstransfer.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_mhdblast.f90 b/src/setup/setup_mhdblast.f90 index 12189204f..3f716547f 100644 --- a/src/setup/setup_mhdblast.f90 +++ b/src/setup/setup_mhdblast.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_mhdrotor.f90 b/src/setup/setup_mhdrotor.f90 index 25f1d5402..28f7348cf 100644 --- a/src/setup/setup_mhdrotor.f90 +++ b/src/setup/setup_mhdrotor.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_mhdsine.f90 b/src/setup/setup_mhdsine.f90 index 0c1fa5b0a..c518efea2 100644 --- a/src/setup/setup_mhdsine.f90 +++ b/src/setup/setup_mhdsine.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_mhdvortex.f90 b/src/setup/setup_mhdvortex.f90 index 8ea65ad98..3fbeb1302 100644 --- a/src/setup/setup_mhdvortex.f90 +++ b/src/setup/setup_mhdvortex.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_mhdwave.f90 b/src/setup/setup_mhdwave.f90 index db858458b..e31ce715a 100644 --- a/src/setup/setup_mhdwave.f90 +++ b/src/setup/setup_mhdwave.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_nsdisc.f90 b/src/setup/setup_nsdisc.f90 index bb9577f02..4879ecc79 100644 --- a/src/setup/setup_nsdisc.f90 +++ b/src/setup/setup_nsdisc.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_orstang.f90 b/src/setup/setup_orstang.f90 index 04645cf0b..fd2091431 100644 --- a/src/setup/setup_orstang.f90 +++ b/src/setup/setup_orstang.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_params.f90 b/src/setup/setup_params.f90 index 9be2eadb7..3c5f74d0e 100644 --- a/src/setup/setup_params.f90 +++ b/src/setup/setup_params.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_planetdisc.f90 b/src/setup/setup_planetdisc.f90 index 8e8ecb444..ff0ff00a9 100644 --- a/src/setup/setup_planetdisc.f90 +++ b/src/setup/setup_planetdisc.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_prtest.f90 b/src/setup/setup_prtest.f90 index 4ad6b335a..179d9d5fe 100644 --- a/src/setup/setup_prtest.f90 +++ b/src/setup/setup_prtest.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_quebec.f90 b/src/setup/setup_quebec.f90 index 0ce9bde95..29fc13474 100644 --- a/src/setup/setup_quebec.f90 +++ b/src/setup/setup_quebec.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_radiativebox.f90 b/src/setup/setup_radiativebox.f90 index b30ea361b..0d9b69b85 100644 --- a/src/setup/setup_radiativebox.f90 +++ b/src/setup/setup_radiativebox.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_sedov.f90 b/src/setup/setup_sedov.f90 index 49884983f..74ea7f3f4 100644 --- a/src/setup/setup_sedov.f90 +++ b/src/setup/setup_sedov.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_shock.f90 b/src/setup/setup_shock.f90 index 478846475..7eb81e598 100644 --- a/src/setup/setup_shock.f90 +++ b/src/setup/setup_shock.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_solarsystem.f90 b/src/setup/setup_solarsystem.f90 index 4dcb7a861..396b87636 100644 --- a/src/setup/setup_solarsystem.f90 +++ b/src/setup/setup_solarsystem.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_sphereinbox.f90 b/src/setup/setup_sphereinbox.f90 index f75b6e85f..c0be1e66c 100644 --- a/src/setup/setup_sphereinbox.f90 +++ b/src/setup/setup_sphereinbox.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_srblast.f90 b/src/setup/setup_srblast.f90 index 79e38118b..e77936cac 100644 --- a/src/setup/setup_srblast.f90 +++ b/src/setup/setup_srblast.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_srpolytrope.f90 b/src/setup/setup_srpolytrope.f90 index f387060b3..6d4480660 100644 --- a/src/setup/setup_srpolytrope.f90 +++ b/src/setup/setup_srpolytrope.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_star.f90 b/src/setup/setup_star.f90 index 5e17d98c6..067536167 100644 --- a/src/setup/setup_star.f90 +++ b/src/setup/setup_star.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_starcluster.f90 b/src/setup/setup_starcluster.f90 index 89b712b14..0fe624348 100644 --- a/src/setup/setup_starcluster.f90 +++ b/src/setup/setup_starcluster.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_taylorgreen.f90 b/src/setup/setup_taylorgreen.f90 index 32f7ae24d..c75354829 100644 --- a/src/setup/setup_taylorgreen.f90 +++ b/src/setup/setup_taylorgreen.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_testparticles.f90 b/src/setup/setup_testparticles.f90 index fbc4f0410..d7e84741c 100644 --- a/src/setup/setup_testparticles.f90 +++ b/src/setup/setup_testparticles.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_tokamak.f90 b/src/setup/setup_tokamak.f90 index 6fe6d3ebb..3b65bf4d8 100644 --- a/src/setup/setup_tokamak.f90 +++ b/src/setup/setup_tokamak.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_torus.f90 b/src/setup/setup_torus.f90 index ed8b9470f..aa7521de2 100644 --- a/src/setup/setup_torus.f90 +++ b/src/setup/setup_torus.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_turb.f90 b/src/setup/setup_turb.f90 index 6910265f4..192b5dd47 100644 --- a/src/setup/setup_turb.f90 +++ b/src/setup/setup_turb.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_unifdis.f90 b/src/setup/setup_unifdis.f90 index 45b2c1abe..6fcab5bb0 100644 --- a/src/setup/setup_unifdis.f90 +++ b/src/setup/setup_unifdis.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_wave.f90 b/src/setup/setup_wave.f90 index 3a0816ee0..4ecafafe0 100644 --- a/src/setup/setup_wave.f90 +++ b/src/setup/setup_wave.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_wavedamp.f90 b/src/setup/setup_wavedamp.f90 index 8b6901518..41e627504 100644 --- a/src/setup/setup_wavedamp.f90 +++ b/src/setup/setup_wavedamp.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_wddisc.f90 b/src/setup/setup_wddisc.f90 index 39d9101a1..969eb80dc 100644 --- a/src/setup/setup_wddisc.f90 +++ b/src/setup/setup_wddisc.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_wind.f90 b/src/setup/setup_wind.f90 index e41b19227..86062ad12 100644 --- a/src/setup/setup_wind.f90 +++ b/src/setup/setup_wind.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/setup_windtunnel.f90 b/src/setup/setup_windtunnel.f90 index 0bbc21f56..5b16524f4 100644 --- a/src/setup/setup_windtunnel.f90 +++ b/src/setup/setup_windtunnel.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! @@ -18,7 +18,6 @@ module setup ! - gamma : *adiabatic index* ! - handled_layers : *number of handled layers* ! - lattice_type : *0: cubic, 1: close-packed cubic* -! - nstar : *number of particles resolving gas sphere* ! - pres_inf : *wind pressure / dyn cm^2* ! - rho_inf : *wind density / g cm^-3* ! - v_inf : *wind speed / km s^-1* @@ -27,8 +26,9 @@ module setup ! - wind_radius : *injection radius in units of Rstar* ! ! :Dependencies: dim, eos, extern_densprofile, infile_utils, inject, io, -! kernel, mpidomain, part, physcon, rho_profile, setstar_utils, setunits, -! setup_params, table_utils, timestep, unifdis, units +! kernel, mpidomain, part, physcon, relaxstar, rho_profile, +! setstar_utils, setunits, setup_params, table_utils, timestep, unifdis, +! units ! use io, only:master,fatal use inject, only:init_inject,nstar,Rstar,lattice_type,handled_layers,& @@ -168,9 +168,9 @@ subroutine setpart(id,npart,npartoftype,xyzh,massoftype,vxyzu,polyk,gamma,hfact, vxyzu(4,i) = presi / ( (gamma-1.) * densi) enddo - deallocate(r,den,pres) + deallocate(r,den,pres) endif - + print*, "udist = ", udist, "; umass = ", umass, "; utime = ", utime end subroutine setpart diff --git a/src/setup/stretchmap.f90 b/src/setup/stretchmap.f90 index cea129eca..9da968dd5 100644 --- a/src/setup/stretchmap.f90 +++ b/src/setup/stretchmap.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/setup/velfield_fromcubes.f90 b/src/setup/velfield_fromcubes.f90 index 9145c4c04..75c577b83 100644 --- a/src/setup/velfield_fromcubes.f90 +++ b/src/setup/velfield_fromcubes.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/directsum.f90 b/src/tests/directsum.f90 index d4ac696f5..f0349e6f0 100644 --- a/src/tests/directsum.f90 +++ b/src/tests/directsum.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/phantomtest.f90 b/src/tests/phantomtest.f90 index dd310aa6f..5d846b830 100644 --- a/src/tests/phantomtest.f90 +++ b/src/tests/phantomtest.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_apr.f90 b/src/tests/test_apr.f90 index eebb5c0f5..668999fe1 100644 --- a/src/tests/test_apr.f90 +++ b/src/tests/test_apr.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_cooling.f90 b/src/tests/test_cooling.f90 index 41db26289..42328a2c9 100644 --- a/src/tests/test_cooling.f90 +++ b/src/tests/test_cooling.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_corotate.f90 b/src/tests/test_corotate.f90 index 95d1d1b00..e8f3d069e 100644 --- a/src/tests/test_corotate.f90 +++ b/src/tests/test_corotate.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_damping.f90 b/src/tests/test_damping.f90 index ca00a1b95..1972be85b 100644 --- a/src/tests/test_damping.f90 +++ b/src/tests/test_damping.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_derivs.F90 b/src/tests/test_derivs.F90 index cd24aa515..02692bb28 100644 --- a/src/tests/test_derivs.F90 +++ b/src/tests/test_derivs.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_dust.f90 b/src/tests/test_dust.f90 index c025207f5..588fc4f43 100644 --- a/src/tests/test_dust.f90 +++ b/src/tests/test_dust.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_eos.f90 b/src/tests/test_eos.f90 index 44f09afe8..7efc43216 100644 --- a/src/tests/test_eos.f90 +++ b/src/tests/test_eos.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_eos_stratified.f90 b/src/tests/test_eos_stratified.f90 index 20ecf3f4f..06e5d5db6 100644 --- a/src/tests/test_eos_stratified.f90 +++ b/src/tests/test_eos_stratified.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_externf.f90 b/src/tests/test_externf.f90 index 13433ddb4..e3e7def04 100644 --- a/src/tests/test_externf.f90 +++ b/src/tests/test_externf.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_externf_gr.f90 b/src/tests/test_externf_gr.f90 index ca7529063..4e4adc400 100644 --- a/src/tests/test_externf_gr.f90 +++ b/src/tests/test_externf_gr.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_fastmath.f90 b/src/tests/test_fastmath.f90 index 358b25133..87a48d187 100644 --- a/src/tests/test_fastmath.f90 +++ b/src/tests/test_fastmath.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_geometry.f90 b/src/tests/test_geometry.f90 index b32735f05..63b24dbe3 100644 --- a/src/tests/test_geometry.f90 +++ b/src/tests/test_geometry.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_gnewton.f90 b/src/tests/test_gnewton.f90 index ebc352296..d4685fd0f 100644 --- a/src/tests/test_gnewton.f90 +++ b/src/tests/test_gnewton.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_gr.f90 b/src/tests/test_gr.f90 index bdc1ad0fa..d3e3f9cac 100644 --- a/src/tests/test_gr.f90 +++ b/src/tests/test_gr.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_gravity.f90 b/src/tests/test_gravity.f90 index 9fda4eb76..cbe1756e7 100644 --- a/src/tests/test_gravity.f90 +++ b/src/tests/test_gravity.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_growth.f90 b/src/tests/test_growth.f90 index 01190a85b..22cbceed4 100644 --- a/src/tests/test_growth.f90 +++ b/src/tests/test_growth.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_hierarchical.f90 b/src/tests/test_hierarchical.f90 index 9d5f6899a..8c49c44ce 100644 --- a/src/tests/test_hierarchical.f90 +++ b/src/tests/test_hierarchical.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_indtstep.F90 b/src/tests/test_indtstep.F90 index 30d101661..63b485bd3 100644 --- a/src/tests/test_indtstep.F90 +++ b/src/tests/test_indtstep.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_iorig.f90 b/src/tests/test_iorig.f90 index 5dcfde5b1..4b9b28fce 100644 --- a/src/tests/test_iorig.f90 +++ b/src/tests/test_iorig.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_kdtree.F90 b/src/tests/test_kdtree.F90 index ddb4730c2..262bbec6e 100644 --- a/src/tests/test_kdtree.F90 +++ b/src/tests/test_kdtree.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_kernel.f90 b/src/tests/test_kernel.f90 index 6169a18f7..33a9b0669 100644 --- a/src/tests/test_kernel.f90 +++ b/src/tests/test_kernel.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_link.F90 b/src/tests/test_link.F90 index 95c8a961a..b03d18d6a 100644 --- a/src/tests/test_link.F90 +++ b/src/tests/test_link.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_luminosity.F90 b/src/tests/test_luminosity.F90 index dab7dc68f..477928f1b 100644 --- a/src/tests/test_luminosity.F90 +++ b/src/tests/test_luminosity.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_mpi.f90 b/src/tests/test_mpi.f90 index e318998d9..1dad34040 100644 --- a/src/tests/test_mpi.f90 +++ b/src/tests/test_mpi.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_nonidealmhd.F90 b/src/tests/test_nonidealmhd.F90 index e03bab93d..301d76617 100644 --- a/src/tests/test_nonidealmhd.F90 +++ b/src/tests/test_nonidealmhd.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_part.f90 b/src/tests/test_part.f90 index aa4086b6f..58f6b732f 100644 --- a/src/tests/test_part.f90 +++ b/src/tests/test_part.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_poly.f90 b/src/tests/test_poly.f90 index a5bb1b56c..beeabb8d9 100644 --- a/src/tests/test_poly.f90 +++ b/src/tests/test_poly.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_ptmass.f90 b/src/tests/test_ptmass.f90 index da7f7dac6..43befbe71 100644 --- a/src/tests/test_ptmass.f90 +++ b/src/tests/test_ptmass.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_radiation.f90 b/src/tests/test_radiation.f90 index d13b5a249..43f56594a 100644 --- a/src/tests/test_radiation.f90 +++ b/src/tests/test_radiation.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_rwdump.F90 b/src/tests/test_rwdump.F90 index 509de2039..9139e4bb7 100644 --- a/src/tests/test_rwdump.F90 +++ b/src/tests/test_rwdump.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_sedov.F90 b/src/tests/test_sedov.F90 index 9e96630d7..2eea5378f 100644 --- a/src/tests/test_sedov.F90 +++ b/src/tests/test_sedov.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_setdisc.f90 b/src/tests/test_setdisc.f90 index 2f7bf026f..bcaa54768 100644 --- a/src/tests/test_setdisc.f90 +++ b/src/tests/test_setdisc.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_setstar.f90 b/src/tests/test_setstar.f90 index a68ffb84a..5d317a32f 100644 --- a/src/tests/test_setstar.f90 +++ b/src/tests/test_setstar.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_smol.F90 b/src/tests/test_smol.F90 index 7b26c1b65..56ca792ad 100644 --- a/src/tests/test_smol.F90 +++ b/src/tests/test_smol.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_step.F90 b/src/tests/test_step.F90 index 9bd8f7ad8..66dcaf838 100644 --- a/src/tests/test_step.F90 +++ b/src/tests/test_step.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/test_wind.f90 b/src/tests/test_wind.f90 index 65de7fb84..5563b3673 100644 --- a/src/tests/test_wind.f90 +++ b/src/tests/test_wind.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/testsuite.F90 b/src/tests/testsuite.F90 index 86db01be7..1b0c51f70 100644 --- a/src/tests/testsuite.F90 +++ b/src/tests/testsuite.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/tests/utils_testsuite.f90 b/src/tests/utils_testsuite.f90 index 512d25766..11ab2b1ed 100644 --- a/src/tests/utils_testsuite.f90 +++ b/src/tests/utils_testsuite.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/acc2ang.f90 b/src/utils/acc2ang.f90 index 56058bbb5..b557d5745 100644 --- a/src/utils/acc2ang.f90 +++ b/src/utils/acc2ang.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/adaptivemesh.f90 b/src/utils/adaptivemesh.f90 index 2072329a5..28276fb6e 100644 --- a/src/utils/adaptivemesh.f90 +++ b/src/utils/adaptivemesh.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_1particle.f90 b/src/utils/analysis_1particle.f90 index eb96fac59..5678f83b1 100644 --- a/src/utils/analysis_1particle.f90 +++ b/src/utils/analysis_1particle.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_BRhoOrientation.F90 b/src/utils/analysis_BRhoOrientation.F90 index 73170e3e6..527abd7a5 100644 --- a/src/utils/analysis_BRhoOrientation.F90 +++ b/src/utils/analysis_BRhoOrientation.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_CoM.f90 b/src/utils/analysis_CoM.f90 index b50fa4f5c..3b788985c 100644 --- a/src/utils/analysis_CoM.f90 +++ b/src/utils/analysis_CoM.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_GalMerger.f90 b/src/utils/analysis_GalMerger.f90 index 6f4e0c1fb..ee7e2d1c9 100644 --- a/src/utils/analysis_GalMerger.f90 +++ b/src/utils/analysis_GalMerger.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_MWpdf.f90 b/src/utils/analysis_MWpdf.f90 index 84f49013c..c3e0ce64e 100644 --- a/src/utils/analysis_MWpdf.f90 +++ b/src/utils/analysis_MWpdf.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_NSmerger.f90 b/src/utils/analysis_NSmerger.f90 index c96e57d0d..c189b9f7b 100644 --- a/src/utils/analysis_NSmerger.f90 +++ b/src/utils/analysis_NSmerger.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_alpha.f90 b/src/utils/analysis_alpha.f90 index d96f6fe49..41b589c69 100644 --- a/src/utils/analysis_alpha.f90 +++ b/src/utils/analysis_alpha.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_angmom.f90 b/src/utils/analysis_angmom.f90 index ce25dbc04..6f206b8eb 100644 --- a/src/utils/analysis_angmom.f90 +++ b/src/utils/analysis_angmom.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_angmomvec.f90 b/src/utils/analysis_angmomvec.f90 index eac98cd34..f3eac67b4 100644 --- a/src/utils/analysis_angmomvec.f90 +++ b/src/utils/analysis_angmomvec.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_average_orb_en.f90 b/src/utils/analysis_average_orb_en.f90 index c1c99003e..660d797ef 100644 --- a/src/utils/analysis_average_orb_en.f90 +++ b/src/utils/analysis_average_orb_en.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_binarydisc.f90 b/src/utils/analysis_binarydisc.f90 index 0894b7133..faf733e4c 100644 --- a/src/utils/analysis_binarydisc.f90 +++ b/src/utils/analysis_binarydisc.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_bzrms.f90 b/src/utils/analysis_bzrms.f90 index d8425a483..652379261 100644 --- a/src/utils/analysis_bzrms.f90 +++ b/src/utils/analysis_bzrms.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_clumpfind.F90 b/src/utils/analysis_clumpfind.F90 index 809036724..58c396a92 100644 --- a/src/utils/analysis_clumpfind.F90 +++ b/src/utils/analysis_clumpfind.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_clumpfindWB23.F90 b/src/utils/analysis_clumpfindWB23.F90 index 00e59de56..5752b6cbf 100644 --- a/src/utils/analysis_clumpfindWB23.F90 +++ b/src/utils/analysis_clumpfindWB23.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_collidingcloudevolution.f90 b/src/utils/analysis_collidingcloudevolution.f90 index 110cd4842..9e7ad1fed 100644 --- a/src/utils/analysis_collidingcloudevolution.f90 +++ b/src/utils/analysis_collidingcloudevolution.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_collidingcloudhistograms.f90 b/src/utils/analysis_collidingcloudhistograms.f90 index 11345d4ce..9e73525b9 100644 --- a/src/utils/analysis_collidingcloudhistograms.f90 +++ b/src/utils/analysis_collidingcloudhistograms.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_common_envelope.f90 b/src/utils/analysis_common_envelope.f90 index 7843a5bb2..349d78b79 100644 --- a/src/utils/analysis_common_envelope.f90 +++ b/src/utils/analysis_common_envelope.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! @@ -15,9 +15,10 @@ module analysis ! :Runtime parameters: None ! ! :Dependencies: centreofmass, dim, dust_formation, energies, eos, -! eos_gasradrec, eos_mesa, extern_corotate, io, ionization_mod, kernel, -! mesa_microphysics, part, physcon, prompting, ptmass, setbinary, -! sortutils, table_utils, units, vectorutils +! eos_gasradrec, eos_idealplusrad, eos_mesa, extern_corotate, io, +! ionization_mod, kernel, mesa_microphysics, part, physcon, prompting, +! ptmass, radiation_utils, setbinary, sortutils, table_utils, units, +! vectorutils ! use part, only:xyzmh_ptmass,vxyz_ptmass,nptmass,poten,ihsoft,ihacc,& @@ -1370,7 +1371,7 @@ subroutine output_extra_quantities(time,dumpfile,npart,particlemass,xyzh,vxyzu) .or. quants==9 .or. quants==10 .or. quants==13) req_gas_energy = any(quants==1 .or. quants==2 .or. quants==3) req_thermal_energy = any(quants==1 .or. quants==3) - + if (any(quants==6 .or. quants==8)) then sinkcom_xyz = (xyzmh_ptmass(1:3,1)*xyzmh_ptmass(4,1) + xyzmh_ptmass(1:3,2)*xyzmh_ptmass(4,2)) & / (xyzmh_ptmass(4,1) + xyzmh_ptmass(4,2)) @@ -1385,7 +1386,7 @@ subroutine output_extra_quantities(time,dumpfile,npart,particlemass,xyzh,vxyzu) endif if (any(quants==10) .and. dump_number==0) allocate(init_entropy(npart)) - + if (any(quants==13)) call set_abundances ! set initial abundances to get mass_per_H @@ -1851,7 +1852,7 @@ subroutine recombination_tau(time,npart,particlemass,xyzh,vxyzu) kappa_part(i) = kappa ! In cgs units call ionisation_fraction(rho_part(i)*unit_density,eos_vars(itemp,i),X_in,1.-X_in-Z_in,xh0,xh1,xhe0,xhe1,xhe2) call calc_gas_energies(particlemass,poten(i),xyzh(:,i),vxyzu(:,i),rad(:,i),xyzmh_ptmass,phii,& - epoti,ekini,egasi,eradi,ereci,dum) + epoti,ekini,egasi,eradi,ereci,dum) call calc_thermal_energy(particlemass,ieos,xyzh(:,i),vxyzu(:,i),ponrhoi*rho_part(i),eos_vars(itemp,i),ethi) etoti = ekini + epoti + ethi if ((xh0 > recomb_th) .and. (.not. prev_recombined(i)) .and. (etoti < 0.)) then ! Recombination event and particle is still bound @@ -3776,7 +3777,7 @@ subroutine calc_gas_energies(particlemass,poten,xyzh,vxyzu,rad,xyzmh_ptmass,phii egasi = vxyzu(4)*particlemass egasradi = egasi + eradi case(10) ! not tested - eradi = 0. ! not implemented + eradi = 0. ! not implemented egasi = 0. ! not implemented call equationofstate(ieos,ponrhoi,spsoundi,rhoi,xyzh(1),xyzh(2),xyzh(3),tempi,vxyzu(4)) presi = ponrhoi*rhoi diff --git a/src/utils/analysis_cooling.f90 b/src/utils/analysis_cooling.f90 index ed70fc07e..34823a056 100644 --- a/src/utils/analysis_cooling.f90 +++ b/src/utils/analysis_cooling.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_disc.f90 b/src/utils/analysis_disc.f90 index 1f3e9f07f..d4606b8c3 100644 --- a/src/utils/analysis_disc.f90 +++ b/src/utils/analysis_disc.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_disc_MFlow.f90 b/src/utils/analysis_disc_MFlow.f90 index 9cb995cae..73f858591 100644 --- a/src/utils/analysis_disc_MFlow.f90 +++ b/src/utils/analysis_disc_MFlow.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_disc_eccentric.f90 b/src/utils/analysis_disc_eccentric.f90 index caf029f94..abdc3004c 100644 --- a/src/utils/analysis_disc_eccentric.f90 +++ b/src/utils/analysis_disc_eccentric.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_disc_mag.f90 b/src/utils/analysis_disc_mag.f90 index 10f91136d..9152c0c91 100644 --- a/src/utils/analysis_disc_mag.f90 +++ b/src/utils/analysis_disc_mag.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_disc_planet.f90 b/src/utils/analysis_disc_planet.f90 index aad84a586..647fa7bab 100644 --- a/src/utils/analysis_disc_planet.f90 +++ b/src/utils/analysis_disc_planet.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_disc_stresses.f90 b/src/utils/analysis_disc_stresses.f90 index 7751c4da0..2c2d5112b 100644 --- a/src/utils/analysis_disc_stresses.f90 +++ b/src/utils/analysis_disc_stresses.f90 @@ -1,12 +1,13 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! module analysis ! -! Analysis routine for discs by DF, adapted from a routine by CJN +! Analysis routine for discs by DF, adapted from a routine by CJN. +! Edited for use with variable gammai and mui and more accurate alpha_ss calc by AKY ! ! :References: None ! @@ -17,8 +18,8 @@ module analysis ! - rin : *Inner Disc Radius* ! - rout : *Outer Disc Radius* ! -! :Dependencies: dim, eos, getneighbours, infile_utils, io, kernel, part, -! physcon, prompting, units +! :Dependencies: dim, eos, eos_stamatellos, getneighbours, infile_utils, +! io, kernel, part, physcon, prompting, units ! use getneighbours, only:generate_neighbour_lists, read_neighbours, write_neighbours, & neighcount,neighb,neighmax @@ -31,10 +32,10 @@ module analysis real :: rin, rout,dr integer, allocatable,dimension(:) :: ipartbin real, allocatable,dimension(:) :: rad,ninbin,sigma,csbin,vrbin,vphibin, omega - real, allocatable,dimension(:) :: H, toomre_q,epicyc + real, allocatable,dimension(:) :: H, toomre_q,epicyc,part_scaleheight real, allocatable,dimension(:) :: alpha_reyn,alpha_grav,alpha_mag,alpha_art real, allocatable,dimension(:) :: rpart,phipart,vrpart,vphipart, gr,gphi,Br,Bphi - real, allocatable,dimension(:,:) :: gravxyz + real, allocatable,dimension(:,:) :: gravxyz,zsetgas logical :: write_neighbour_list = .true. ! Write the neighbour list to file, if true @@ -45,7 +46,9 @@ module analysis subroutine do_analysis(dumpfile,numfile,xyzh,vxyzu,pmass,npart,time,iunit) use io, only:fatal - use part, only:gravity,mhd + use part, only:gravity,mhd,eos_vars + use eos, only:ieos + use eos_stamatellos, only:eos_file,read_optab character(len=*), intent(in) :: dumpfile real, intent(in) :: xyzh(:,:),vxyzu(:,:) @@ -53,6 +56,7 @@ subroutine do_analysis(dumpfile,numfile,xyzh,vxyzu,pmass,npart,time,iunit) integer, intent(in) :: npart,iunit,numfile character(len=9) :: output + integer :: ierr ! Code calculates the following alphas: @@ -70,6 +74,7 @@ subroutine do_analysis(dumpfile,numfile,xyzh,vxyzu,pmass,npart,time,iunit) ! Read analysis options call read_analysis_options + if (ieos==23) call read_optab(eos_file,ierr) if (mhd) print*, 'This is an MHD dump: will calculate Maxwell Stress' @@ -85,7 +90,7 @@ subroutine do_analysis(dumpfile,numfile,xyzh,vxyzu,pmass,npart,time,iunit) call transform_to_cylindrical(npart,xyzh,vxyzu) ! Bin particles by radius - call radial_binning(npart,xyzh,vxyzu,pmass) + call radial_binning(npart,xyzh,vxyzu,pmass,eos_vars) ! Calculate stresses call calc_stresses(npart,xyzh,vxyzu,pmass) @@ -355,16 +360,16 @@ end subroutine transform_to_cylindrical !+ !--------------------------------------------------------------- -subroutine radial_binning(npart,xyzh,vxyzu,pmass) +subroutine radial_binning(npart,xyzh,vxyzu,pmass,eos_vars) use physcon, only:pi use eos, only:get_spsound,ieos use part, only:rhoh,isdead_or_accreted integer,intent(in) :: npart real,intent(in) :: pmass - real,intent(in) :: xyzh(:,:),vxyzu(:,:) + real,intent(in) :: xyzh(:,:),vxyzu(:,:),eos_vars(:,:) - integer :: ibin,ipart,nbinned + integer :: ibin,ipart,nbinned,iallocerr real :: area,csi print '(a,I4)', 'Carrying out radial binning, number of bins: ',nbins @@ -377,6 +382,7 @@ subroutine radial_binning(npart,xyzh,vxyzu,pmass) allocate(omega(nbins)) allocate(vrbin(nbins)) allocate(vphibin(nbins)) + allocate(part_scaleheight(nbins)) ipartbin(:) = 0 ninbin(:) = 0.0 @@ -385,6 +391,15 @@ subroutine radial_binning(npart,xyzh,vxyzu,pmass) omega(:) = 0.0 vrbin(:) = 0.0 vphibin(:) = 0.0 + part_scaleheight(:) = 0.0 + + allocate(zsetgas(npart,nbins),stat=iallocerr) + ! If you don't have enough memory to allocate zsetgas, then calculate H the slow way with less memory. + if (iallocerr/=0) then + write(*,'(/,a)') ' WARNING: Could not allocate memory for array zsetgas!' + write(*,'(a)') ' (It possibly requires too much memory)' + write(*,'(a,/)') ' Try calculate scaleheight the slow way.' + endif ! Set up radial bins @@ -423,11 +438,13 @@ subroutine radial_binning(npart,xyzh,vxyzu,pmass) vrbin(ibin) = vrbin(ibin) + vrpart(ipart) vphibin(ibin) = vphibin(ibin) + vphipart(ipart) omega(ibin) = omega(ibin) + vphipart(ipart)/rad(ibin) - + zsetgas(int(ninbin(ibin)),ibin) = xyzh(3,ipart) endif enddo + call calculate_H(nbins,part_scaleheight,zsetgas,int(ninbin)) + part_scaleheight(:) = part_scaleheight(:) print*, nbinned, ' particles have been binned' where(ninbin(:)/=0) @@ -448,11 +465,11 @@ end subroutine radial_binning !+ !-------------------------------------------------------------- subroutine calc_stresses(npart,xyzh,vxyzu,pmass) - use physcon, only: pi,gg + use physcon, only: pi,gg,kb_on_mh use units, only: print_units, umass,udist,utime,unit_velocity,unit_density,unit_Bfield use dim, only: gravity - use part, only: mhd,rhoh,alphaind - use eos, only: gamma + use part, only: mhd,rhoh,alphaind,imu,itemp + use eos, only: ieos implicit none @@ -486,7 +503,10 @@ subroutine calc_stresses(npart,xyzh,vxyzu,pmass) call print_units sigma(:) = sigma(:)*umass/(udist*udist) - csbin(:) = csbin(:)*unit_velocity + if (ieos /= 23) then + csbin(:) = csbin(:)*unit_velocity + endif + omega(:) = omega(:)/utime Keplog = 1.5 @@ -507,14 +527,13 @@ subroutine calc_stresses(npart,xyzh,vxyzu,pmass) if (ibin<=0) cycle - cs2 = gamma*(gamma-1)*vxyzu(4,ipart)*unit_velocity*unit_velocity - dvr = (vrpart(ipart) - vrbin(ibin))*unit_velocity dvphi = (vphipart(ipart) -vphibin(ibin))*unit_velocity rhopart = rhoh(xyzh(4,ipart),pmass)*unit_density alpha_reyn(ibin) = alpha_reyn(ibin) + dvr*dvphi +! Handle constant alpha_sph alpha_art(ibin) = alpha_art(ibin) + alphaind(1,ipart)*xyzh(4,ipart)*udist if (gravity) alpha_grav(ibin) = alpha_grav(ibin) + gr(ipart)*gphi(ipart)/rhopart @@ -592,7 +611,7 @@ subroutine write_radial_data(iunit,output,time) print '(a,a)', 'Writing to file ',output open(iunit,file=output) write(iunit,'("# Disc Stress data at t = ",es20.12)') time - write(iunit,"('#',11(1x,'[',i2.2,1x,a11,']',2x))") & + write(iunit,"('#',12(1x,'[',i2.2,1x,a11,']',2x))") & 1,'radius (AU)', & 2,'sigma (cgs)', & 3,'cs (cgs)', & @@ -603,12 +622,13 @@ subroutine write_radial_data(iunit,output,time) 8,'alpha_reyn',& 9,'alpha_grav',& 10,'alpha_mag',& - 11,'alpha_art' + 11,'alpha_art',& + 12,'particle H (au)' do ibin=1,nbins - write(iunit,'(11(es18.10,1X))') rad(ibin),sigma(ibin),csbin(ibin), & + write(iunit,'(12(es18.10,1X))') rad(ibin),sigma(ibin),csbin(ibin), & omega(ibin),epicyc(ibin),H(ibin), abs(toomre_q(ibin)),alpha_reyn(ibin), & - alpha_grav(ibin),alpha_mag(ibin),alpha_art(ibin) + alpha_grav(ibin),alpha_mag(ibin),alpha_art(ibin),part_scaleheight(ibin) enddo close(iunit) @@ -617,13 +637,33 @@ subroutine write_radial_data(iunit,output,time) end subroutine write_radial_data +subroutine calculate_H(nbin,H,zsetgas,ninbin) +! copied from utils disc + integer, intent(in) :: nbin + real, intent(out) :: H(:) + real, intent(in) :: zsetgas(:,:) + integer, intent(in) :: ninbin(:) + integer :: ii + real :: meanzii + + do ii = 1,nbin + if (ninbin(ii)==0) then + meanzii = 0. + else + meanzii = sum(zsetgas(1:ninbin(ii),ii))/real(ninbin(ii)) + endif + H(ii) = sqrt(sum(((zsetgas(1:ninbin(ii),ii)-meanzii)**2)/(real(ninbin(ii)-1)))) + enddo + +end subroutine calculate_H + !-------------------------------------------------------- !+ ! Deallocate arrays !+ !------------------------------------------------------- subroutine deallocate_arrays - + use eos_stamatellos, only:optable implicit none deallocate(gravxyz) @@ -633,6 +673,9 @@ subroutine deallocate_arrays deallocate(gr,gphi,Br,Bphi,vrbin,vphibin) deallocate(sigma,csbin,H,toomre_q,omega,epicyc) deallocate(alpha_reyn,alpha_grav,alpha_mag,alpha_art) + deallocate(part_scaleheight) + + if (allocated(optable)) deallocate(optable) end subroutine deallocate_arrays !------------------------------------------------------- diff --git a/src/utils/analysis_dtheader.f90 b/src/utils/analysis_dtheader.f90 index d36b73452..ff1c092e9 100644 --- a/src/utils/analysis_dtheader.f90 +++ b/src/utils/analysis_dtheader.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_dustformation.f90 b/src/utils/analysis_dustformation.f90 index 9eaa95ee3..04dbffd51 100644 --- a/src/utils/analysis_dustformation.f90 +++ b/src/utils/analysis_dustformation.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_dustmass.f90 b/src/utils/analysis_dustmass.f90 index a072aedbe..e6043f85d 100644 --- a/src/utils/analysis_dustmass.f90 +++ b/src/utils/analysis_dustmass.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_dustydisc.f90 b/src/utils/analysis_dustydisc.f90 index c7f2d879b..aa9868e48 100644 --- a/src/utils/analysis_dustydisc.f90 +++ b/src/utils/analysis_dustydisc.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_dustywind.f90 b/src/utils/analysis_dustywind.f90 index 74f071edb..3bd279ff9 100644 --- a/src/utils/analysis_dustywind.f90 +++ b/src/utils/analysis_dustywind.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_energies.f90 b/src/utils/analysis_energies.f90 index 4d4288b74..1b9aaa57c 100644 --- a/src/utils/analysis_energies.f90 +++ b/src/utils/analysis_energies.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_etotgr.f90 b/src/utils/analysis_etotgr.f90 index be1a500aa..4513ab1d9 100644 --- a/src/utils/analysis_etotgr.f90 +++ b/src/utils/analysis_etotgr.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_getneighbours.f90 b/src/utils/analysis_getneighbours.f90 index f5fffe2a0..aa8ba69c0 100644 --- a/src/utils/analysis_getneighbours.f90 +++ b/src/utils/analysis_getneighbours.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_gws.f90 b/src/utils/analysis_gws.f90 index 70b12ab2b..3f2b06994 100644 --- a/src/utils/analysis_gws.f90 +++ b/src/utils/analysis_gws.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_jet.f90 b/src/utils/analysis_jet.f90 index 86c86dca8..52195d612 100644 --- a/src/utils/analysis_jet.f90 +++ b/src/utils/analysis_jet.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_kdtree.F90 b/src/utils/analysis_kdtree.F90 index ef83ee5e3..ca9487c7d 100644 --- a/src/utils/analysis_kdtree.F90 +++ b/src/utils/analysis_kdtree.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_kepler.f90 b/src/utils/analysis_kepler.f90 index e057510cb..8dd0d235a 100644 --- a/src/utils/analysis_kepler.f90 +++ b/src/utils/analysis_kepler.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_macctrace.f90 b/src/utils/analysis_macctrace.f90 index 26b1e224c..86bcb4812 100644 --- a/src/utils/analysis_macctrace.f90 +++ b/src/utils/analysis_macctrace.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_mapping_mass.f90 b/src/utils/analysis_mapping_mass.f90 index 892b5fb4c..26cd4a3b5 100644 --- a/src/utils/analysis_mapping_mass.f90 +++ b/src/utils/analysis_mapping_mass.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_mcfost.f90 b/src/utils/analysis_mcfost.f90 index 05259161b..5ccc741a4 100644 --- a/src/utils/analysis_mcfost.f90 +++ b/src/utils/analysis_mcfost.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_mcfostcmdline.f90 b/src/utils/analysis_mcfostcmdline.f90 index 2e3b10dc9..5c4df9283 100644 --- a/src/utils/analysis_mcfostcmdline.f90 +++ b/src/utils/analysis_mcfostcmdline.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_pairing.f90 b/src/utils/analysis_pairing.f90 index fbef57fe5..1f47f4293 100644 --- a/src/utils/analysis_pairing.f90 +++ b/src/utils/analysis_pairing.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_particle.f90 b/src/utils/analysis_particle.f90 index 5691ff0a9..8b0ab9363 100644 --- a/src/utils/analysis_particle.f90 +++ b/src/utils/analysis_particle.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_pdfs.f90 b/src/utils/analysis_pdfs.f90 index 96c64fc73..3e65e3056 100644 --- a/src/utils/analysis_pdfs.f90 +++ b/src/utils/analysis_pdfs.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_phantom_dump.f90 b/src/utils/analysis_phantom_dump.f90 index 0ffc60048..e12698e52 100644 --- a/src/utils/analysis_phantom_dump.f90 +++ b/src/utils/analysis_phantom_dump.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_polytropes.f90 b/src/utils/analysis_polytropes.f90 index c112085a3..510a5c539 100644 --- a/src/utils/analysis_polytropes.f90 +++ b/src/utils/analysis_polytropes.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_prdrag.f90 b/src/utils/analysis_prdrag.f90 index 8372c5c23..7ad9bb6c4 100644 --- a/src/utils/analysis_prdrag.f90 +++ b/src/utils/analysis_prdrag.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_protostar_environ.F90 b/src/utils/analysis_protostar_environ.F90 index 895d04933..64df5ed00 100644 --- a/src/utils/analysis_protostar_environ.F90 +++ b/src/utils/analysis_protostar_environ.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_ptmass.f90 b/src/utils/analysis_ptmass.f90 index 85477e1d4..e2a0869d7 100644 --- a/src/utils/analysis_ptmass.f90 +++ b/src/utils/analysis_ptmass.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_radiotde.f90 b/src/utils/analysis_radiotde.f90 index 918e8473b..06ee1f9fb 100644 --- a/src/utils/analysis_radiotde.f90 +++ b/src/utils/analysis_radiotde.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_raytracer.f90 b/src/utils/analysis_raytracer.f90 index f70a7589a..202a1646d 100644 --- a/src/utils/analysis_raytracer.f90 +++ b/src/utils/analysis_raytracer.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! @@ -10,7 +10,7 @@ module analysis ! ! :References: Esseldeurs M., Siess L. et al, 2023, A&A, 674, A122 ! -! :Owner: Mats Esseldeurs +! :Owner: Lionel Siess ! ! :Runtime parameters: None ! diff --git a/src/utils/analysis_sinkmass.f90 b/src/utils/analysis_sinkmass.f90 index 7993d3664..7327637cd 100644 --- a/src/utils/analysis_sinkmass.f90 +++ b/src/utils/analysis_sinkmass.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_sphere.f90 b/src/utils/analysis_sphere.f90 index a74eab303..cd25734e2 100644 --- a/src/utils/analysis_sphere.f90 +++ b/src/utils/analysis_sphere.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_structurefn.f90 b/src/utils/analysis_structurefn.f90 index 0e91bedde..ed2a4350d 100644 --- a/src/utils/analysis_structurefn.f90 +++ b/src/utils/analysis_structurefn.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_tde.f90 b/src/utils/analysis_tde.f90 index e0aa5ae7e..92b1d90a9 100644 --- a/src/utils/analysis_tde.f90 +++ b/src/utils/analysis_tde.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_tdeoutflow.f90 b/src/utils/analysis_tdeoutflow.f90 index 3012ee514..39a5803ae 100644 --- a/src/utils/analysis_tdeoutflow.f90 +++ b/src/utils/analysis_tdeoutflow.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_torus.f90 b/src/utils/analysis_torus.f90 index f6a745703..691ad3f0f 100644 --- a/src/utils/analysis_torus.f90 +++ b/src/utils/analysis_torus.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_trackbox.f90 b/src/utils/analysis_trackbox.f90 index efbe6e251..36bf71ec8 100644 --- a/src/utils/analysis_trackbox.f90 +++ b/src/utils/analysis_trackbox.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_tracks.f90 b/src/utils/analysis_tracks.f90 index 3812cc3b4..d76fb87e9 100644 --- a/src/utils/analysis_tracks.f90 +++ b/src/utils/analysis_tracks.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_velocitydispersion_vs_scale.f90 b/src/utils/analysis_velocitydispersion_vs_scale.f90 index ec46ee0b6..780e202c8 100644 --- a/src/utils/analysis_velocitydispersion_vs_scale.f90 +++ b/src/utils/analysis_velocitydispersion_vs_scale.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_velocityshear.f90 b/src/utils/analysis_velocityshear.f90 index da5209758..bdabd4bb2 100644 --- a/src/utils/analysis_velocityshear.f90 +++ b/src/utils/analysis_velocityshear.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/analysis_write_kdtree.F90 b/src/utils/analysis_write_kdtree.F90 index f27f4d623..49c053119 100644 --- a/src/utils/analysis_write_kdtree.F90 +++ b/src/utils/analysis_write_kdtree.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/combinedustdumps.f90 b/src/utils/combinedustdumps.f90 index 7dbbdf2d5..ca540af85 100755 --- a/src/utils/combinedustdumps.f90 +++ b/src/utils/combinedustdumps.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/cubicsolve.f90 b/src/utils/cubicsolve.f90 index 3d88f97f5..62d6ef21d 100644 --- a/src/utils/cubicsolve.f90 +++ b/src/utils/cubicsolve.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/diffdumps.f90 b/src/utils/diffdumps.f90 index 9423c6960..bfa6af00a 100644 --- a/src/utils/diffdumps.f90 +++ b/src/utils/diffdumps.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/dustywaves.f90 b/src/utils/dustywaves.f90 index 2d671513f..b377ae47b 100644 --- a/src/utils/dustywaves.f90 +++ b/src/utils/dustywaves.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/einsteintk_utils.f90 b/src/utils/einsteintk_utils.f90 index 3268df976..f7bcb00f2 100644 --- a/src/utils/einsteintk_utils.f90 +++ b/src/utils/einsteintk_utils.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/einsteintk_wrapper.f90 b/src/utils/einsteintk_wrapper.f90 index 96544a28f..cfc924198 100644 --- a/src/utils/einsteintk_wrapper.f90 +++ b/src/utils/einsteintk_wrapper.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/ev2kdot.f90 b/src/utils/ev2kdot.f90 index dced7d521..d5a089835 100644 --- a/src/utils/ev2kdot.f90 +++ b/src/utils/ev2kdot.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/ev2mdot.f90 b/src/utils/ev2mdot.f90 index 40374442b..e503bc698 100644 --- a/src/utils/ev2mdot.f90 +++ b/src/utils/ev2mdot.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/evol_dustywaves.f90 b/src/utils/evol_dustywaves.f90 index e9584604c..605013076 100644 --- a/src/utils/evol_dustywaves.f90 +++ b/src/utils/evol_dustywaves.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/get_struct_slope.f90 b/src/utils/get_struct_slope.f90 index 789e39854..2c0747f9d 100644 --- a/src/utils/get_struct_slope.f90 +++ b/src/utils/get_struct_slope.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/getmathflags.f90 b/src/utils/getmathflags.f90 index fbe9f872e..b94a31618 100644 --- a/src/utils/getmathflags.f90 +++ b/src/utils/getmathflags.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/grid2pdf.f90 b/src/utils/grid2pdf.f90 index 8ae7ad563..9dbca14d5 100644 --- a/src/utils/grid2pdf.f90 +++ b/src/utils/grid2pdf.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/hdf5utils.f90 b/src/utils/hdf5utils.f90 index 34031f068..2ac266ce0 100644 --- a/src/utils/hdf5utils.f90 +++ b/src/utils/hdf5utils.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/icosahedron.f90 b/src/utils/icosahedron.f90 index d0b00c594..cd49110e8 100644 --- a/src/utils/icosahedron.f90 +++ b/src/utils/icosahedron.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/interpolate3D.f90 b/src/utils/interpolate3D.f90 index 3b9e849f5..2939ebf71 100644 --- a/src/utils/interpolate3D.f90 +++ b/src/utils/interpolate3D.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/interpolate3D_amr.F90 b/src/utils/interpolate3D_amr.F90 index 49a9eb8b7..fec80e703 100644 --- a/src/utils/interpolate3D_amr.F90 +++ b/src/utils/interpolate3D_amr.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/io_grid.f90 b/src/utils/io_grid.f90 index a54cec7fe..bdaf0fdc1 100644 --- a/src/utils/io_grid.f90 +++ b/src/utils/io_grid.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/io_structurefn.f90 b/src/utils/io_structurefn.f90 index 00af14e20..737dce118 100644 --- a/src/utils/io_structurefn.f90 +++ b/src/utils/io_structurefn.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/leastsquares.f90 b/src/utils/leastsquares.f90 index f71fd3473..12e196ad2 100644 --- a/src/utils/leastsquares.f90 +++ b/src/utils/leastsquares.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/libphantom-splash.f90 b/src/utils/libphantom-splash.f90 index 2c0fc772a..e4dac4ffe 100644 --- a/src/utils/libphantom-splash.f90 +++ b/src/utils/libphantom-splash.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/lombperiod.f90 b/src/utils/lombperiod.f90 index d9b7a668e..a29f4f34d 100644 --- a/src/utils/lombperiod.f90 +++ b/src/utils/lombperiod.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/mflow.f90 b/src/utils/mflow.f90 index ea284e3fa..f746e22d5 100644 --- a/src/utils/mflow.f90 +++ b/src/utils/mflow.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/moddump_CoM.f90 b/src/utils/moddump_CoM.f90 index 72df6ef41..e745410ea 100644 --- a/src/utils/moddump_CoM.f90 +++ b/src/utils/moddump_CoM.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/moddump_LTE_to_rad.f90 b/src/utils/moddump_LTE_to_rad.f90 index 58e9a135a..8b9eef3dc 100644 --- a/src/utils/moddump_LTE_to_rad.f90 +++ b/src/utils/moddump_LTE_to_rad.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/moddump_addflyby.f90 b/src/utils/moddump_addflyby.f90 index 59bb9ca36..984e56461 100644 --- a/src/utils/moddump_addflyby.f90 +++ b/src/utils/moddump_addflyby.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/moddump_addplanets.f90 b/src/utils/moddump_addplanets.f90 index 9f913bb0c..d949cc72a 100644 --- a/src/utils/moddump_addplanets.f90 +++ b/src/utils/moddump_addplanets.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/moddump_binary.f90 b/src/utils/moddump_binary.f90 index c4c1077c3..9ce469f01 100644 --- a/src/utils/moddump_binary.f90 +++ b/src/utils/moddump_binary.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/moddump_binarystar.f90 b/src/utils/moddump_binarystar.f90 index 4e15def00..31fc2fb36 100644 --- a/src/utils/moddump_binarystar.f90 +++ b/src/utils/moddump_binarystar.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/moddump_changemass.f90 b/src/utils/moddump_changemass.f90 index a407d17e7..002e5485f 100644 --- a/src/utils/moddump_changemass.f90 +++ b/src/utils/moddump_changemass.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/moddump_default.f90 b/src/utils/moddump_default.f90 index 0ae0f2a97..f5bb27df0 100644 --- a/src/utils/moddump_default.f90 +++ b/src/utils/moddump_default.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/moddump_disc.f90 b/src/utils/moddump_disc.f90 index 13a7bd473..9c6127164 100644 --- a/src/utils/moddump_disc.f90 +++ b/src/utils/moddump_disc.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/moddump_dustadd.f90 b/src/utils/moddump_dustadd.f90 index 588a74707..1c233141a 100644 --- a/src/utils/moddump_dustadd.f90 +++ b/src/utils/moddump_dustadd.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/moddump_extenddisc.f90 b/src/utils/moddump_extenddisc.f90 index 1f16281da..78329d998 100644 --- a/src/utils/moddump_extenddisc.f90 +++ b/src/utils/moddump_extenddisc.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/moddump_growthtomultigrain.f90 b/src/utils/moddump_growthtomultigrain.f90 index bcc8ab7c4..7dd2834de 100644 --- a/src/utils/moddump_growthtomultigrain.f90 +++ b/src/utils/moddump_growthtomultigrain.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/moddump_mergepart.f90 b/src/utils/moddump_mergepart.f90 index 17d42b67b..428c14290 100644 --- a/src/utils/moddump_mergepart.f90 +++ b/src/utils/moddump_mergepart.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/moddump_messupSPH.f90 b/src/utils/moddump_messupSPH.f90 index 1f0b8a257..f3f1e9a3d 100644 --- a/src/utils/moddump_messupSPH.f90 +++ b/src/utils/moddump_messupSPH.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/moddump_perturbgas.f90 b/src/utils/moddump_perturbgas.f90 index 8e895aafa..55ef6640f 100644 --- a/src/utils/moddump_perturbgas.f90 +++ b/src/utils/moddump_perturbgas.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/moddump_polytrope.f90 b/src/utils/moddump_polytrope.f90 index ed9554b90..2c005174b 100644 --- a/src/utils/moddump_polytrope.f90 +++ b/src/utils/moddump_polytrope.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/moddump_rad_to_LTE.f90 b/src/utils/moddump_rad_to_LTE.f90 index 7b14b0ee0..7b59c4e88 100644 --- a/src/utils/moddump_rad_to_LTE.f90 +++ b/src/utils/moddump_rad_to_LTE.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/moddump_radiotde.f90 b/src/utils/moddump_radiotde.f90 index e984c3792..baff749a9 100644 --- a/src/utils/moddump_radiotde.f90 +++ b/src/utils/moddump_radiotde.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/moddump_recalcuT.f90 b/src/utils/moddump_recalcuT.f90 index 814c275cf..2df2046fd 100644 --- a/src/utils/moddump_recalcuT.f90 +++ b/src/utils/moddump_recalcuT.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/moddump_removeparticles_cylinder.f90 b/src/utils/moddump_removeparticles_cylinder.f90 index eed6b214f..a6a18a7e4 100644 --- a/src/utils/moddump_removeparticles_cylinder.f90 +++ b/src/utils/moddump_removeparticles_cylinder.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/moddump_removeparticles_radius.f90 b/src/utils/moddump_removeparticles_radius.f90 index 65bad1b90..92364653a 100644 --- a/src/utils/moddump_removeparticles_radius.f90 +++ b/src/utils/moddump_removeparticles_radius.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/moddump_rotate.f90 b/src/utils/moddump_rotate.f90 index 34a6a069f..fb84d7701 100644 --- a/src/utils/moddump_rotate.f90 +++ b/src/utils/moddump_rotate.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/moddump_sink.f90 b/src/utils/moddump_sink.f90 index 01c4c3506..f892a54e4 100644 --- a/src/utils/moddump_sink.f90 +++ b/src/utils/moddump_sink.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/moddump_sinkbinary.f90 b/src/utils/moddump_sinkbinary.f90 index 46a128db7..85208392a 100644 --- a/src/utils/moddump_sinkbinary.f90 +++ b/src/utils/moddump_sinkbinary.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/moddump_sphNG2phantom.f90 b/src/utils/moddump_sphNG2phantom.f90 index ad1b1feb7..d54c19066 100644 --- a/src/utils/moddump_sphNG2phantom.f90 +++ b/src/utils/moddump_sphNG2phantom.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/moddump_sphNG2phantom_addBfield.f90 b/src/utils/moddump_sphNG2phantom_addBfield.f90 index e33c1cb92..2e850e669 100644 --- a/src/utils/moddump_sphNG2phantom_addBfield.f90 +++ b/src/utils/moddump_sphNG2phantom_addBfield.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/moddump_sphNG2phantom_disc.f90 b/src/utils/moddump_sphNG2phantom_disc.f90 index 833b765cf..fe2a452f2 100644 --- a/src/utils/moddump_sphNG2phantom_disc.f90 +++ b/src/utils/moddump_sphNG2phantom_disc.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! @@ -32,7 +32,7 @@ subroutine modify_dump(npart,npartoftype,massoftype,xyzh,vxyzu) use prompting, only:prompt use physcon, only:au,gg use readwrite_dumps_fortran, only:dt_read_in_fortran - use timestep, only:time,dt,dtmax_max,dtmax_min,dtmax0 + use timestep, only:time,dt,dtmax_max,dtmax_min use centreofmass, only: reset_centreofmass integer, intent(inout) :: npart integer, intent(inout) :: npartoftype(:) @@ -82,9 +82,9 @@ subroutine modify_dump(npart,npartoftype,massoftype,xyzh,vxyzu) nptmass = nptmass + npt do i=1,npt read (iunit,*) junk - read (iunit,'(10E15.6)') (xyzmh_ptmass(j,nptmass),j=1,10) + read (iunit,'(10E15.6)') (xyzmh_ptmass(j,i),j=1,10) read (iunit,*) junk - read (iunit,'(3E15.6)') (vxyz_ptmass(j,nptmass),j=1,3) + read (iunit,'(3E15.6)') (vxyz_ptmass(j,i),j=1,3) enddo close(iunit) endif @@ -97,7 +97,7 @@ subroutine modify_dump(npart,npartoftype,massoftype,xyzh,vxyzu) enddo close(iunit) - print *, 'dtmax0, dtmax_max,dtmax_min',dtmax0,dtmax_max,dtmax_min + print *, 'dtmax_max,dtmax_min',dtmax_max,dtmax_min newutime = sqrt(au**3/(gg*umass)) print *, "newutime/old", newutime/utime time = time * utime / newutime @@ -177,7 +177,7 @@ subroutine modify_dump(npart,npartoftype,massoftype,xyzh,vxyzu) 'nptmass:', nptmass print *, 'gamma=', gamma print *, 'Timestep info:' - print *, 'dtmax0, dtmax_max,dtmax_min', dtmax0,dtmax_max,dtmax_min + print *, 'dtmax_max,dtmax_min', dtmax_max,dtmax_min print *, 'utime=', utime return diff --git a/src/utils/moddump_splitpart.f90 b/src/utils/moddump_splitpart.f90 index 9f932cffc..6cc36bb0a 100644 --- a/src/utils/moddump_splitpart.f90 +++ b/src/utils/moddump_splitpart.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/moddump_taylorgreen.f90 b/src/utils/moddump_taylorgreen.f90 index f165d49b6..3df62ba91 100644 --- a/src/utils/moddump_taylorgreen.f90 +++ b/src/utils/moddump_taylorgreen.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/moddump_tidal.f90 b/src/utils/moddump_tidal.f90 index a4a1b4b51..c5277d7f0 100644 --- a/src/utils/moddump_tidal.f90 +++ b/src/utils/moddump_tidal.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/moddump_torus.f90 b/src/utils/moddump_torus.f90 index 3de87ae9a..90871d7a2 100644 --- a/src/utils/moddump_torus.f90 +++ b/src/utils/moddump_torus.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/multirun.f90 b/src/utils/multirun.f90 index 5536cdcf5..d883477d4 100644 --- a/src/utils/multirun.f90 +++ b/src/utils/multirun.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/multirun_mach.f90 b/src/utils/multirun_mach.f90 index df2cb5b97..5ac108350 100644 --- a/src/utils/multirun_mach.f90 +++ b/src/utils/multirun_mach.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/pdfs.f90 b/src/utils/pdfs.f90 index fd306041d..e92a23c56 100644 --- a/src/utils/pdfs.f90 +++ b/src/utils/pdfs.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/phantom2divb.f90 b/src/utils/phantom2divb.f90 index cac56bccd..508d41c92 100644 --- a/src/utils/phantom2divb.f90 +++ b/src/utils/phantom2divb.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/phantom2divv.f90 b/src/utils/phantom2divv.f90 index 0befaad7d..e2187bc36 100644 --- a/src/utils/phantom2divv.f90 +++ b/src/utils/phantom2divv.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/phantom2gadget.f90 b/src/utils/phantom2gadget.f90 index 1681ff9cc..4471bf6f2 100644 --- a/src/utils/phantom2gadget.f90 +++ b/src/utils/phantom2gadget.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/phantom2hdf5.f90 b/src/utils/phantom2hdf5.f90 index d4d032e0c..dd6031996 100644 --- a/src/utils/phantom2hdf5.f90 +++ b/src/utils/phantom2hdf5.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/phantom2sphNG.f90 b/src/utils/phantom2sphNG.f90 index b4532fbef..358f15cc4 100644 --- a/src/utils/phantom2sphNG.f90 +++ b/src/utils/phantom2sphNG.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/phantom_moddump.f90 b/src/utils/phantom_moddump.f90 index a6ed9bb0d..441853aac 100644 --- a/src/utils/phantom_moddump.f90 +++ b/src/utils/phantom_moddump.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/phantomanalysis.f90 b/src/utils/phantomanalysis.f90 index 94ccc3695..5767dae0d 100644 --- a/src/utils/phantomanalysis.f90 +++ b/src/utils/phantomanalysis.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/phantomevcompare.f90 b/src/utils/phantomevcompare.f90 index 8a0d15062..efbb4eb9a 100644 --- a/src/utils/phantomevcompare.f90 +++ b/src/utils/phantomevcompare.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/phantomextractsinks.f90 b/src/utils/phantomextractsinks.f90 index 1e4577fde..3cc2a7c07 100644 --- a/src/utils/phantomextractsinks.f90 +++ b/src/utils/phantomextractsinks.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/plot_kernel.f90 b/src/utils/plot_kernel.f90 index 35b176884..fe7789391 100644 --- a/src/utils/plot_kernel.f90 +++ b/src/utils/plot_kernel.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/powerspectrums.f90 b/src/utils/powerspectrums.f90 index de772a8b6..4447e2c32 100644 --- a/src/utils/powerspectrums.f90 +++ b/src/utils/powerspectrums.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/prompting.f90 b/src/utils/prompting.f90 index b68033c5f..60810ef1d 100644 --- a/src/utils/prompting.f90 +++ b/src/utils/prompting.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/quartic.f90 b/src/utils/quartic.f90 index 4ae9ee375..6d03dec7d 100644 --- a/src/utils/quartic.f90 +++ b/src/utils/quartic.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/rhomach.f90 b/src/utils/rhomach.f90 index 8164eb3a2..04597f46c 100644 --- a/src/utils/rhomach.f90 +++ b/src/utils/rhomach.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/showarrays.f90 b/src/utils/showarrays.f90 index 64762b59c..090a9f8ce 100644 --- a/src/utils/showarrays.f90 +++ b/src/utils/showarrays.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/showheader.f90 b/src/utils/showheader.f90 index b70b1a884..c97969471 100644 --- a/src/utils/showheader.f90 +++ b/src/utils/showheader.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/solvelinearsystem.f90 b/src/utils/solvelinearsystem.f90 index fefb6c08e..30f760d9b 100644 --- a/src/utils/solvelinearsystem.f90 +++ b/src/utils/solvelinearsystem.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/splitpart.f90 b/src/utils/splitpart.f90 index c6847e607..8bf2ef2f3 100644 --- a/src/utils/splitpart.f90 +++ b/src/utils/splitpart.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/struct2struct.f90 b/src/utils/struct2struct.f90 index 2d22707f3..f2d2b763e 100644 --- a/src/utils/struct2struct.f90 +++ b/src/utils/struct2struct.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/struct_part.f90 b/src/utils/struct_part.f90 index 99640148d..8bf30340d 100644 --- a/src/utils/struct_part.f90 +++ b/src/utils/struct_part.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/tabulate_metric.f90 b/src/utils/tabulate_metric.f90 index c02d2a870..70b982172 100644 --- a/src/utils/tabulate_metric.f90 +++ b/src/utils/tabulate_metric.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/test_binary.f90 b/src/utils/test_binary.f90 index 4dd432524..84b8132ff 100644 --- a/src/utils/test_binary.f90 +++ b/src/utils/test_binary.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/testbinary.f90 b/src/utils/testbinary.f90 index f7da761f8..93a804d70 100644 --- a/src/utils/testbinary.f90 +++ b/src/utils/testbinary.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/utils_disc.f90 b/src/utils/utils_disc.f90 index 0e47329c6..ba3f37dec 100644 --- a/src/utils/utils_disc.f90 +++ b/src/utils/utils_disc.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/utils_ephemeris.f90 b/src/utils/utils_ephemeris.f90 index 91ad77224..f24868aeb 100644 --- a/src/utils/utils_ephemeris.f90 +++ b/src/utils/utils_ephemeris.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/utils_evfiles.f90 b/src/utils/utils_evfiles.f90 index 515da58e6..65d714c29 100644 --- a/src/utils/utils_evfiles.f90 +++ b/src/utils/utils_evfiles.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/utils_getneighbours.F90 b/src/utils/utils_getneighbours.F90 index d63d33e1c..19bbab221 100644 --- a/src/utils/utils_getneighbours.F90 +++ b/src/utils/utils_getneighbours.F90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/utils_gravwave.f90 b/src/utils/utils_gravwave.f90 index 5f568aaad..006aedd9c 100644 --- a/src/utils/utils_gravwave.f90 +++ b/src/utils/utils_gravwave.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/utils_linalg.f90 b/src/utils/utils_linalg.f90 index c4c6c22bd..2f96b13ea 100644 --- a/src/utils/utils_linalg.f90 +++ b/src/utils/utils_linalg.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/utils_mpc.f90 b/src/utils/utils_mpc.f90 index 3a90abd94..2bbdf9430 100644 --- a/src/utils/utils_mpc.f90 +++ b/src/utils/utils_mpc.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/utils_orbits.f90 b/src/utils/utils_orbits.f90 index a92cd3da9..9347780f4 100644 --- a/src/utils/utils_orbits.f90 +++ b/src/utils/utils_orbits.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/utils_raytracer_all.f90 b/src/utils/utils_raytracer_all.f90 index a257b00c4..37102bec1 100644 --- a/src/utils/utils_raytracer_all.f90 +++ b/src/utils/utils_raytracer_all.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/utils_splitmerge.f90 b/src/utils/utils_splitmerge.f90 index 87ec4670c..87923d06d 100644 --- a/src/utils/utils_splitmerge.f90 +++ b/src/utils/utils_splitmerge.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------! diff --git a/src/utils/velfield.f90 b/src/utils/velfield.f90 index 4792a65f7..ef7aff52f 100644 --- a/src/utils/velfield.f90 +++ b/src/utils/velfield.f90 @@ -1,6 +1,6 @@ !--------------------------------------------------------------------------! ! The Phantom Smoothed Particle Hydrodynamics code, by Daniel Price et al. ! -! Copyright (c) 2007-2024 The Authors (see AUTHORS) ! +! Copyright (c) 2007-2025 The Authors (see AUTHORS) ! ! See LICENCE file for usage and distribution conditions ! ! http://phantomsph.github.io/ ! !--------------------------------------------------------------------------!