Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -1808,7 +1808,12 @@ if test "$enable_debug" == "yes"
then
debug_nag='-C=all -gline -nan'
debug_ifort='-check all -warn all -warn nodec -warn interfaces -gen_interfaces -traceback -g'
debug_gfortran='-Wall -fbounds-check -g'
# Unused dummy arguments are not warned about because many procedures have
# to conform to interfaces shared between the different grid geometries,
# and unused functions are not warned about because some private library
# functions are intentionally unused (including empty contained subroutines
# that work around a PGI compiler bug).
debug_gfortran='-Wall -Wno-unused-dummy-argument -Wno-unused-function -fbounds-check -g'
debug_g95='-Wall -fbounds-check -g'
debug_pgi='-Mbounds -traceback -g'
else
Expand Down
7 changes: 6 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,12 @@ if test "$enable_debug" == "yes"
then
debug_nag='-C=all -gline -nan'
debug_ifort='-check all -warn all -warn nodec -warn interfaces -gen_interfaces -traceback -g'
debug_gfortran='-Wall -fbounds-check -g'
# Unused dummy arguments are not warned about because many procedures have
# to conform to interfaces shared between the different grid geometries,
# and unused functions are not warned about because some private library
# functions are intentionally unused (including empty contained subroutines
# that work around a PGI compiler bug).
debug_gfortran='-Wall -Wno-unused-dummy-argument -Wno-unused-function -fbounds-check -g'
debug_g95='-Wall -fbounds-check -g'
debug_pgi='-Mbounds -traceback -g'
else
Expand Down
1 change: 0 additions & 1 deletion src/dust/dust_type_4elem.f90
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ subroutine dust_setup(group,d,beta)
character(len=100) :: path
character(len=4) :: sublimation
type(version) :: python_version
integer :: dust_version

! Read dust file

Expand Down
2 changes: 1 addition & 1 deletion src/grid/grid_geometry_cylindrical_3d.f90
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ logical function in_correct_cell(p)

type(photon),intent(in) :: p
type(grid_cell) :: icell_actual
real(dp) :: phi,frac,dphi,r_sq,w_sq
real(dp) :: phi,frac,dphi,w_sq
real(dp),parameter :: threshold = 1.e-3_dp

icell_actual = find_cell(p)
Expand Down
2 changes: 0 additions & 2 deletions src/grid/grid_geometry_octree.f90
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,6 @@ subroutine setup_grid_geometry(group)

integer(hid_t),intent(in) :: group

real(dp) :: x, y, z, dx, dy, dz
integer :: ic, iv

! FIX - issue with reading 64-bit 1D column with 32-bit variables
Expand Down Expand Up @@ -370,7 +369,6 @@ end function next_cell_wall_id
logical function in_correct_cell(p)
implicit none
type(photon),intent(in) :: p
type(grid_cell) :: curr
type(grid_cell) :: icell_actual
real(dp) :: frac,frac1, frac2, frac3
icell_actual = find_cell(p)
Expand Down
14 changes: 3 additions & 11 deletions src/grid/grid_geometry_voronoi.f90
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ module grid_geometry_specific
public :: setup_grid_geometry
type(grid_geometry_desc),public,target :: geo

integer :: n_filled = 0

! Declare here otherwise pointer becomes corrupt
real(dp),allocatable, target :: points(:,:)
Expand Down Expand Up @@ -103,7 +102,6 @@ subroutine setup_grid_geometry(group)
real(dp), allocatable :: x(:), y(:), z(:)
integer, allocatable :: sparse_neighs(:), sparse_idx(:)
real(dp),allocatable :: bb_min(:,:), bb_max(:,:)
type(cell),pointer :: c

! Read geometry file
call mp_read_keyword(group, '.', "geometry", geo%id)
Expand Down Expand Up @@ -261,8 +259,6 @@ recursive type(grid_cell) function next_cell_int(cell, direction, intersection)
type(grid_cell),intent(in) :: cell
integer,intent(in) :: direction
type(vector3d_dp),optional,intent(in) :: intersection
type(grid_cell) :: parent_cell
integer :: subcell_id
! wall ID = cell ID
c = new_grid_cell(direction, geo)
end function next_cell_int
Expand All @@ -278,9 +274,6 @@ end function next_cell_wall_id
logical function in_correct_cell(p)
implicit none
type(photon),intent(in) :: p
type(grid_cell) :: curr
type(grid_cell) :: icell_actual
real(dp) :: frac,frac1, frac2, frac3
real(dp) :: point(3)
type(kdtree2_result) :: results(2)
! TODO - only check the second result if it's close to the first
Expand All @@ -293,7 +286,6 @@ subroutine random_position_cell(icell,pos)
implicit none
type(grid_cell),intent(in) :: icell
type(vector3d_dp), intent(out) :: pos
type(grid_cell) :: icell_actual

