anchor.diff:      type(composition_info_type), intent(in) :: ionic
       type(conductivity_components), intent(out) :: kappa
       integer, intent(in) :: which_ee, which_eQ
  +    integer :: ierr
       logical, dimension(num_conductivity_channels), intent(in) :: K_components
  -<<<<<<< HEAD
  -    real(dp) :: nn,nion, nu, nu_c, kappa_pre, ne, kF, xF, eF, Gamma_e
  -    real(dp) :: nu_n, kappa_n_pre, kFn, xFn, eFn
  -=======
       real(dp) :: nn,nion, nu, nu_c, kappa_pre, ne, kF, xF, eF, Gamma_e, K_opacity
  ->>>>>>> nworbde/master
  +    real(dp) :: kappa_n_pre, nu_n, kfn, mnstar, tau, v, R, Tns
  +    real(dp) :: Tc(max_number_sf_types)
       
       ne = rho/amu*ionic%Ye
       kF = (threepisquare*ne)**onethird
  
positive.code:     sPh = onethird*Cv*vs*Lsph * K_n
  end function sPh
  
  <<<<<<< HEAD
  function n_imp(nn, nion, temperature, ionic) result(nu)
      ! neutron-impurity scattering, following S. Reddy's notes
      !
      use nucchem_def, only: composition_info_type
      use constants_def
      real(dp), intent(in) :: nn, nion, temperature
      type(composition_info_type), intent(in) :: ionic
      real(dp) :: ne		! number density of electrons
      real(dp) :: kFn 	! neutron Fermi wavevector 
      real(dp) :: EFn 	! neutron Fermi energy
      real(dp) :: nu		! neutron-impurity scattering frequency
      real(dp) :: V_0 	! effective neutron-impurity potential at V(R)
      real(dp) :: R_a		! radius of scattering center
      real(dp) :: Lambda_n_imp 	! Coulomb logarithm (Potekhin et al. 1999)
  	real(dp) :: fac, sf_frac, Tc
  
  	V_0 = 20.0*mev_to_ergs
  	R_a = 10.0*fm_to_cm
  	Tc = 1.0E8	
  	Lambda_n_imp = 1.0
      fac = 4.0/27.0/pi/hbar**2/clight
      sf_frac = exp(sqrt(1.0-temperature/Tc))
     
      kFn = (3.0*pi*nn)**onethird
      EFn = hbar*clight*kFn
      ne = ionic%Z*nion 
      nu = fac*EFn*(ne/nn)*(V_0*R_a)**2*Lambda_n_imp*ionic%Q/(ionic%Z)**3
  end function n_imp
  
  function n_phonon(nn, nion, temperature, ionic) result(nu)
      ! neutron-phonon scattering, following S. Reddy's notes
      !
      use nucchem_def, only: composition_info_type
      use constants_def
      real(dp), intent(in) :: nn, nion, temperature
      type(composition_info_type), intent(in) :: ionic
      real(dp) :: ne		! electron number density
      real(dp) :: kFn 	! neutron Fermi wavevector 
      real(dp) :: EFn 	! neutron Fermi energy
      real(dp) :: nu		! neutron-impurity scattering frequency
      real(dp) :: V_0 	! effective neutron-impurity potential at V(R)
      real(dp) :: R_a		! radius of scattering center
      real(dp) :: Lambda_n_phonon 	! Coulomb logarithm (Potekhin et al. 1999)
  	real(dp) :: fac, sf_frac, Tc
  
  	V_0 = 20.0*mev_to_ergs
  	R_a = 10.0*fm_to_cm
  	Tc = 1.0E8
  	Lambda_n_phonon = 1.0
      fac = 4.0/27.0/pi/hbar**2/clight
      ! suppression near critical temperature
      sf_frac = exp(sqrt(1.0-temperature/Tc))
     
      kFn = (3.0*pi*nn)**onethird
      EFn = hbar*clight*kFn
      ne = ionic%Z*nion 
      nu = fac*EFn*(nion/nn)*(V_0*R_a)**2*Lambda_n_phonon
  end function n_phonon
  =======
  function electron_scattering(eta_e,theta,Ye) result(kTh)
      use constants_def
      real(dp), intent(in) :: eta_e   ! electron chemical pot./kT
  
negative.code:     eF = sqrt(1.0+xF**2)
      Gamma_e = Gamma/ionic%Z53
      kappa_pre = onethird*pi**2*boltzmann**2*T*ne/Melectron/eF
      
      call clear_kappa
      nu_c = 0.0
      nu = 0.0
  