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:         A = 1.0_dp + (1.097_dp+0.777_dp*T_Ry)/(1.0+0.536_dp*T_Ry)*f**0.617_dp*(1.0_dp-f)**0.77_dp
      end function A
  end function Rosseland_kappa
  >>>>>>> nworbde/master
  
  end module eval_conductivity
  
negative.code:             kappa% eQ = -1.0
          end if
      end if
      kappa% electron_total = kappa_pre/nu
      if (K_components(icond_sf) .and. ionic% Yn > 0.0) then
          nn = rho*ionic% Yn/(1.0-chi)/Mneutron / density_n
          nion = (1.0-ionic%Yn)*rho/Mneutron/ionic% A /density_n
          kappa% sf =  sPh(nn,nion,T,ionic)
      end if
      if (K_components(icond_kap)) then
          kappa% kap = Rosseland_kappa(rho,T,mu_e,ionic)
          K_opacity = 4.0*onethird*arad*clight*T**3/rho/kappa% kap
      end if
      kappa% total = kappa% sf + K_opacity
      if (nu > 0.0) kappa% total = kappa% total + kappa_pre/nu
   
       ! neutrons
      nu_n = 0.0  
      nu_c = 0.0
      kappa_n_pre = 0.0
      
      if (ionic% Yn > 0.0) then
      nn = rho/amu*ionic% Yn/(1.0-chi)
      kFn = (threepisquare*nn)**onethird
      nion = rho/amu*(1.0-ionic%Yn)/ionic%A   
      mnstar = Mneutron
      kappa_n_pre = onethird*pi**2*boltzmann**2*T*nn/mnstar    
  
  	call sf_get_results(0.0_dp,kfn/cm_to_fm,Tc)
    	! Now set the superfluid reduction factor
  	Tns = Tc(neutron_1S0)
  	if (T < Tns) then
  		tau = T/Tns
  		v = sqrt(1.0-tau)*(1.456-0.157/sqrt(tau) + 1.764/tau)
  		R = (0.4186+sqrt(1.007**2+(0.5010*v)**2))**2.5 * exp(1.456-sqrt(1.456**2+v**2))
  		if (R < 1.0E-10) then
  		R = 0.0
  		end if
  	else
  		R = 1.0
  	end if
  
  	if (K_components(icond_nQ)) then
      	nu_c = n_imp(nn,nion,T,ionic,ierr)
      	kappa% nQ = kappa_n_pre/nu_c*R
          nu_n = nu_n + nu_c
      end if    
   	if (K_components(icond_np)) then
          nu_c = n_phonon(nn,nion,T,ionic, ierr)        
          kappa% np = kappa_n_pre/nu_c*R
          nu_n = nu_n + nu_c
     	end if   
  
  	kappa % neutron_total = kappa_n_pre/nu_n*R
  
     	end if	   
  
   	kappa % total = kappa% total + kappa % neutron_total
  
      contains
      subroutine clear_kappa()
          kappa% total = 0.0
          kappa% ee  = 0.0
          kappa% ei = 0.0
          kappa% eQ = 0.0
          kappa% sf = 0.0    
          kappa% kap = 0.0 
          kappa% nQ = 0.0
          kappa% np = 0.0
          kappa% electron_total = 0.0
          kappa% neutron_total = 0.0
      end subroutine clear_kappa
  end subroutine conductivity
  
  