From 96d8f60203518f6cd5b1aae94a26bb4a8aafdd5b Mon Sep 17 00:00:00 2001 From: Christophe Pinte Date: Sat, 7 Dec 2024 21:45:12 +1100 Subject: [PATCH] Removing unused variables --- src/Voronoi.f90 | 14 ++++---------- src/dust_transfer.f90 | 3 ++- src/grid.f90 | 2 -- src/mol_transfer.f90 | 8 ++++---- src/output.f90 | 11 +++++------ src/thermal_emission.f90 | 4 ---- src/utils.f90 | 16 +++++++--------- 7 files changed, 22 insertions(+), 36 deletions(-) diff --git a/src/Voronoi.f90 b/src/Voronoi.f90 index ac74863b7..dd6c57730 100644 --- a/src/Voronoi.f90 +++ b/src/Voronoi.f90 @@ -846,10 +846,10 @@ subroutine cross_Voronoi_cell(x,y,z, u,v,w, icell, previous_cell, x1,y1,z1, next real(kind=dp), parameter :: prec = 1e-5 - real(kind=dp) :: s_tmp, den, num, s_entry, s_exit + real(kind=dp) :: s_tmp, den integer :: i, id_n, l, ifirst, ilast - integer :: i_star, check_cell + integer :: i_star real(kind=dp) :: d_to_star logical :: is_a_star_neighbour @@ -1000,15 +1000,9 @@ real(dp) function distance_to_closest_wall_Voronoi(icell,x,y,z) result(s) real(kind=dp), intent(in) :: x,y,z ! n = normale a la face, p = point sur la face, r = position du photon, k = direction de vol - real(kind=dp) :: s_tmp, den, num, s_entry, s_exit + real(kind=dp) :: s_tmp, den integer :: i, id_n, l, ifirst, ilast - integer :: i_star, check_cell - real(kind=dp) :: d_to_star - logical :: is_a_star_neighbour - - real(kind=dp), dimension(3) :: delta_r - ! n = normale a la face, p = point sur la face, r = position du photon, k = direction de vol real, dimension(3) :: n, p, r, k, r_cell, r_neighbour @@ -1091,7 +1085,7 @@ subroutine cross_Voronoi_cell_vect(x,y,z, u,v,w, icell, previous_cell, x1,y1,z1, real :: s_tmp_wall, den1 real(kind=dp) :: b, c, delta, rac, s1, s2, h - integer :: n_neighbours, n_wall, ifirst, ilast, id_min, id_max + integer :: n_neighbours, ifirst, ilast logical :: lhit_wall, was_cut diff --git a/src/dust_transfer.f90 b/src/dust_transfer.f90 index aa6704ab0..e88493825 100644 --- a/src/dust_transfer.f90 +++ b/src/dust_transfer.f90 @@ -976,7 +976,8 @@ subroutine propagate_packet(id,lambda,p_lambda,icell,x,y,z,u,v,w,stokes,flag_sta logical, intent(out) :: flag_scatt real(kind=dp), dimension(4,4) :: M - real(kind=dp) :: u1,v1,w1, phi, cospsi, Planck_opacity, rec_Planck_opacity, d, diff_coeff + real(kind=dp) :: u1,v1,w1, phi, cospsi + !real(kind=dp) :: Planck_opacity, rec_Planck_opacity, d, diff_coeff integer :: taille_grain, itheta integer :: n_iteractions_in_cell, icell_old integer, pointer :: p_icell diff --git a/src/grid.f90 b/src/grid.f90 index 4c060e54f..fa7f6162f 100644 --- a/src/grid.f90 +++ b/src/grid.f90 @@ -32,7 +32,6 @@ module grid contains subroutine alloc_atomrt_grid() - integer(kind=8) :: mem_alloc_local = 0 !merge vturb and v_turb (molecular emission) !TO DO: move vturb in molecular emission in grid.f90 @@ -274,7 +273,6 @@ end subroutine define_physical_zones subroutine setup_grid() logical, save :: lfirst = .true. - integer :: mem_size if (.not.lVoronoi) then nrz = n_rad * nz diff --git a/src/mol_transfer.f90 b/src/mol_transfer.f90 index 4ad6f087f..73f0fcbc8 100644 --- a/src/mol_transfer.f90 +++ b/src/mol_transfer.f90 @@ -1104,7 +1104,7 @@ subroutine emission_line_tau_surface_map(imol,tau,ibin,iaz) integer :: i,j, id, icell, iTrans real(kind=dp) :: l, taille_pix, x0, y0, z0, u0, v0, w0 - logical :: lintersect, flag_star, flag_direct_star, flag_sortie, lpacket_alive + logical :: lintersect, flag_sortie, lpacket_alive integer, dimension(4) :: ispeed ! Direction de visee pour le ray-tracing @@ -1153,7 +1153,7 @@ subroutine emission_line_tau_surface_map(imol,tau,ibin,iaz) !$omp parallel & !$omp default(none) & !$omp private(i,j,id,icell,lintersect,x0,y0,z0,u0,v0,w0) & - !$omp private(flag_star,flag_direct_star,flag_sortie,lpacket_alive,pixelcenter) & + !$omp private(flag_sortie,lpacket_alive,pixelcenter) & !$omp shared(tau,Icorner,imol,iTrans,dx,dy,u,v,w,ispeed,tab_speed_rt) & !$omp shared(taille_pix,npix_x,npix_y,ibin,iaz,tau_surface_map,move_to_grid) id = 1 ! pour code sequentiel @@ -1213,7 +1213,7 @@ subroutine emission_line_energy_fraction_surface_map(imol,flux_fraction,ibin,iaz integer :: i,j, id, icell, iTrans, iiTrans real(kind=dp) :: l, taille_pix, x0, y0, z0, u0, v0, w0, Flux, factor - logical :: lintersect, flag_star, flag_direct_star, flag_sortie, lpacket_alive + logical :: lintersect, flag_sortie, lpacket_alive integer, dimension(4) :: ispeed ! Direction de visee pour le ray-tracing @@ -1266,7 +1266,7 @@ subroutine emission_line_energy_fraction_surface_map(imol,flux_fraction,ibin,iaz !$omp parallel & !$omp default(none) & !$omp private(i,j,id,icell,lintersect,x0,y0,z0,u0,v0,w0) & - !$omp private(flag_star,flag_direct_star,flag_sortie,lpacket_alive,pixelcenter,Flux) & + !$omp private(flag_sortie,lpacket_alive,pixelcenter,Flux) & !$omp shared(flux_fraction,Icorner,imol,iTrans,iiTrans,dx,dy,u,v,w,ispeed,tab_speed_rt) & !$omp shared(taille_pix,npix_x,npix_y,ibin,iaz,tau_surface_map,move_to_grid,spectre,factor) id = 1 ! pour code sequentiel diff --git a/src/output.f90 b/src/output.f90 index ac73ef75c..e125451e2 100644 --- a/src/output.f90 +++ b/src/output.f90 @@ -1057,11 +1057,11 @@ subroutine write_tau_surface(imol) integer :: status,unit,blocksize,bitpix,naxis integer, dimension(5) :: naxes - integer :: i,j,group,fpixel,nelements, alloc_status, xcenter, lambda, itype, ibin, iaz + integer :: i,j,group,fpixel,nelements, alloc_status, lambda, ibin, iaz character(len = 512) :: filename logical :: simple, extend - real :: pixel_scale_x, pixel_scale_y, Q, U + real :: pixel_scale_x, pixel_scale_y ! Allocation dynamique pour passer en stack real, dimension(:,:,:,:,:), allocatable :: image @@ -1171,11 +1171,11 @@ subroutine write_tau_map(imol) integer :: status,unit,blocksize,bitpix,naxis integer, dimension(5) :: naxes - integer :: i,j,group,fpixel,nelements, alloc_status, xcenter, lambda, itype, ibin, iaz + integer :: i,j,group,fpixel,nelements, alloc_status, lambda, ibin, iaz character(len = 512) :: filename logical :: simple, extend - real :: pixel_scale_x, pixel_scale_y, Q, U + real :: pixel_scale_x, pixel_scale_y ! Allocation dynamique pour passer en stack real, dimension(:,:,:,:), allocatable :: image @@ -3177,7 +3177,7 @@ subroutine ecriture_pops(imol,ext) character(len=32), intent(in), optional :: ext character(len=512) :: filename - integer :: status,unit,blocksize,bitpix,naxis,icell + integer :: status,unit,blocksize,bitpix,naxis integer, dimension(3) :: naxes integer :: group,fpixel,nelements logical :: simple, extend @@ -3546,7 +3546,6 @@ subroutine write_atomic_maps(atom) integer :: status,unit,blocksize,bitpix,naxis integer, dimension(6) :: naxes - integer, dimension(4) :: naxes_cont integer :: group,fpixel,nelements integer :: n, kr, i, j logical :: simple, extend diff --git a/src/thermal_emission.f90 b/src/thermal_emission.f90 index fb433241f..aa555c691 100644 --- a/src/thermal_emission.f90 +++ b/src/thermal_emission.f90 @@ -711,8 +711,6 @@ subroutine im_reemission_LTE(id,icell,p_icell,aleat1,aleat2,lambda) ! Calcul de la temperature de la cellule et stokage energie recue + T ! Reemission d'un photon a la bonne longeur d'onde - use radiation_field, only : xKJ_abs, E0 - implicit none integer, intent(in) :: id, icell, p_icell @@ -875,8 +873,6 @@ subroutine Temp_finale() ! C. Pinte ! 24/01/05 - use radiation_field, only : xKJ_abs, E0 - implicit none real :: Temp diff --git a/src/utils.f90 b/src/utils.f90 index 4681adbee..266537332 100644 --- a/src/utils.f90 +++ b/src/utils.f90 @@ -254,7 +254,6 @@ function matdiag(A,n) real(kind=dp), intent(in) :: A(n*n) ! real(kind=dp), intent(in) :: A(n,n) real(kind=dp) :: matdiag(n) - integer :: i ! do i = 1, n ! matdiag(i) = A(i,i) @@ -275,7 +274,7 @@ subroutine Jacobi(a,b,x,n) real(kind=dp), parameter :: omega = 1.0 ! Damping factor (0 < omega < 1) integer, parameter :: nIterMax = 20000 - integer :: niter, i + integer :: niter real(kind=dp) :: diff logical :: lconverged @@ -315,7 +314,7 @@ subroutine Jacobi_sparse(a,b,x,n) real(kind=dp), parameter :: omega = 1.0 ! Damping factor (0 < omega < 1) integer, parameter :: nIterMax = 20000 - integer :: niter, i + integer :: niter real(kind=dp) :: diff logical :: lconverged @@ -429,7 +428,7 @@ function Ng_accelerate(m,n,x) logical :: Ng_accelerate real(kind=dp), intent(inout) :: x(m,*) integer :: i, j, k - real(kind=dp) :: x0(m), A(n, n), b(n), w, dy, di, max_sol + real(kind=dp) :: x0(m), A(n, n), b(n), w, dy, di ng_accelerate = .false. @@ -474,7 +473,7 @@ subroutine Accelerate(m,n,x) integer, intent(in) :: m, n real(kind=dp), intent(inout) :: x(m,*) integer :: i, j, k - real(kind=dp) :: x0(m), A(n, n), b(n), w, dy, di, max_sol + real(kind=dp) :: x0(m), A(n, n), b(n), w, dy, di A(:,:) = 0.0_dp; b(:) = 0.0_dp x0(:) = x(:,1) @@ -525,14 +524,14 @@ subroutine check_ng_pops(m,n,o,x,xtot) integer, intent(in) :: m,n,o real(kind=dp), intent(inout) :: x(m,n,o) real(kind=dp), intent(in) :: xtot(n) - integer :: i, j, k + integer :: i, j real(kind=dp) :: dum(o) !take absolute value !$omp parallel & !$omp default(none) & - !$omp private(i,j,k,dum)& + !$omp private(i,j,dum)& !$omp shared(m,n,o,x,xtot) !$omp do schedule(dynamic,1) do i=1,n @@ -830,7 +829,7 @@ function mcfost_update(lforce_update, lmanual, n_days) integer, intent(in), optional :: n_days logical :: lupdate, mcfost_update - character(len=512) :: cmd, url, url_sha1, last_version, current_binary, s + character(len=512) :: cmd, url, url_sha1, last_version, current_binary character(len=40) :: mcfost_sha1, mcfost_update_sha1 integer :: syst_status, ios @@ -1867,7 +1866,6 @@ function bilinear(N,xi,i0,M,yi,j0,f,xo,yo) real(kind=dp), intent(in) :: xi(N),yi(M),f(N,M) real(kind=dp), intent(in) :: xo,yo integer, intent(in) :: i0, j0 - integer :: i, j real(kind=dp) :: norm, f11, f21, f12, f22 norm = ((xi(i0) - xi(i0-1)) * (yi(j0) - yi(j0-1)))