Add files via upload

Added some vA/c factors in wave energy calculation.

Author: danielver02

src/NHDS.f90

@@ -65,7 +65,7 @@ program NHDS
   call calc_xi(xi,1,pol,polz,x,kz,kperp)	! second parameter is index of species 
   call calc_fluctRj(deltaRj,dUperpx,dUperpy,dUpar,1,pol,polz,x,kz,kperp) ! fifth parameter is index of species 
 
-  write (*,*)  kz,real(x),aimag(x),real(pol),aimag(pol),real(polz),aimag(polz)!,energy,quality
+  write (*,*)  kz,real(x),aimag(x),real(pol),aimag(pol),real(polz),aimag(polz),energy,quality
   write (10,*) kz,real(x),aimag(x),real(pol),aimag(pol),real(polz),aimag(polz),energy,quality
 
 ! if (i.EQ.10) call write_delta_f(1,kz,x,pol,polz) ! first parameter is index of species   

src/waveenergy.f90

@@ -120,7 +120,7 @@ subroutine waveenergy(energy,x,kz,kperp,gamma_contribution)
 	energy=energy+1.d0*real(Bk(i))**2+aimag(Bk(i))**2
 enddo
 
-energy=energy/(16.d0*M_PI)
+energy=energy/(16.d0*M_PI*vAc*vAc)
 
 
 ! Determine the contribution to gamma from all species (see Eq. (4) in Quataert (1998))
@@ -133,10 +133,6 @@ subroutine waveenergy(energy,x,kz,kperp,gamma_contribution)
 			gamma_contribution(j) = gamma_contribution(j)+ (real(Ek(k))-uniti*aimag(Ek(k)))*chi_a(j,k,i)*Ek(i)
 		enddo
 	enddo
-	gamma_contribution(j) = -xr*gamma_contribution(j) /(4.d0*energy*4.d0*M_PI)
+	gamma_contribution(j) = -xr*gamma_contribution(j) /(4.d0*vAc*vAc*energy*4.d0*M_PI)
 enddo
 end subroutine
-
-
-
-