Skip to content

Commit

Permalink
[indent-bot] standardised indentation
Browse files Browse the repository at this point in the history
  • Loading branch information
danieljprice committed Apr 8, 2024
1 parent 4c04aa7 commit 8780feb
Show file tree
Hide file tree
Showing 7 changed files with 335 additions and 335 deletions.
4 changes: 2 additions & 2 deletions src/main/deriv.F90
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,8 @@ subroutine derivs(icall,npart,nactive,xyzh,vxyzu,fxyzu,fext,divcurlv,divcurlB,&

if (use_dustgrowth) then ! compute growth rate of dust particles
call get_growth_rate(npart,xyzh,vxyzu,dustgasprop,VrelVf,dustprop,filfac,ddustprop(1,:))!--we only get dm/dt (i.e 1st dimension of ddustprop)
! compute growth rate and probability of sticking/bouncing of porous dust
if (use_porosity) call get_probastick(npart,xyzh,ddustprop(1,:),dustprop,dustgasprop,filfac)
! compute growth rate and probability of sticking/bouncing of porous dust
if (use_porosity) call get_probastick(npart,xyzh,ddustprop(1,:),dustprop,dustgasprop,filfac)
endif

!
Expand Down
18 changes: 9 additions & 9 deletions src/main/growth.F90
Original file line number Diff line number Diff line change
Expand Up @@ -595,15 +595,15 @@ subroutine check_dustprop(npart,dustprop,filfac,mprev,filfacprev)
sdust = get_size(dustprop(1,i),dustprop(2,i),filfac(i))
tsnew = dustgasprop(3,i)*sdustprev*filfacprev(i)/sdust/filfac(i)/Omega_k(i)
if (tsnew < tsmin) then
sdustmin = tsmin*sdustprev*filfacprev(i)*Omega_k(i)/filfac(i)/dustgasprop(3,i)
dustprop(1,i) = dustprop(1,i) * (sdustmin/sdust)**3.
sdustmin = tsmin*sdustprev*filfacprev(i)*Omega_k(i)/filfac(i)/dustgasprop(3,i)
dustprop(1,i) = dustprop(1,i) * (sdustmin/sdust)**3.
endif
else
sdust = get_size(dustprop(1,i),dustprop(2,i))
if (sdust < grainsizemin) then
dustprop(1,i) = dustprop(1,i) * (grainsizemin/sdust)**3. ! fragmentation at constant density and filling factor
endif
endif
endif
endif
enddo
!$omp end parallel do
Expand Down Expand Up @@ -699,12 +699,12 @@ subroutine bin_to_multi(bins_per_dex,force_smax,smax_user,verbose)
itype = iamtype(iphase(i))
if (itype==idust) then
if (use_porosity) then
dustpropmcfost(1,i) = get_size(dustprop(1,i),dustprop(2,i),filfac(i))
dustpropmcfost(2,i) = filfac(i)
else
dustpropmcfost(1,i) = get_size(dustprop(1,i),dustprop(2,i))
dustpropmcfost(2,i) = 1
endif
dustpropmcfost(1,i) = get_size(dustprop(1,i),dustprop(2,i),filfac(i))
dustpropmcfost(2,i) = filfac(i)
else
dustpropmcfost(1,i) = get_size(dustprop(1,i),dustprop(2,i))
dustpropmcfost(2,i) = 1
endif
if (dustpropmcfost(1,i) < smintmp) smintmp = dustpropmcfost(1,i)
if (dustpropmcfost(1,i) > smaxtmp) smaxtmp = dustpropmcfost(1,i)
!if (dustpropmcfost(2,i) < fmintmp) fmintmp = dustpropmcfost(2,i)
Expand Down
2 changes: 1 addition & 1 deletion src/main/part.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1768,7 +1768,7 @@ subroutine delete_particles_outside_sphere(center,radius,np,revert,mytype)
else
if (dot_product(r,r) > radius_squared) call kill_particle(i,npartoftype)
endif
enddo
enddo
endif
call shuffle_part(np)
if (np /= sum(npartoftype)) call fatal('del_part_outside_sphere','particles not conserved')
Expand Down
632 changes: 316 additions & 316 deletions src/main/porosity.f90

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/main/step_leapfrog.F90
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ subroutine step(npart,nactive,t,dtsph,dtextforce,dtnew)
call get_filfac(npart,xyzh,mprev,filfac,dustprop,dtsph)
endif
call check_dustprop(npart,dustprop,filfac,mprev,filfacprev)
endif
endif

if (gr) then
call check_velocity_error(errmax,p2mean,np,its,tolv,dtsph,timei,idamp,dterr,errmaxmean,converged)
Expand Down
4 changes: 2 additions & 2 deletions src/utils/moddump_dustadd.f90
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ subroutine modify_dump(npart,npartoftype,massoftype,xyzh,vxyzu)
call prompt('Enter H/R at R_ref',H_R_ref,0.)
call prompt('Enter q index',q_index)
else
call prompt('Enter initial grain size in cm',grainsizecgs,0.)
call prompt('Enter initial grain size in cm',grainsizecgs,0.)
endif
else
call prompt('Enter grain size in cm',grainsizecgs,0.)
Expand Down Expand Up @@ -192,7 +192,7 @@ subroutine modify_dump(npart,npartoftype,massoftype,xyzh,vxyzu)
enddo
endif
if (use_dustgrowth) then
call set_dustprop(npart,xyzh,sizedistrib,pwl_sizedistrib,R_ref,H_R_ref,q_index)
call set_dustprop(npart,xyzh,sizedistrib,pwl_sizedistrib,R_ref,H_R_ref,q_index)
endif
endif
!Delete particles if necessary
Expand Down
8 changes: 4 additions & 4 deletions src/utils/struct_part.f90
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,10 @@ subroutine get_structure_fn(sf,nbins,norder,distmin,distmax,xbins,ncount,npart,x
!$omp reduction(+:sf)
do ipt=1,npts
!$ if (.false.) then
if (mod(ipt,100)==0) then
call cpu_time(tcpu2)
print*,' ipt = ',ipt,tcpu2-tcpu1
endif
if (mod(ipt,100)==0) then
call cpu_time(tcpu2)
print*,' ipt = ',ipt,tcpu2-tcpu1
endif
!$ endif
i = list(ipt)
xpt(1) = xyz(1,i)
Expand Down

0 comments on commit 8780feb

Please sign in to comment.