diff --git a/src/model_mod.F90 b/src/model_mod.F90 index 85e5672cf3ad102fb137cdfc32f65955233c997a..bd3ff52157f75d5aca8519beae4223cb86c544a3 100644 --- a/src/model_mod.F90 +++ b/src/model_mod.F90 @@ -51,10 +51,6 @@ CONTAINS q_e, q_i, eta_n, eta_T, eta_B, lambdaD READ(lu_in,model_par) - !WRITE(*,model_par) - - ! Collision Frequency Normalization ... to match fluid limit - nu = nu*0.532_dp !Precompute species dependant factors IF( q_e .NE. 0._dp ) THEN @@ -73,14 +69,15 @@ CONTAINS qi2_taui = (q_i**2)/tau_i sigmae2_taue_o2 = sigma_e**2 * tau_e/2._dp ! factor of the Kernel argument sigmai2_taui_o2 = sigma_i**2 * tau_i/2._dp - IF (CO .GT. 1) THEN ! If using COSOlver mat, remove sqrt(2) factor (already contained) - nu_e = nu ! electron-ion collision frequency (where already multiplied by 0.532) + !! We must change the normalization of the collisionality according to the collision model + IF (ABS(CO) .GT. 1) THEN ! If using COSOlver mat (2 Sugama, 3 Coulomb) + nu_e = 0.532_dp*nu/sigma_e * (tau_e)**(3._dp/2._dp) ! electron-ion collision frequency (where already multiplied by 0.532) + nu_i = 0.532_dp*nu ! ion-ion collision frequ. nu_ee = nu_e ! e-e coll. frequ. - nu_i = nu * sigma_e * (tau_i)**(-3._dp/2._dp) ! ion-ion collision frequ. nu_ie = nu_i ! i-e coll. frequ. - ELSE - nu_e = nu ! electron-ion collision frequency (where already multiplied by 0.532) - nu_i = nu * sigma_e * (tau_i)**(-3._dp/2._dp)/SQRT2 ! ion-ion collision frequ. + ELSE ! If we use an ad hoc collision operator as Dougherty or Lenhard-Bernstein + nu_e = 0.532_dp*nu ! electron-ion collision frequency + nu_i = 0.532_dp*nu * sigma_e * (tau_i)**(-3._dp/2._dp)/SQRT2 ! ion-ion collision frequ. nu_ee = nu_e/SQRT2 ! e-e coll. frequ. nu_ie = nu*sigma_e**2 ! i-e coll. frequ. ENDIF