From 0d9918730e27cca43f753ca373f58dfa80f896a4 Mon Sep 17 00:00:00 2001 From: Antoine Cyril David Hoffmann <ahoffman@spcpc606.epfl.ch> Date: Tue, 3 Aug 2021 16:28:25 +0200 Subject: [PATCH] correction of axis equivalences --- src/moments_eq_rhs.F90 | 4 ++-- src/numerics_mod.F90 | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/moments_eq_rhs.F90 b/src/moments_eq_rhs.F90 index 58ccf7ff..1914e385 100644 --- a/src/moments_eq_rhs.F90 +++ b/src/moments_eq_rhs.F90 @@ -116,7 +116,7 @@ SUBROUTINE moments_eq_rhs_e - imagu*Ckxky(ikx,iky,iz) * (Tnepj + Tnepp2j + Tnepm2j + Tnepjp1 + Tnepjm1)& - Tpare/2._dp/deltaz*gradz_coeff(iz) & - gradzB(iz)* Tmir *gradz_coeff(iz) & - + i_ky * Tphi & + - i_ky * Tphi & - mu*kperp2**2 * moments_e(ip,ij,ikx,iky,iz,updatetlevel) & + TColl @@ -255,7 +255,7 @@ SUBROUTINE moments_eq_rhs_i - imagu*Ckxky(ikx,iky,iz) * (Tnipj + Tnipp2j + Tnipm2j + Tnipjp1 + Tnipjm1)& - Tpari/2._dp/deltaz*gradz_coeff(iz) & - gradzB(iz)* Tmir *gradz_coeff(iz) & - + i_ky * Tphi & + - i_ky * Tphi & - mu*kperp2**2 * moments_i(ip,ij,ikx,iky,iz,updatetlevel) & + TColl diff --git a/src/numerics_mod.F90 b/src/numerics_mod.F90 index b215be7b..1289550f 100644 --- a/src/numerics_mod.F90 +++ b/src/numerics_mod.F90 @@ -174,12 +174,12 @@ SUBROUTINE compute_lin_coeff j_dp = REAL(j_int,dp) ! REAL of Laguerre degree xnepj(ip,ij) = taue_qe * 2._dp * (p_dp + j_dp + 1._dp) ynepp1j (ip,ij) = -SQRT(tau_e)/sigma_e * (j_dp+1)*SQRT(p_dp+1._dp) - ynepp1jm1(ip,ij) = +SQRT(tau_e)/sigma_e * j_dp*SQRT(p_dp+1._dp) ynepm1j (ip,ij) = -SQRT(tau_e)/sigma_e * (j_dp+1)*SQRT(p_dp) + ynepp1jm1(ip,ij) = +SQRT(tau_e)/sigma_e * j_dp*SQRT(p_dp+1._dp) ynepm1jm1(ip,ij) = +SQRT(tau_e)/sigma_e * j_dp*SQRT(p_dp) - zNepm1j (ip,ij) = -SQRT(tau_e)/sigma_e * (2._dp*j_dp+1_dp)*SQRT(2._dp*p_dp) - zNepm1jp1(ip,ij) = +SQRT(tau_e)/sigma_e * (j_dp+1_dp)*SQRT(2._dp*p_dp) - zNepm1jm1(ip,ij) = +SQRT(tau_e)/sigma_e * j_dp*SQRT(2._dp*p_dp) + zNepm1j (ip,ij) = -SQRT(tau_e)/sigma_e * (2._dp*j_dp+1_dp)*SQRT(p_dp) + zNepm1jp1(ip,ij) = +SQRT(tau_e)/sigma_e * (j_dp+1_dp)*SQRT(p_dp) + zNepm1jm1(ip,ij) = +SQRT(tau_e)/sigma_e * j_dp*SQRT(p_dp) ENDDO ENDDO DO ip = ips_e, ipe_e @@ -206,12 +206,12 @@ SUBROUTINE compute_lin_coeff j_dp = REAL(j_int,dp) ! REAL of Laguerre degree xnipj(ip,ij) = taui_qi * 2._dp * (p_dp + j_dp + 1._dp) ynipp1j (ip,ij) = -SQRT(tau_i)/sigma_i * (j_dp+1)*SQRT(p_dp+1._dp) - ynipp1jm1(ip,ij) = +SQRT(tau_i)/sigma_i * j_dp*SQRT(p_dp+1._dp) ynipm1j (ip,ij) = -SQRT(tau_i)/sigma_i * (j_dp+1)*SQRT(p_dp) + ynipp1jm1(ip,ij) = +SQRT(tau_i)/sigma_i * j_dp*SQRT(p_dp+1._dp) ynipm1jm1(ip,ij) = +SQRT(tau_i)/sigma_i * j_dp*SQRT(p_dp) - zNipm1j (ip,ij) = -SQRT(tau_i)/sigma_i * (2._dp*j_dp+1_dp)*SQRT(2._dp*p_dp) - zNipm1jp1(ip,ij) = +SQRT(tau_i)/sigma_i * (j_dp+1_dp)*SQRT(2._dp*p_dp) - zNipm1jm1(ip,ij) = +SQRT(tau_i)/sigma_i * j_dp*SQRT(2._dp*p_dp) + zNipm1j (ip,ij) = -SQRT(tau_i)/sigma_i * (2._dp*j_dp+1_dp)*SQRT(p_dp) + zNipm1jp1(ip,ij) = +SQRT(tau_i)/sigma_i * (j_dp+1_dp)*SQRT(p_dp) + zNipm1jm1(ip,ij) = +SQRT(tau_i)/sigma_i * j_dp*SQRT(p_dp) ENDDO ENDDO DO ip = ips_i, ipe_i @@ -237,11 +237,11 @@ SUBROUTINE compute_lin_coeff j_dp = REAL(j_int,dp) ! REALof Laguerre degree !! Electrostatic potential pj terms IF (p_int .EQ. 0) THEN ! kronecker p0 - xphij(ip,ij) = eta_n + 2.*j_dp*eta_T + xphij(ip,ij) =+eta_n + 2.*j_dp*eta_T xphijp1(ip,ij) =-eta_T*(j_dp+1._dp) xphijm1(ip,ij) =-eta_T* j_dp ELSE IF (p_int .EQ. 2) THEN ! kronecker p2 - xphij(ip,ij) = eta_T/SQRT2 + xphij(ip,ij) =+eta_T/SQRT2 xphijp1(ip,ij) = 0._dp; xphijm1(ip,ij) = 0._dp; ELSE xphij(ip,ij) = 0._dp; xphijp1(ip,ij) = 0._dp -- GitLab