Merge branch 'master' of https://github.com/danieljprice/phantom

danieljprice · Aug 5, 2020 · 69b31ba · 69b31ba
2 parents e079ac0 + 02cdfc7
commit 69b31ba
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/main/utils_cpuinfo.f90 b/src/main/utils_cpuinfo.f90
@@ -81,6 +81,10 @@ subroutine get_cpuinfo(ncpu,ncpureal,cpuspeed,cpumodel,cachesize,ierr)
 !
  ierr = 0
  ncpu = 0
+ ncpureal = 0
+ cpuspeed = 0.
+ cpumodel = ''
+ cachesize = ''
  inquire(file='/proc/cpuinfo',exist=iexist)
  if (iexist) then
     open(unit=iunit,file='/proc/cpuinfo',status='old',iostat=ierr)

diff --git a/src/tests/test_link.F90 b/src/tests/test_link.F90
@@ -70,11 +70,15 @@ subroutine test_link(ntests,npass)
  integer :: nfailed(8)
  logical                :: iactivei,iactivej,activecell
  real, allocatable :: xyzcache(:,:)
- integer :: listneigh(maxneigh)
+ integer, allocatable :: listneigh(:)
  character(len=1), dimension(3), parameter :: xlabel = (/'x','y','z'/)
 
  if (id==master) write(*,"(a,/)") '--> TESTING LINKLIST / NEIGHBOUR FINDING'
 !
+!--allocate memory for neighbour list
+!
+ allocate(listneigh(maxneigh))
+!
 !--set up a random particle distribution
 !
  npart = 0
@@ -436,6 +440,7 @@ subroutine test_link(ntests,npass)
  enddo
 
  if (allocated(xyzcache)) deallocate(xyzcache)
+ deallocate(listneigh)
 
  if (id==master) write(*,"(/,a,/)") '<-- LINKLIST TEST COMPLETE'