type(kdtree2_result) :: results(1)
real(dp) :: point(3)
Expand Down Expand Up @@ -322,8 +314,8 @@ end subroutine random_position_cell
real(dp) function distance_to_closest_wall(p) result(d)
implicit none
type(photon),intent(in) :: p
real(dp) :: d1,d2,d3,d4,d5,d6
call error("distance_to_closest_wall", "not implemented for Voronoi grid")
d = 0._dp
! TODO: is this the second nearest neighbor?
end function distance_to_closest_wall

Expand All @@ -346,8 +338,8 @@ subroutine find_wall(p,radial,tmin,id_min)


integer :: i, n_neighbors
type(vector3d_dp) :: r0, ri, rmid, n
real(dp) :: t, tx, ty, tz
type(vector3d_dp) :: rmid, n
real(dp) :: t


icell => geo%cells(p%icell%ic)
Expand Down
1 change: 0 additions & 1 deletion src/grid/grid_mrw_3d.f90
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ module grid_mrw
public :: grid_do_mrw_noenergy
public :: mrw_peeloff

logical :: debug = .false.

integer,parameter :: ncdf = 100
real(dp) :: xcdf(ncdf), ycdf(ncdf)
Expand Down
1 change: 0 additions & 1 deletion src/grid/grid_physics_3d.f90
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ module grid_physics
integer :: id
integer :: idx

logical :: debug = .false.

type(pdf_discrete_dp) :: absorption

Expand Down
2 changes: 1 addition & 1 deletion src/images/image_type.f90
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ subroutine image_setup(handle,path,img,n_view,n_sources,n_dust,use_exact_nu,freq
real(dp) :: wav_min, wav_max
integer :: io_bytes
logical :: compute_stokes
integer :: ig, n_filt
integer :: ig
character(len=100) :: group_name

img%n_view = n_view
Expand Down
8 changes: 4 additions & 4 deletions src/main/iter_final.f90
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ subroutine do_final(n_photons_tot,n_photons_chunk,peeloff_scattering_only)
integer(idp) :: n_photons, n_photons_curr

! Photon object and variable to loop over photons
integer :: ip
integer(idp) :: ip
type(photon) :: p

! Whether to only peeloff scattered photons
Expand Down Expand Up @@ -153,10 +153,10 @@ subroutine propagate(p,peeloff_scattering_only)
integer(idp) :: interactions
real(dp) :: tau_achieved, tau, tau_escape
type(photon) :: p_tmp
real(dp) :: xi, weight
real(dp) :: weight
logical :: killed
integer :: mrw_steps
integer :: ia
integer(idp) :: mrw_steps
integer(idp) :: ia

! Propagate photon
do interactions=1, n_inter_max+1
Expand Down
6 changes: 3 additions & 3 deletions src/main/iter_final_mono.f90
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ subroutine do_final_mono(n_photons_sources,n_photons_thermal,n_photons_chunk, pe
integer(idp) :: n_photons, n_photons_curr

! Photon object and variable to loop over photons
integer :: ip
integer(idp) :: ip
type(photon) :: p

integer :: inu
Expand Down Expand Up @@ -237,9 +237,9 @@ subroutine propagate(p)
integer(idp) :: interactions
real(dp) :: tau_achieved, tau, tau_escape
type(photon) :: p_tmp
real(dp) :: xi, weight
real(dp) :: weight
logical :: killed
integer :: ia
integer(idp) :: ia

logical, parameter :: force_scatter = .true.
real(dp) :: energy_initial
Expand Down
4 changes: 2 additions & 2 deletions src/main/iter_lucy.f90
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@ subroutine do_lucy(n_photons_tot,n_photons_chunk)
integer(idp) :: n_photons, n_photons_curr

! Photon object and variable to loop over photons
integer :: ip, ia
integer(idp) :: ip, ia
type(photon) :: p

! Number of interactions
integer :: interactions,mrw_steps
integer(idp) :: interactions,mrw_steps

! Optical depth to travel
real(dp) :: tau
Expand Down
2 changes: 1 addition & 1 deletion src/main/iter_raytracing.f90
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ subroutine do_raytracing(n_photons_sources,n_photons_thermal,n_photons_chunk)
integer(idp) :: n_photons, n_photons_curr

! Photon object and variable to loop over photons
integer :: ip
integer(idp) :: ip
type(photon) :: p

n_photons_curr = 0
Expand Down
Loading