Skip to content

Commit

Permalink
Merge pull request #89 from cpinte/nucleation
Browse files Browse the repository at this point in the history 
Nucleation
  • Loading branch information
@cpinte
cpinte authored Dec 7, 2023
2 parents 552d6db + 2108c55 commit b3edb51
Show file tree
Hide file tree
Showing 9 changed files with 2,123 additions and 88 deletions.
3 changes: 2 additions & 1 deletion src/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,8 @@ SOURCES = mcfost_env.f90 parameters.f90 constants.f90 healpix_mod.f90 sha.f90 me
opacity_atom.f90 MRW.f90 optical_depth.f90 ML_prodimo.f90 \
output.f90 mem.f90 init_mcfost.f90 io_phantom_infiles.f90 \
io_phantom_utils.f90 mess_up_SPH.f90 read_phantom.f90 \
read_gadget2.f90 SPH2mcfost.f90 mhd2mcfost.f90 dust_transfer.f90 \
read_gadget2.f90 fsolve.f90 reconstruct_from_moments.f90 \
SPH2mcfost.f90 mhd2mcfost.f90 dust_transfer.f90 \
mol_transfer.f90 collision_atom.f90 io_atom.f90 \
electron_density.f90 see.f90 \
atom_transfer.f90
Expand Down
52 changes: 42 additions & 10 deletions src/SPH2mcfost.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@ subroutine setup_SPH2mcfost(SPH_file,SPH_limits_file, n_SPH, extra_heating)
real(dp), allocatable, dimension(:) :: x,y,z,h,vx,vy,vz,rho,massgas,SPH_grainsizes,T_gas
real(dp), allocatable, dimension(:) :: vturb,mass_ne_on_massgas,atomic_mask
integer, allocatable, dimension(:) :: particle_id
real(dp), allocatable, dimension(:,:) :: rhodust, massdust
real(dp), allocatable, dimension(:,:) :: rhodust, massdust, dust_moments
real, allocatable, dimension(:) :: extra_heating
logical, allocatable, dimension(:) :: mask ! size == np, not n_SPH, index is original SPH id

integer, dimension(:), allocatable :: is_ghost
real(dp), dimension(6) :: SPH_limits
real :: factor
integer :: ndusttypes, ierr, i, ilen
logical :: check_previous_tesselation

logical :: check_previous_tesselation, ldust_moments

ldust_moments = .false.
if (lphantom_file) then
write(*,*) "Performing phantom2mcfost setup"
if (n_phantom_files==1) then
Expand All @@ -65,7 +65,7 @@ subroutine setup_SPH2mcfost(SPH_file,SPH_limits_file, n_SPH, extra_heating)

call read_phantom_files(iunit,n_phantom_files,density_files, x,y,z,h,vx,vy,vz,T_gas, &
particle_id, massgas,massdust,rho,rhodust,extra_heating,ndusttypes, &
SPH_grainsizes,mask,n_SPH,ierr)
SPH_grainsizes,mask,n_SPH,ldust_moments,dust_moments,ierr)

if (lphantom_avg) then ! We are averaging the dump
factor = 1.0/n_phantom_files
Expand Down Expand Up @@ -106,7 +106,8 @@ subroutine setup_SPH2mcfost(SPH_file,SPH_limits_file, n_SPH, extra_heating)
! Voronoi tesselation
check_previous_tesselation = (.not. lrandomize_Voronoi)
call SPH_to_Voronoi(n_SPH, ndusttypes, particle_id, x,y,z,h, vx,vy,vz, &
T_gas, massgas,massdust,rho,rhodust,SPH_grainsizes, SPH_limits, check_previous_tesselation, is_ghost, mask=mask)
T_gas, massgas,massdust,rho,rhodust,SPH_grainsizes, SPH_limits, check_previous_tesselation, is_ghost, &
ldust_moments, dust_moments, mask=mask)

deallocate(x,y,z,h)
if (allocated(vx)) deallocate(vx,vy,vz)
Expand Down Expand Up @@ -157,7 +158,7 @@ end subroutine read_SPH_limits_file
!*********************************************************

subroutine SPH_to_Voronoi(n_SPH, ndusttypes, particle_id, x,y,z,h, vx,vy,vz, T_gas, massgas,massdust,rho,rhodust,&
SPH_grainsizes, SPH_limits, check_previous_tesselation, is_ghost, mask)
SPH_grainsizes, SPH_limits, check_previous_tesselation, is_ghost, ldust_moments, dust_moments, mask)

