Merge pull request danieljprice#344 from sahl95/master

Shortened "mcfost_uses_PdV_and_" to "mcfost_uses_PdV"

src/main/options.f90

@@ -47,7 +47,7 @@ module options
 
 ! mcfost
  logical, public :: use_mcfost, use_Voronoi_limits_file, use_mcfost_stellar_parameters, mcfost_computes_Lacc
- logical, public :: mcfost_uses_PdV_and_Lshock
+ logical, public :: mcfost_uses_PdV
  character(len=80), public :: Voronoi_limits_file
 
  ! radiation
@@ -143,7 +143,7 @@ subroutine set_default_options
  use_mcfost = .false.
  use_mcfost_stellar_parameters = .false.
  mcfost_computes_Lacc = .false.
- mcfost_uses_PdV_and_Lshock = .true.
+ mcfost_uses_PdV = .true.
 
  ! radiation
  if (do_radiation) then

src/main/readwrite_infile.F90

@@ -71,7 +71,7 @@ module readwrite_infile
                      icooling,psidecayfac,overcleanfac,hdivbbmax_max,alphamax,calc_erot,rhofinal_cgs, &
                      use_mcfost,use_Voronoi_limits_file,Voronoi_limits_file,use_mcfost_stellar_parameters,&
                      exchange_radiation_energy,limit_radiation_flux,iopacity_type,mcfost_computes_Lacc,&
-                     mcfost_uses_PdV_and_Lshock
+                     mcfost_uses_PdV
  use timestep,  only:dtwallmax,tolv,xtol,ptol
  use viscosity, only:irealvisc,shearparam,bulkvisc
  use part,      only:hfact,ien_type
@@ -236,7 +236,7 @@ subroutine write_infile(infile,logfile,evfile,dumpfile,iwritein,iprint)
       'Fix the stellar parameters to mcfost values or update using sink mass',iwritein)
  call write_inopt(mcfost_computes_Lacc,'mcfost_computes_Lacc',&
       'Should mcfost compute the accretion luminosity',iwritein)
- call write_inopt(mcfost_uses_PdV_and_Lshock,'mcfost_uses_PdV_and_Lshock',&
+ call write_inopt(mcfost_uses_PdV,'mcfost_uses_PdV',&
       'Should mcfost use the PdV work and shock heating?',iwritein)
 #endif
 
@@ -500,8 +500,8 @@ subroutine read_infile(infile,logfile,evfile,dumpfile)
        read(valstring,*,iostat=ierr) use_mcfost_stellar_parameters
     case('mcfost_computes_Lacc')
        read(valstring,*,iostat=ierr) mcfost_computes_Lacc
-    case('mcfost_uses_PdV_and_Lshock')
-       read(valstring,*,iostat=ierr) mcfost_uses_PdV_and_Lshock
+    case('mcfost_uses_PdV')
+       read(valstring,*,iostat=ierr) mcfost_uses_PdV
 #endif
     case('gas-rad_exchange')
        read(valstring,*,iostat=ierr) exchange_radiation_energy

src/utils/analysis_mcfost.f90

@@ -43,7 +43,7 @@ subroutine do_analysis(dumpfile,num,xyzh,vxyzu,particlemass,npart,time,iunit)
  use dim,            only:use_dust,lightcurve,maxdusttypes,use_dustgrowth,do_radiation
  use eos,            only:temperature_coef,gmw,gamma
  use options,        only:use_dustfrac,use_mcfost,use_Voronoi_limits_file,Voronoi_limits_file, &
-                             use_mcfost_stellar_parameters, mcfost_computes_Lacc, mcfost_uses_PdV_and_Lshock
+                             use_mcfost_stellar_parameters, mcfost_computes_Lacc, mcfost_uses_PdV
  use physcon,        only:cm,gram,c,steboltz
 
  character(len=*), intent(in)    :: dumpfile
@@ -96,7 +96,7 @@ subroutine do_analysis(dumpfile,num,xyzh,vxyzu,particlemass,npart,time,iunit)
     dustfluidtype = 2
  endif
 
- if (lightcurve .and. mcfost_uses_PdV_and_Lshock) then
+ if (lightcurve .and. mcfost_uses_PdV) then
     nlum = npart
  else
     nlum =  0