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 Jul 14, 2020
1 parent 230fbd7 commit c376e4d
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 24 deletions.
12 changes: 6 additions & 6 deletions src/setup/density_profiles.f90
Original file line number Diff line number Diff line change
Expand Up @@ -523,22 +523,22 @@ subroutine write_softened_profile(outputpath, m, pres, temp, r, rho, ene, Xfrac,
if (present(Xfrac) .and. present(Yfrac)) then
if (present(csound)) then
write(1,'(a)') '[ Mass ] [ Pressure ] [Temperature] [ Radius ] &
&[ Density ] [ E_int ] [ Xfrac ] [ Yfrac ] [Sound speed]'
&[ Density ] [ E_int ] [ Xfrac ] [ Yfrac ] [Sound speed]'
write(1,101) (m(i),pres(i),temp(i),r(i),rho(i),ene(i),Xfrac(i),Yfrac(i),csound(i),i=1,size(r))
101 format (es13.7,2x,es13.7,2x,es13.7,2x,es13.7,2x,es13.7,2x,es13.7,2x,es13.7,&
101 format (es13.7,2x,es13.7,2x,es13.7,2x,es13.7,2x,es13.7,2x,es13.7,2x,es13.7,&
2x,es13.7,2x,es13.7)
else
write(1,'(a)') '[ Mass ] [ Pressure ] [Temperature] [ Radius ] &
&[ Density ] [ E_int ] [ Xfrac ] [ Yfrac ]'
&[ Density ] [ E_int ] [ Xfrac ] [ Yfrac ]'
write(1,102) (m(i),pres(i),temp(i),r(i),rho(i),ene(i),Xfrac(i),Yfrac(i),i=1,size(r))
102 format (es13.7,2x,es13.7,2x,es13.7,2x,es13.7,2x,es13.7,2x,es13.7,2x,es13.7,&
102 format (es13.7,2x,es13.7,2x,es13.7,2x,es13.7,2x,es13.7,2x,es13.7,2x,es13.7,&
2x,es13.7)
endif
else
write(1,'(a)') '[ Mass ] [ Pressure ] [Temperature] [ Radius ] &
&[ Density ] [ E_int ]'
&[ Density ] [ E_int ]'
write(1,103) (m(i),pres(i),temp(i),r(i),rho(i),ene(i),i=1,size(r))
103 format (es13.7,2x,es13.7,2x,es13.7,2x,es13.7,2x,es13.7,2x,es13.7)
103 format (es13.7,2x,es13.7,2x,es13.7,2x,es13.7,2x,es13.7,2x,es13.7)
endif

close(1, status = 'keep')
Expand Down
36 changes: 18 additions & 18 deletions src/utils/analysis_common_envelope.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1407,13 +1407,13 @@ subroutine gravitational_drag(time,num,npart,particlemass,xyzh,vxyzu)

write(*,"(a,i2)") 'Assumming ieos = ',ieos
if ( xyzmh_ptmass(ihacc,2) > 0 ) then
write(*,"(a,f13.7,a)") 'Companion has accretion radius = ', xyzmh_ptmass(ihacc,2), '(code units)'
write(*,"(a)") 'Will analyse accretion'
iacc = .true.
write(*,"(a,f13.7,a)") 'Companion has accretion radius = ', xyzmh_ptmass(ihacc,2), '(code units)'
write(*,"(a)") 'Will analyse accretion'
iacc = .true.
else
write(*,"(a)") 'Companion has no accretion radius. Will not analyse accretion.'
iacc = .false.
endif
write(*,"(a)") 'Companion has no accretion radius. Will not analyse accretion.'
iacc = .false.
endif

ncols = 22
allocate(columns(ncols))
Expand Down Expand Up @@ -1465,10 +1465,10 @@ subroutine gravitational_drag(time,num,npart,particlemass,xyzh,vxyzu)
call orbit_com(npart,xyzh,vxyzu,nptmass,xyzmh_ptmass,vxyz_ptmass,com_xyz,com_vxyz)
! Calculate z-angular momentum of the sink about the orbital CoM in first dump that is analysed
if (dump_number == 0) then
if (i == 1) then ! Ensures only allocated once throughout the analysis
allocate(ang_mom_old(nptmass))
allocate(time_old(nptmass))
endif
if (i == 1) then ! Ensures only allocated once throughout the analysis
allocate(ang_mom_old(nptmass))
allocate(time_old(nptmass))
endif
pos_wrt_CM = xyzmh_ptmass(1:3,i) - com_xyz(1:3)
vel_wrt_CM = vxyz_ptmass(1:3,i) - com_vxyz(1:3)
call cross(pos_wrt_CM, xyzmh_ptmass(4,i) * vel_wrt_CM, ang_mom)
Expand Down Expand Up @@ -1529,16 +1529,16 @@ subroutine gravitational_drag(time,num,npart,particlemass,xyzh,vxyzu)
!Rcut = Rcut * racc
Rcut = Rcut * separation( xyzmh_ptmass(1:3,1), xyzmh_ptmass(1:3,2) )
do j = 1,npart
if (.not. isdead_or_accreted(xyzh(4,j))) then
call get_accel_sink_gas(nptmass,xyzh(1,j),xyzh(2,j),xyzh(3,j),xyzh(4,j),xyzmh_ptmass,&
if (.not. isdead_or_accreted(xyzh(4,j))) then
call get_accel_sink_gas(nptmass,xyzh(1,j),xyzh(2,j),xyzh(3,j),xyzh(4,j),xyzmh_ptmass,&
fxi,fyi,fzi,phii,particlemass,fxyz_ptmass,fonrmax)
do k = 1,sizeRcut
if ( separation( xyzh(1:3,j),xyzmh_ptmass(1:4,i)) < Rcut(k) ) then
call get_accel_sink_gas(nptmass,xyzh(1,j),xyzh(2,j),xyzh(3,j),xyzh(4,j),xyzmh_ptmass,&
do k = 1,sizeRcut
if ( separation( xyzh(1:3,j),xyzmh_ptmass(1:4,i)) < Rcut(k) ) then
call get_accel_sink_gas(nptmass,xyzh(1,j),xyzh(2,j),xyzh(3,j),xyzh(4,j),xyzmh_ptmass,&
fxi,fyi,fzi,phii,particlemass,force_cut_vec(1:4,:,k),fonrmax)
endif
enddo
endif
endif
enddo
endif
enddo
call cross(unit_vel, (/ 0., 0., 1. /), unit_vel_perp)

Expand Down

0 comments on commit c376e4d

Please sign in to comment.