Skip to content

TokaMaker: Fix segmentation fault for running on high thread count systems. #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
benjysmith wants to merge 1 commit into from
Closed

TokaMaker: Fix segmentation fault for running on high thread count systems. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions src/physics/grad_shaf_prof_phys.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module grad_shaf_prof_phys
oft_increase_indent, oft_decrease_indent, gsinv_interp, gs_prof_interp, &
gs_get_qprof, gs_ani_press, gs_epsilon
use tracing_2d, only: set_tracer, active_tracer, tracinginv_fs
use oft_gs_profiles, only: spline_flux_func, linterp_flux_func
use oft_gs_profiles, only: spline_flux_func, linterp_flux_func, get_max_threads
use spline_mod
USE mhd_utils, ONLY: mu0
implicit none
Expand Down Expand Up @@ -137,7 +137,7 @@ SUBROUTINE create_mercier_ff(func,npsi)
self%npsi=npsi
CALL spline_alloc(self%func,self%npsi,1)
CALL spline_alloc(self%funcp,self%npsi,1)
DO i=1,omp_get_max_threads()
DO i=1,get_max_threads()
CALL spline_alloc(self%fun_loc(i),self%npsi,1)
END DO
end select
Expand Down Expand Up @@ -252,7 +252,7 @@ subroutine mercier_update(self,gseq)
self%func%xs=self%funcp%xs
self%func%fs(:,1)=self%funcp%fsi(:,1)
CALL spline_fit(self%func,"extrap")
DO k=1,omp_get_max_threads()
DO k=1,get_max_threads()
CALL spline_copy(self%func,self%fun_loc(k))
END DO
!
Expand Down Expand Up @@ -451,7 +451,7 @@ SUBROUTINE create_dipole_b0_prof(func,npsi)
!---
self%npsi=npsi
CALL spline_alloc(self%func,self%npsi,1)
DO i=1,omp_get_max_threads()
DO i=1,get_max_threads()
CALL spline_alloc(self%fun_loc(i),self%npsi,1)
END DO
end select
Expand Down Expand Up @@ -542,7 +542,7 @@ subroutine dipole_b0_update(self,gseq)
self%ypn=0.d0
!---Setup Spline
CALL spline_fit(self%func,"extrap")
DO k=1,omp_get_max_threads()
DO k=1,get_max_threads()
CALL spline_copy(self%func,self%fun_loc(k))
END DO
IF(oft_debug_print(2))CALL oft_decrease_indent
Expand Down Expand Up @@ -616,7 +616,7 @@ subroutine dipole_ani_delete(self)
SELECT TYPE(this=>self%B0_prof)
TYPE IS(dipole_b0_flux_func)
CALL spline_dealloc(this%func)
DO i=1,omp_get_max_threads()
DO i=1,get_max_threads()
CALL spline_dealloc(this%fun_loc(i))
END DO
END SELECT
Expand Down Expand Up @@ -661,7 +661,7 @@ SUBROUTINE create_mirror_b0_prof(func,npsi)
!---
self%npsi=npsi
CALL spline_alloc(self%func,self%npsi,1)
DO i=1,omp_get_max_threads()
DO i=1,get_max_threads()
CALL spline_alloc(self%fun_loc(i),self%npsi,1)
END DO
end select
Expand Down Expand Up @@ -723,7 +723,7 @@ subroutine mirror_b0_update(self,gseq)
self%xmax=self%func%xs(self%npsi)+(self%func%xs(1)-self%func%xs(0))*4.d0
!---Setup Spline
CALL spline_fit(self%func,"extrap")
DO k=1,omp_get_max_threads()
DO k=1,get_max_threads()
CALL spline_copy(self%func,self%fun_loc(k))
END DO
IF(oft_debug_print(2))CALL oft_decrease_indent
Expand Down Expand Up @@ -759,7 +759,7 @@ subroutine mirror_slosh_delete(self)
SELECT TYPE(this=>self%B0_prof)
TYPE IS(mirror_b0_flux_func)
CALL spline_dealloc(this%func)
DO i=1,omp_get_max_threads()
DO i=1,get_max_threads()
CALL spline_dealloc(this%fun_loc(i))
END DO
END SELECT
Expand Down
19 changes: 14 additions & 5 deletions src/physics/grad_shaf_profiles.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ module oft_gs_profiles
!------------------------------------------------------------------------------
!> Needs docs
!------------------------------------------------------------------------------
integer(4), parameter :: max_threads = 24
type, extends(flux_func) :: spline_flux_func
INTEGER(4) :: npsi = 0 !< Needs docs
REAL(8) :: xmin = 0.d0 !< Needs docs
Expand All @@ -98,7 +99,7 @@ module oft_gs_profiles
REAL(8) :: yp1 = 0.d0 !< Needs docs
REAL(8) :: ypn = 0.d0 !< Needs docs
TYPE(spline_type) :: func !< Needs docs
TYPE(spline_type) :: fun_loc(24) !< Needs docs
TYPE(spline_type) :: fun_loc(max_threads) !< Needs docs
contains
!> Needs docs
procedure :: f => spline_f
Expand Down Expand Up @@ -551,7 +552,7 @@ SUBROUTINE create_spline_ff(func,npsi,psimin,psimax,psivals)
self%npsi=npsi
self%ncofs=self%npsi
CALL spline_alloc(self%func,self%npsi-1,1)
DO i=1,omp_get_max_threads()
DO i=1,get_max_threads()
CALL spline_alloc(self%fun_loc(i),self%npsi-1,1)
END DO
IF(PRESENT(psivals))THEN
Expand All @@ -578,7 +579,7 @@ SUBROUTINE create_spline_ff(func,npsi,psimin,psimax,psivals)
WRITE(*,*)'Fitting',self%func%xs
!CALL spline_fit(self%func,"extrap")
CALL spline_fit(self%func,"not-a-knot")
DO i=1,omp_get_max_threads()
DO i=1,get_max_threads()
CALL spline_copy(self%func,self%fun_loc(i))
END DO
ALLOCATE(c(self%ncofs))
Expand Down Expand Up @@ -645,7 +646,7 @@ subroutine spline_update(self,gseq)
CALL spline_eval(self%func,self%xmax,1)
self%ypn=self%func%f1(1)
!---
DO i=1,omp_get_max_threads()
DO i=1,get_max_threads()
CALL spline_copy(self%func,self%fun_loc(i))
END DO
end subroutine spline_update
Expand Down Expand Up @@ -679,7 +680,7 @@ function spline_cofs_update(self,c) result(ierr)
self%fn=self%func%f(1)-self%f1
self%ypn=self%func%f1(1)
!---
DO i=1,omp_get_max_threads()
DO i=1,get_max_threads()
CALL spline_copy(self%func,self%fun_loc(i))
END DO
ierr=0
Expand All @@ -696,6 +697,14 @@ subroutine spline_cofs_get(self,c)
END DO
end subroutine spline_cofs_get
!------------------------------------------------------------------------------
!> Return the maximum number of threads that can be created, limited by the
!> allocated size of the fun_loc array.
!------------------------------------------------------------------------------
function get_max_threads() result(threads)
integer(4) :: threads
threads = min(omp_get_max_threads(), max_threads)
end function get_max_threads
!------------------------------------------------------------------------------
!> Needs docs
!------------------------------------------------------------------------------
SUBROUTINE create_linterp_ff(func,npsi,psivals,yvals,y0)
Expand Down