! ************************************************************************************ !
! n_sph : number of points in the input model
Expand All @@ -180,32 +181,38 @@ subroutine SPH_to_Voronoi(n_SPH, ndusttypes, particle_id, x,y,z,h, vx,vy,vz, T_g
use grains, only : n_grains_tot, M_grain
use disk_physics, only : compute_othin_sublimation_radius
use mem
use reconstruct_from_moments

integer, intent(in) :: n_SPH, ndusttypes
real(dp), dimension(n_SPH), intent(inout) :: x,y,z,h,massgas!,rho, !move rho to allocatable, assuming not always allocated
real(dp), dimension(:), allocatable, intent(inout) :: rho
real(dp), dimension(:), allocatable, intent(inout) :: vx,vy,vz ! dimension n_SPH or 0
real(dp), dimension(:), allocatable, intent(in) :: T_gas
integer, dimension(n_SPH), intent(in) :: particle_id
real(dp), dimension(:,:), allocatable, intent(inout) :: rhodust, massdust ! ndusttypes,n_SPH
real(dp), dimension(:,:), allocatable, intent(inout) :: rhodust, massdust, dust_moments ! ndusttypes,n_SPH
real(dp), dimension(:), allocatable, intent(in) :: SPH_grainsizes ! ndusttypes
real(dp), dimension(6), intent(in) :: SPH_limits
logical, intent(in) :: check_previous_tesselation
logical, dimension(:), allocatable, intent(in), optional :: mask
logical, intent(in) :: ldust_moments

integer, dimension(:), allocatable, intent(out) :: is_ghost


logical :: lwrite_ASCII = .false. ! produce an ASCII file for yorick

real, allocatable, dimension(:) :: a_SPH, log_a_SPH, rho_dust
real(dp), allocatable, dimension(:) :: gsize, grainsize_f
real(dp), dimension(4) :: lambsol, lambguess

real(dp) :: mass, somme, Mtot, Mtot_dust, facteur
real :: f, limit_threshold, density_factor
integer :: icell, l, k, iSPH, n_force_empty, i, id_n
integer :: icell, l, k, iSPH, n_force_empty, i, id_n, ierr

real(dp), dimension(6) :: limits

real(dp), parameter :: a0 = 1.28e-4 ! microns. Siess et al 2022

if (lcorrect_density_elongated_cells) then
density_factor = correct_density_factor_elongated_cells
else
Expand Down Expand Up @@ -355,7 +362,32 @@ subroutine SPH_to_Voronoi(n_SPH, ndusttypes, particle_id, x,y,z,h, vx,vy,vz, T_g

! Tableau de densite et masse de poussiere
! interpolation en taille
if (ndusttypes >= 1) then
if (ldust_moments) then
lvariable_dust = .true.
allocate(grainsize_f(n_grains_tot))
gsize(:) = r_grain(:)/a0 ! grain sizes, units should be ok

do icell=1,n_cells
iSPH = Voronoi(icell)%id
if (iSPH > 0) then

write(*,*) i, iSPH
! mass & density indices are shifted by 1
lambguess = [-log(sqrt(2*pi)) * dust_moments(1,iSPH) ,0._dp,0._dp,0._dp]

call reconstruct_maxent(dust_moments(:,iSPH),gsize,grainsize_f,lambsol,ierr,lambguess=lambguess)
if (ierr > 0) then
write(*,*) iSPH, dust_moments(:,iSPH)
call error("reconstruct_maxent: "//fsolve_error(ierr))
endif

densite_pouss(:,icell) = grainsize_f(:)
else ! iSPH == 0, star
densite_pouss(:,icell) = 0.
endif
enddo ! icell

elseif (ndusttypes >= 1) then
lvariable_dust = .true.

! mcfost adds an extra grain size follwing the gas
Expand Down Expand Up @@ -931,7 +963,7 @@ subroutine test_voro_star(x,y,z,h,vx,vy,vz,T_gas,massgas,rhogas,rhodust,particle
stream(i) = init_sprng(gtype, i-1,nb_proc,seed,SPRNG_DEFAULT)
enddo

lignore_dust = .true.
lignore_dust = .true.
ndusttypes = 0
llimits_file = .false.
limits_file = ""
Expand Down
Loading

0 comments on commit b3edb51

Please sign in to comment.