From 6423293ddae210995a0a31bacdbcd9db27b8bd4a Mon Sep 17 00:00:00 2001
From: Antoine Hoffmann <antoine.hoffmann@epfl.ch>
Date: Fri, 4 Nov 2022 15:46:32 +0100
Subject: [PATCH] Code cleaning for every warning triggered by the gfortran
compiler
---
Makefile | 5 +++--
src/advance_field.F90 | 1 -
src/auxval.F90 | 4 ++--
src/collision_mod.F90 | 14 +++++---------
src/diagnose.F90 | 9 ++-------
src/geometry_mod.F90 | 1 -
src/grid_mod.F90 | 8 +++-----
src/inital.F90 | 8 ++------
src/miller_mod.F90 | 11 +++++------
src/moments_eq_rhs_mod.F90 | 4 ++--
src/numerics_mod.F90 | 11 ++++-------
src/ppinit.F90 | 6 ++----
src/processing_mod.F90 | 21 ++++++++++-----------
src/solve_EM_fields.F90 | 9 +++------
14 files changed, 43 insertions(+), 69 deletions(-)
diff --git a/Makefile b/Makefile
index 9a0ccb3b..6d06e56e 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,8 @@ EXEC = $(BINDIR)/gyacomo
EFST = $(BINDIR)/gyacomo_fst
EDBG = $(BINDIR)/gyacomo_dbg
-F90 = mpiifort
+# F90 = mpiifort
+F90 = mpif90
# #F90 = ftn #for piz-daint cluster
# # Add Multiple-Precision Library
# EXTLIBS += -L$(FMDIR)/lib
@@ -26,7 +27,7 @@ fast: F90FLAGS = -fast
fast: $(EFST)
dbg: dirs src/srcinfo.h
-dbg: F90FLAGS = -g -traceback -CB
+dbg: F90FLAGS = -g -traceback -CB -ftrapuv -warn all -debug all
dbg: $(EDBG)
install: dirs src/srcinfo.h $(EXEC) mvmod
diff --git a/src/advance_field.F90 b/src/advance_field.F90
index dcad3c44..5fd45d9f 100644
--- a/src/advance_field.F90
+++ b/src/advance_field.F90
@@ -58,7 +58,6 @@ CONTAINS
USE array
USE grid
use prec_const
- use initial_par, ONLY: ACT_ON_MODES
IMPLICIT NONE
COMPLEX(dp), DIMENSION ( ikys:ikye, ikxs:ikxe, izs:ize, ntimelevel ) :: f
diff --git a/src/auxval.F90 b/src/auxval.F90
index 586a9fa9..f9817aef 100644
--- a/src/auxval.F90
+++ b/src/auxval.F90
@@ -5,14 +5,14 @@ subroutine auxval
USE grid
USE array
USE model
- USE fourier, ONLY: init_grid_distr_and_plans, alloc_local_1, alloc_local_2
+ USE fourier, ONLY: init_grid_distr_and_plans
use prec_const
USE numerics
USE geometry
USE parallel, ONLY: init_parallel_var
IMPLICIT NONE
- INTEGER :: irows,irowe, irow, icol, i_
+ INTEGER :: i_
IF (my_id .EQ. 0) WRITE(*,*) '=== Set auxiliary values ==='
IF (LINEARITY .NE. 'linear') THEN
diff --git a/src/collision_mod.F90 b/src/collision_mod.F90
index edef40d9..251b4f84 100644
--- a/src/collision_mod.F90
+++ b/src/collision_mod.F90
@@ -162,7 +162,7 @@ CONTAINS
!******************************************************************************!
SUBROUTINE LenardBernstein_i(ip_,ij_,iky_,ikx_,iz_,TColl_)
USE fields, ONLY: moments_i
- USE grid, ONLY: parray_i, jarray_i, kxarray, kyarray
+ USE grid, ONLY: parray_i, jarray_i
USE basic
USE model, ONLY: sigmai2_taui_o2, nu_i
USE time_integration, ONLY : updatetlevel
@@ -230,7 +230,6 @@ CONTAINS
IMPLICIT NONE
INTEGER, INTENT(IN) :: ip_,ij_,iky_,ikx_,iz_
COMPLEX(dp), INTENT(OUT) :: TColl_
- COMPLEX(dp) :: upar, Tpar, Tperp
REAL(dp) :: j_dp, p_dp
!** Auxiliary variables **
p_dp = REAL(parray_e(ip_),dp)
@@ -255,7 +254,6 @@ CONTAINS
IMPLICIT NONE
INTEGER, INTENT(IN) :: ip_,ij_,iky_,ikx_,iz_
COMPLEX(dp), INTENT(OUT) :: TColl_
- COMPLEX(dp) :: upar, Tpar, Tperp
REAL(dp) :: j_dp, p_dp
!** Auxiliary variables **
p_dp = REAL(parray_i(ip_),dp)
@@ -478,12 +476,11 @@ CONTAINS
!******************************************************************************!
SUBROUTINE compute_cosolver_coll
IMPLICIT NONE
- COMPLEX(dp), DIMENSION(1:total_np_e) :: local_sum_e, buffer_e, total_sum_e
+ COMPLEX(dp), DIMENSION(1:total_np_e) :: local_sum_e, buffer_e
COMPLEX(dp), DIMENSION(ips_e:ipe_e) :: TColl_distr_e
- COMPLEX(dp), DIMENSION(1:total_np_i) :: local_sum_i, buffer_i, total_sum_i
+ COMPLEX(dp), DIMENSION(1:total_np_i) :: local_sum_i, buffer_i
COMPLEX(dp), DIMENSION(ips_i:ipe_i) :: TColl_distr_i
COMPLEX(dp) :: TColl
- INTEGER :: ikxs_C, ikxe_C, ikys_C, ikye_C
DO iz = izs,ize
DO ikx = ikxs,ikxe
DO iky = ikys,ikye
@@ -652,14 +649,13 @@ CONTAINS
REAL(dp), DIMENSION(:,:), ALLOCATABLE :: CiepjF_full ! .
REAL(dp), DIMENSION(:,:,:), ALLOCATABLE :: Ciipj__kp, CiepjT_kp ! .
REAL(dp), DIMENSION(:,:,:), ALLOCATABLE :: CiepjF_kp ! .
- INTEGER :: NFLR
REAL(dp), DIMENSION(:), ALLOCATABLE :: kp_grid_mat ! kperp grid of the matrices
INTEGER :: ikp_next, ikp_prev, nkp_mat, ikp_mat
REAL(dp) :: kp_max
- REAL(dp) :: kp_next, kp_prev, kperp_sim, kperp_mat, zerotoone, be_2, bi_2
+ REAL(dp) :: kperp_sim, kperp_mat, zerotoone
- CHARACTER(len=128) :: var_name, kperp_string, ikp_string
+ CHARACTER(len=128) :: var_name, ikp_string
!! Some terminal info
SELECT CASE (collision_model)
diff --git a/src/diagnose.F90 b/src/diagnose.F90
index 07632168..f1869e91 100644
--- a/src/diagnose.F90
+++ b/src/diagnose.F90
@@ -33,7 +33,7 @@ END SUBROUTINE diagnose
SUBROUTINE init_outfile(comm,file0,file,fid)
USE diagnostics_par, ONLY : write_doubleprecision, diag_par_outputinputs, input_fname
- USE basic, ONLY : my_id, jobnum, lu_in, basic_outputinputs
+ USE basic, ONLY : my_id, jobnum, basic_outputinputs
USE grid, ONLY : grid_outputinputs
USE geometry, ONLY : geometry_outputinputs
USE model, ONLY : model_outputinputs
@@ -47,7 +47,7 @@ SUBROUTINE init_outfile(comm,file0,file,fid)
CHARACTER(len=256), INTENT(IN) :: file0
CHARACTER(len=256), INTENT(OUT) :: file
INTEGER, INTENT(OUT) :: fid
- CHARACTER(len=256) :: str,fname
+ CHARACTER(len=256) :: str
INCLUDE 'srcinfo.h'
! Writing output filename
@@ -113,8 +113,6 @@ SUBROUTINE diagnose_full(kstep)
INTEGER, parameter :: BUFSIZE = 2
INTEGER :: rank = 0
INTEGER :: dims(1) = (/0/)
- INTEGER :: cp_counter = 0
- CHARACTER(len=256) :: str,test_
!____________________________________________________________________________
! 1. Initial diagnostics
@@ -402,8 +400,6 @@ SUBROUTINE diagnose_3d
IMPLICIT NONE
- INTEGER :: i_, root, world_rank, world_size
- CHARACTER(256) :: dset_name
CALL append(fidres, "/data/var3d/time", time,ionode=0)
CALL append(fidres, "/data/var3d/cstep", real(cstep,dp),ionode=0)
CALL getatt(fidres, "/data/var3d/", "frames",iframe3d)
@@ -528,7 +524,6 @@ SUBROUTINE diagnose_5d
USE prec_const
USE model, ONLY: KIN_E
IMPLICIT NONE
- CHARACTER(LEN=50) :: dset_name
CALL append(fidres, "/data/var5d/time", time,ionode=0)
CALL append(fidres, "/data/var5d/cstep", real(cstep,dp),ionode=0)
diff --git a/src/geometry_mod.F90 b/src/geometry_mod.F90
index 4c6d08c3..0acf2700 100644
--- a/src/geometry_mod.F90
+++ b/src/geometry_mod.F90
@@ -77,7 +77,6 @@ CONTAINS
implicit none
REAL(dp) :: kx,ky
COMPLEX(dp), DIMENSION(izs:ize) :: integrant
- INTEGER :: fid
real(dp) :: G1,G2,G3,Cx,Cy
! Allocate arrays
diff --git a/src/grid_mod.F90 b/src/grid_mod.F90
index 4f148d73..1e98b6c1 100644
--- a/src/grid_mod.F90
+++ b/src/grid_mod.F90
@@ -290,7 +290,7 @@ CONTAINS
USE prec_const
USE model, ONLY: LINEARITY, N_HD
IMPLICIT NONE
- INTEGER :: i_, in, istart, iend
+ INTEGER :: in, istart, iend
Nky = Ny/2+1 ! Defined only on positive kx since fields are real
! Grid spacings
IF (Ny .EQ. 1) THEN
@@ -369,7 +369,6 @@ CONTAINS
IMPLICIT NONE
REAL(dp), INTENT(IN) :: shear
REAL :: Lx_adapted
- INTEGER :: i_, counter
IF(shear .GT. 0) THEN
IF(my_id.EQ.0) write(*,*) 'Magnetic shear detected: set up sheared kx grid..'
! mininal size of box in x to respect dkx = 2pi shear dky
@@ -487,11 +486,10 @@ CONTAINS
SUBROUTINE set_zgrid
USE prec_const
- USE model, ONLY: mu_z, N_HD
+ USE model, ONLY: mu_z
IMPLICIT NONE
- INTEGER :: i_, fid
REAL :: grid_shift, Lz, zmax, zmin
- INTEGER :: ip, istart, iend, in
+ INTEGER :: istart, iend, in
total_nz = Nz
! Length of the flux tube (in ballooning angle)
Lz = 2_dp*pi*Npol
diff --git a/src/inital.F90 b/src/inital.F90
index 6d4fe5af..61298051 100644
--- a/src/inital.F90
+++ b/src/inital.F90
@@ -196,7 +196,6 @@ SUBROUTINE init_gyrodens
IMPLICIT NONE
REAL(dp) :: noise
- REAL(dp) :: kx, ky, sigma, gain, ky_shift
INTEGER, DIMENSION(12) :: iseedarr
! Seed random number generator
@@ -287,7 +286,6 @@ SUBROUTINE init_phi
IMPLICIT NONE
REAL(dp) :: noise
- REAL(dp) :: kx, ky, kp, sigma, gain, ky_shift
INTEGER, DIMENSION(12) :: iseedarr
! Seed random number generator
@@ -340,7 +338,7 @@ END SUBROUTINE init_phi
SUBROUTINE initialize_blob
USE fields
USE grid
- USE model, ONLY: sigmai2_taui_o2, KIN_E, LINEARITY
+ USE model, ONLY: KIN_E, LINEARITY
IMPLICIT NONE
REAL(dp) ::kx, ky, sigma, gain
sigma = 0.5_dp
@@ -396,9 +394,7 @@ SUBROUTINE init_ppj
IMPLICIT NONE
- REAL(dp) :: noise
- REAL(dp) :: kx, ky, sigma_z, amp, ky_shift, z
- INTEGER, DIMENSION(12) :: iseedarr
+ REAL(dp) :: kx, ky, sigma_z, amp, z
sigma_z = pi/4._dp
amp = 1.0_dp
diff --git a/src/miller_mod.F90 b/src/miller_mod.F90
index e7dcb354..86db1145 100644
--- a/src/miller_mod.F90
+++ b/src/miller_mod.F90
@@ -97,7 +97,6 @@ CONTAINS
gradz_coeff_
real(dp), dimension(ikys:ikye,ikxs:ikxe,izgs:izge,0:1), INTENT(INOUT) :: Ckxky_
! No parameter in gyacomo yet
- integer :: ikxgs =1 ! the left ghost gpdisc%pi1gl
real(dp) :: sign_Ip_CW=1 ! current sign (only normal current)
real(dp) :: sign_Bt_CW=1 ! current sign (only normal current)
!!!!!!!!!!!!!! END GYACOMO INTERFACE !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -112,8 +111,8 @@ CONTAINS
real(dp), dimension(500*(Npol+2)):: dtdtZcirc, dtdtZelong, dtdtZelongTilt, dtdtZtri, dtdtZtriTilt, dtRcirc, dtRelong
real(dp), dimension(500*(Npol+2)):: dtRelongTilt, dtRtri, dtRtriTilt, dtZcirc, dtZelong, dtZelongTilt, dtZtri, dtZtriTilt
real(dp), dimension(500*(Npol+2)):: Rcirc, Relong, RelongTilt, Rtri, RtriTilt, Zcirc, Zelong, ZelongTilt, Ztri, ZtriTilt
- real(dp), dimension(500*(Npol+2)):: drrShape, drrAng, drxAng, dryAng, dtdtrShape, dtdtrAng, dtdtxAng
- real(dp), dimension(500*(Npol+2)):: dtdtyAng, dtrShape, dtrAng, dtxAng, dtyAng, rShape, rAng, xAng, yAng
+ ! real(dp), dimension(500*(Npol+2)):: drrShape, drrAng, drxAng, dryAng, dtdtrShape, dtdtrAng, dtdtxAng
+ ! real(dp), dimension(500*(Npol+2)):: dtdtyAng, dtrShape, dtrAng, dtxAng, dtyAng, rShape, rAng, xAng, yAng
real(dp), dimension(500*(Npol+2)):: theta, thAdj, J_r, B, Bp, D0, D1, D2, D3, nu, chi, psi1, nu1
real(dp), dimension(500*(Npol+2)):: tmp_reverse, theta_reverse, tmp_arr
@@ -121,8 +120,8 @@ CONTAINS
real(dp), dimension(500*(Npol+1)):: R_s, Z_s, R_theta_s, Z_theta_s, Rc_s, cosu_s, sinu_s, Bphi_s, B_s, Bp_s, dlp_s
real(dp), dimension(500*(Npol+1)):: dtRcirc_s, dtRelong_s, dtRelongTilt_s, dtRtri_s, dtRtriTilt_s, dtZcirc_s
real(dp), dimension(500*(Npol+1)):: dtZelong_s, dtZelongTilt_s, dtZtri_s, dtZtriTilt_s, Rcirc_s, Relong_s, RelongTilt_s
- real(dp), dimension(500*(Npol+1)):: Rtri_s, RtriTilt_s, Zcirc_s, Zelong_s, ZelongTilt_s, Ztri_s, ZtriTilt_s, dtrShape_s
- real(dp), dimension(500*(Npol+1)):: dtrAng_s, dtxAng_s, dtyAng_s, rShape_s, rAng_s, xAng_s, yAng_s
+ real(dp), dimension(500*(Npol+1)):: Rtri_s, RtriTilt_s, Zcirc_s, Zelong_s, ZelongTilt_s, Ztri_s, ZtriTilt_s!, dtrShape_s
+ ! real(dp), dimension(500*(Npol+1)):: dtrAng_s, dtxAng_s, dtyAng_s, rShape_s, rAng_s, xAng_s, yAng_s
real(dp), dimension(500*(Npol+1)):: psi1_s, nu1_s, dchidx_s, dB_drho_s, dB_dl_s, dnu_drho_s, dnu_dl_s, grad_nu_s
real(dp), dimension(500*(Npol+1)):: gxx, gxy, gxz, gyy, gyz, gzz, dtheta_dchi_s, dBp_dchi_s, jacobian, dBdx, dBdz
real(dp), dimension(500*(Npol+1)):: g_xx, g_xy, g_xz, g_yy, g_yz, g_zz, tmp_arr_s, dxdR_s, dxdZ_s, K_x, K_y !tmp_arr2
@@ -132,7 +131,7 @@ CONTAINS
real(dp):: d_inv, drPsi, dxPsi, dq_dx, dq_dpsi, R0, Z0, B0, F, D0_full, D1_full, D2_full, D3_full
!real(dp) :: Lnorm, Psi0 ! currently module-wide defined anyway
real(dp):: pprime, ffprime, D0_mid, D1_mid, D2_mid, D3_mid, dx_drho, pi, mu_0, dzprimedz
- real(dp):: rho_a, psiN, drpsiN, CN2, CN3, Rcenter, Zcenter, drRcenter, drZcenter
+ ! real(dp):: rho_a, psiN, drpsiN, CN2, CN3, Rcenter, Zcenter, drRcenter, drZcenter
logical:: bMaxShift
integer:: i, k, iBmax
diff --git a/src/moments_eq_rhs_mod.F90 b/src/moments_eq_rhs_mod.F90
index 948d66c0..c4763b05 100644
--- a/src/moments_eq_rhs_mod.F90
+++ b/src/moments_eq_rhs_mod.F90
@@ -38,7 +38,7 @@ SUBROUTINE moments_eq_rhs_e
IMPLICIT NONE
INTEGER :: p_int, j_int ! loops indices and polynom. degrees
- REAL(dp) :: kx, ky, kperp2, dzlnB_o_J
+ REAL(dp) :: kx, ky, kperp2
COMPLEX(dp) :: Tnepj, Tnepp2j, Tnepm2j, Tnepjp1, Tnepjm1 ! Terms from b x gradB and drives
COMPLEX(dp) :: Tnepp1j, Tnepm1j, Tnepp1jm1, Tnepm1jm1 ! Terms from mirror force with non adiab moments
COMPLEX(dp) :: Tperp, Tpar, Tmir, Tphi, Tpsi
@@ -322,7 +322,7 @@ SUBROUTINE add_Maxwellian_background_terms
USE array, ONLY: moments_rhs_e, moments_rhs_i
USE grid, ONLY: contains_kx0, contains_ky0, ikx_0, iky_0,&
ips_e,ipe_e,ijs_e,ije_e,ips_i,ipe_i,ijs_i,ije_i,&
- jarray_e,parray_e,jarray_i,parray_i, zarray, izs,ize,&
+ zarray, izs,ize,&
ip,ij
IMPLICIT NONE
real(dp), DIMENSION(izs:ize) :: sinz
diff --git a/src/numerics_mod.F90 b/src/numerics_mod.F90
index 65d6cea0..4c11273e 100644
--- a/src/numerics_mod.F90
+++ b/src/numerics_mod.F90
@@ -51,8 +51,7 @@ SUBROUTINE evaluate_kernels
USE basic
USE array, Only : kernel_e, kernel_i, HF_phi_correction_operator
USE grid
- USE model, ONLY : tau_e, tau_i, sigma_e, sigma_i, q_e, q_i, &
- lambdaD, CLOS, sigmae2_taue_o2, sigmai2_taui_o2, KIN_E
+ USE model, ONLY : sigmae2_taue_o2, sigmai2_taui_o2, KIN_E
IMPLICIT NONE
INTEGER :: j_int
REAL(dp) :: j_dp, y_
@@ -117,7 +116,7 @@ SUBROUTINE evaluate_poisson_op
USE basic
USE array, Only : kernel_e, kernel_i, inv_poisson_op, inv_pol_ion
USE grid
- USE model, ONLY : tau_e, tau_i, q_e, q_i, qe2_taue, qi2_taui, KIN_E
+ USE model, ONLY : qe2_taue, qi2_taui, KIN_E
IMPLICIT NONE
REAL(dp) :: pol_i, pol_e ! (Z_a^2/tau_a (1-sum_n kernel_na^2))
INTEGER :: ini,ine
@@ -163,7 +162,7 @@ SUBROUTINE evaluate_ampere_op
USE basic
USE array, Only : kernel_e, kernel_i, inv_ampere_op
USE grid
- USE model, ONLY : tau_e, tau_i, q_e, q_i, KIN_E, beta, sigma_e, sigma_i
+ USE model, ONLY : q_e, q_i, beta, sigma_e, sigma_i
USE geometry, ONLY : hatB
IMPLICIT NONE
REAL(dp) :: pol_i, pol_e, kperp2 ! (Z_a^2/tau_a (1-sum_n kernel_na^2))
@@ -206,7 +205,7 @@ END SUBROUTINE evaluate_ampere_op
SUBROUTINE compute_lin_coeff
USE array
- USE model, ONLY: taue_qe, taui_qi, sqrtTaue_qe, sqrtTaui_qi, &
+ USE model, ONLY: taue_qe, taui_qi, &
k_Te, k_Ti, k_Ne, k_Ni, CurvB, GradB, KIN_E,&
tau_e, tau_i, sigma_e, sigma_i
USE prec_const
@@ -215,7 +214,6 @@ SUBROUTINE compute_lin_coeff
IMPLICIT NONE
INTEGER :: p_int, j_int ! polynom. degrees
REAL(dp) :: p_dp, j_dp
- REAL(dp) :: kx, ky, z
!! Electrons linear coefficients for moment RHS !!!!!!!!!!
IF(KIN_E)THEN
DO ip = ips_e, ipe_e
@@ -388,7 +386,6 @@ SUBROUTINE save_EM_ZF_modes
USE array, ONLY : moments_e_ZF, moments_i_ZF, phi_ZF, moments_e_EM,moments_i_EM,phi_EM
USE grid
USE time_integration, ONLY: updatetlevel
- USE initial_par, ONLY: ACT_ON_MODES
USE model, ONLY: KIN_E
IMPLICIT NONE
! Store Zonal and entropy modes
diff --git a/src/ppinit.F90 b/src/ppinit.F90
index 1863dcf9..3eb59a8f 100644
--- a/src/ppinit.F90
+++ b/src/ppinit.F90
@@ -5,14 +5,12 @@ SUBROUTINE ppinit
use prec_const
IMPLICIT NONE
- INTEGER :: version_prov=-1
! Variables for cartesian domain decomposition
INTEGER, PARAMETER :: ndims=3 ! p, kx and z
- INTEGER, DIMENSION(ndims) :: dims=0, coords=0, coords_L=0, coords_R=0
+ INTEGER, DIMENSION(ndims) :: dims=0, coords=0
LOGICAL :: periods(ndims) = .FALSE., reorder=.FALSE.
CHARACTER(len=32) :: str
- INTEGER :: nargs, i, l, r_
- INTEGER, DIMENSION(:), ALLOCATABLE :: rank2exclude
+ INTEGER :: nargs, i, l
CALL MPI_INIT(ierr)
diff --git a/src/processing_mod.F90 b/src/processing_mod.F90
index 2c347928..d0157a5b 100644
--- a/src/processing_mod.F90
+++ b/src/processing_mod.F90
@@ -26,7 +26,7 @@ SUBROUTINE compute_radial_ion_transport
IMPLICIT NONE
COMPLEX(dp) :: pflux_local, gflux_local, integral
REAL(dp) :: ky_, buffer(1:2)
- INTEGER :: i_, world_rank, world_size, root
+ INTEGER :: i_, root
COMPLEX(dp), DIMENSION(izgs:izge) :: integrant
pflux_local = 0._dp ! particle flux
@@ -135,7 +135,7 @@ SUBROUTINE compute_radial_electron_transport
IMPLICIT NONE
COMPLEX(dp) :: pflux_local, gflux_local, integral
REAL(dp) :: ky_, buffer(1:2)
- INTEGER :: i_, world_rank, world_size, root
+ INTEGER :: i_, root
COMPLEX(dp), DIMENSION(izgs:izge) :: integrant
pflux_local = 0._dp ! particle flux
@@ -234,16 +234,15 @@ END SUBROUTINE compute_radial_electron_transport
! 1D diagnostic to compute the average radial particle transport <T_i v_ExB_x>_xyz
SUBROUTINE compute_radial_ion_heatflux
USE fields, ONLY : moments_i, phi, psi
- USE array, ONLY : kernel_i, HF_phi_correction_operator
+ USE array, ONLY : kernel_i!, HF_phi_correction_operator
USE geometry, ONLY : Jacobian, iInt_Jacobian
USE time_integration, ONLY : updatetlevel
- USE model, ONLY : qi_taui, KIN_E, tau_i, EM
USE calculus, ONLY : simpson_rule_z
- USE model, ONLY : sqrt_tau_o_sigma_i
+ USE model, ONLY : tau_i, sqrt_tau_o_sigma_i, EM
IMPLICIT NONE
COMPLEX(dp) :: hflux_local, integral
REAL(dp) :: ky_, buffer(1:2), n_dp
- INTEGER :: i_, world_rank, world_size, root, in
+ INTEGER :: i_, root, in
COMPLEX(dp), DIMENSION(izgs:izge) :: integrant ! charge density q_a n_a
hflux_local = 0._dp ! heat flux
@@ -318,16 +317,15 @@ END SUBROUTINE compute_radial_ion_heatflux
! 1D diagnostic to compute the average radial particle transport <T_e v_ExB_x>_xyz
SUBROUTINE compute_radial_electron_heatflux
USE fields, ONLY : moments_e, phi, psi
- USE array, ONLY : kernel_e, HF_phi_correction_operator
+ USE array, ONLY : kernel_e!, HF_phi_correction_operator
USE geometry, ONLY : Jacobian, iInt_Jacobian
USE time_integration, ONLY : updatetlevel
- USE model, ONLY : qi_taui, KIN_E, tau_e, EM
USE calculus, ONLY : simpson_rule_z
- USE model, ONLY : sqrt_tau_o_sigma_e
+ USE model, ONLY : tau_e, sqrt_tau_o_sigma_e, EM
IMPLICIT NONE
COMPLEX(dp) :: hflux_local, integral
REAL(dp) :: ky_, buffer(1:2), n_dp
- INTEGER :: i_, world_rank, world_size, root, in
+ INTEGER :: i_, root, in
COMPLEX(dp), DIMENSION(izgs:izge) :: integrant ! charge density q_a n_a
hflux_local = 0._dp ! heat flux
@@ -532,7 +530,7 @@ SUBROUTINE compute_Napjz_spectrum
IMPLICIT NONE
REAL(dp), DIMENSION(ips_e:ipe_e,ijs_e:ije_e,izs:ize) :: local_sum_e,global_sum_e, buffer_e
REAL(dp), DIMENSION(ips_i:ipe_i,ijs_i:ije_i,izs:ize) :: local_sum_i,global_sum_i, buffer_i
- INTEGER :: i_, world_rank, world_size, root, count
+ INTEGER :: i_, root, count
root = 0
! Electron moments spectrum
IF (KIN_E) THEN
@@ -793,6 +791,7 @@ SUBROUTINE compute_fluid_moments
CALL compute_Tpar
CALL compute_Tperp
! Temperature
+ IF(KIN_E)&
temp_e = (Tpar_e - 2._dp * Tper_e)/3._dp - dens_e
temp_i = (Tpar_i - 2._dp * Tper_i)/3._dp - dens_i
END SUBROUTINE compute_fluid_moments
diff --git a/src/solve_EM_fields.F90 b/src/solve_EM_fields.F90
index 0c506c6d..3f355e59 100644
--- a/src/solve_EM_fields.F90
+++ b/src/solve_EM_fields.F90
@@ -20,14 +20,13 @@ CONTAINS
USE grid
USE calculus, ONLY : simpson_rule_z
USE parallel, ONLY : manual_3D_bcast
- use model, ONLY : qe2_taue, qi2_taui, q_e, q_i, lambdaD, KIN_E, sigma_e, sigma_i
+ use model, ONLY : q_e, q_i, lambdaD, KIN_E, sigma_e, sigma_i
USE processing, ONLY : compute_density
USE geometry, ONLY : iInt_Jacobian, Jacobian
IMPLICIT NONE
- INTEGER :: ini,ine, i_, root_bcast
+ INTEGER :: ini,ine
COMPLEX(dp) :: fsa_phi, intf_ ! current flux averaged phi
- INTEGER :: count !! mpi integer to broadcast the electric potential at the end
COMPLEX(dp), DIMENSION(izs:ize) :: rho_i, rho_e, integrant ! charge density q_a n_a and aux var
! Execution time start
@@ -91,9 +90,7 @@ CONTAINS
use model, ONLY : sqrt_tau_o_sigma_e, sqrt_tau_o_sigma_i, q_e, q_i, beta, KIN_E
IMPLICIT NONE
- INTEGER :: ini,ine, i_, root_bcast
- INTEGER :: count !! mpi integer to broadcast the electric potential at the end
- COMPLEX(dp), DIMENSION(izs:ize) :: I_i, I_e ! current density q_a u_a and aux var
+ INTEGER :: ini,ine
! Execution time start
CALL cpu_time(t0_poisson)
--
GitLab