Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(#463) bug fixes with particle mass setting in asteroidwind #478

Merged
merged 2 commits into from
Oct 23, 2023
Merged

(#463) bug fixes with particle mass setting in asteroidwind #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbc5a74
(#463) bug fixes with particle mass setting in asteroidwind
danieljprice Oct 23, 2023
9989ffa
(asteroidwind) delete unused scaling_set variable
danieljprice Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/main/inject_asteroidwind.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ module inject
real :: npartperorbit = 1000. ! particle injection rate in particles per orbit
real :: vlag = 0.0 ! percentage lag in velocity of wind
integer :: mdot_type = 2 ! injection rate (0=const, 1=cos(t), 2=r^(-2))
logical,save :: scaling_set ! has the scaling been set (initially false)

contains
!-----------------------------------------------------------------------
Expand All @@ -47,7 +46,6 @@ module inject
subroutine init_inject(ierr)
integer, intent(inout) :: ierr

scaling_set = .false.
ierr = 0

end subroutine init_inject
Expand Down Expand Up @@ -225,8 +223,8 @@ subroutine read_options_inject(name,valstring,imatch,igotall,ierr)
end subroutine read_options_inject

subroutine set_default_options_inject(flag)

integer, optional, intent(in) :: flag

end subroutine set_default_options_inject

end module inject
17 changes: 9 additions & 8 deletions src/setup/setup_asteroidwind.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ module setup
! :Dependencies: eos, extern_lensethirring, externalforces, infile_utils,
! io, options, part, physcon, setbinary, spherical, timestep, units
!
use inject, only:mdot
implicit none
public :: setpart

Expand All @@ -44,7 +45,7 @@ subroutine setpart(id,npart,npartoftype,xyzh,massoftype,vxyzu,polyk,gamma,hfact,
use part, only:nptmass,xyzmh_ptmass,vxyz_ptmass,ihacc,ihsoft,idust,set_particle_type,igas
use setbinary, only:set_binary,get_a_from_period
use spherical, only:set_sphere
use units, only:set_units,umass,udist,unit_velocity
use units, only:set_units,umass,udist,utime,unit_velocity
use physcon, only:solarm,au,pi,solarr,ceresm,km,kboltz,mass_proton_cgs
use externalforces, only:iext_binary, iext_einsteinprec, update_externalforce, &
mass1,accradius1
Expand All @@ -54,6 +55,7 @@ subroutine setpart(id,npart,npartoftype,xyzh,massoftype,vxyzu,polyk,gamma,hfact,
use eos, only:gmw
use options, only:iexternalforce
use extern_lensethirring, only:blackhole_spin
use kernel, only:hfact_default
integer, intent(in) :: id
integer, intent(inout) :: npart
integer, intent(out) :: npartoftype(:)
Expand All @@ -80,7 +82,7 @@ subroutine setpart(id,npart,npartoftype,xyzh,massoftype,vxyzu,polyk,gamma,hfact,
rasteroid = 2338.3 ! (km)
gastemp = 5000. ! (K)
norbits = 1000.
!mdot = 5.e8 ! Mass injection rate (g/s)
mdot = 5.e8 ! Mass injection rate (g/s)
npart_at_end = 1.0e6 ! Number of particles after norbits
dumpsperorbit = 1

Expand Down Expand Up @@ -175,10 +177,9 @@ subroutine setpart(id,npart,npartoftype,xyzh,massoftype,vxyzu,polyk,gamma,hfact,
xyzmh_ptmass(ihsoft,1) = rasteroid ! asteroid radius softening
endif

! both of these are reset in the first call to inject_particles
!massoftype(igas) = tmax*mdot/(umass/utime)/npart_at_end
massoftype(igas) = 1.e-12
hfact = 1.2
! we use the estimated injection rate and the final time to set the particle mass
massoftype(igas) = tmax*mdot/(umass/utime)/npart_at_end
hfact = hfact_default
!call inject_particles(time,0.,xyzh,vxyzu,xyzmh_ptmass,vxyz_ptmass,npart,npartoftype,dtinj)

!
Expand Down Expand Up @@ -215,7 +216,7 @@ subroutine write_setupfile(filename)
call write_inopt(norbits, 'norbits', 'number of orbits', iunit)
call write_inopt(dumpsperorbit,'dumpsperorbit','number of dumps per orbit', iunit)
call write_inopt(npart_at_end,'npart_at_end','number of particles injected after norbits',iunit)
!call write_inopt(mdot,'mdot','mass injection rate (g/s)',iunit)
call write_inopt(mdot,'mdot','mass injection rate (g/s)',iunit)
close(iunit)

end subroutine write_setupfile
Expand Down Expand Up @@ -244,7 +245,7 @@ subroutine read_setupfile(filename,ierr)
call read_inopt(norbits, 'norbits', db,min=0.,errcount=nerr)
call read_inopt(dumpsperorbit,'dumpsperorbit',db,min=0 ,errcount=nerr)
call read_inopt(npart_at_end, 'npart_at_end', db,min=0 ,errcount=nerr)
!call read_inopt(mdot, 'mdot', db,min=0.,errcount=nerr)
call read_inopt(mdot, 'mdot', db,min=0.,errcount=nerr)
call close_db(db)
if (nerr > 0) then
print "(1x,i2,a)",nerr,' error(s) during read of setup file: re-writing...'
Expand Down
Loading