Commit a0c383e3 authored by Juan Caneses Marin (nfc)'s avatar Juan Caneses Marin (nfc)
Browse files

made some changes, found out that it is the module functions that are causing problems with openMP

parent a8c4a61d

InputFiles/xp_IonSlowingDown.in

+7 −6
Original line number Diff line number Diff line 
&in_nml

! Simulation name:

! ===============

in%fileDescriptor = '2021_02_02b',

in%fileDescriptor = '2021_02_02c',



! Magnetic field input data:

! =========================
@@ -12,14 +12,15 @@ in%nz = 501, ! N 


! Simulation conditions:

! =====================

in%Nparts = 500000,                                                              ! Total number of particles

in%Nsteps = 5000,                                                               ! Total number of time steps

in%Nparts = 600000,                                                              ! Total number of particles

in%Nsteps = 500,                                                               ! Total number of time steps

in%dt     = 0.5E-7,                                                             ! Time step in [s]

in%zmax = +5.0,

in%zmin = -5.0,

in%threads_request = 8,

in%threads_request = 24,

in%padding = 4,



in%iSave = .true.,

in%iSave = .false.,

in%iPush = .true.,                                                             ! Enable RK4 particle pusher

in%iColl = .false.,                                                             ! Collisions or no collisions

in%iHeat = .false.,                                                            ! Enable RF heating operator
@@ -29,7 +30,7 @@ in%iDrag = .false., ! 
! Time steps to record:

! ==============

in%jstart = 1,                                                                  ! start frame

in%jend   = 5000,                                                               ! end frame

in%jend   = 500,                                                               ! end frame

in%jincr  = 10,                                                                 ! increment



! Collision operator conditions:

src/Main.f90

+25 −22
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ TYPE(splTYP) :: spline_ddBz 
TYPE(splTYP) :: spline_Phi

TYPE(spltestTYP) :: spline_Test

! DO loop indices:

INTEGER(i4) :: i,j,k

INTEGER(i4) :: i,j,k,tt

! Pseudo random number seed:

INTEGER(i4) :: seed_size

INTEGER(i4), DIMENSION(:), ALLOCATABLE :: seed
@@ -44,7 +44,7 @@ REAL(r8) :: df 
! simulation time:

REAl(r8) :: tp

! Particle position (zp), kinetic energy (kep), pitch angle (xip):

REAL(r8), DIMENSION(:)  , ALLOCATABLE :: xip, zp, kep

REAL(r8), DIMENSION(:,:)  , ALLOCATABLE :: xip, zp, kep

! subset of zp, kep and xip to save:

REAL(r8), DIMENSION(:,:), ALLOCATABLE :: zp_hist, kep_hist, xip_hist

! Subset of tp:
@@ -132,7 +132,7 @@ CALL InitSplineTest(spline_Test,in%nz) 


! Allocate memory to main simulation variables:

! ==============================================================================

ALLOCATE(zp(in%Nparts), kep(in%Nparts), xip(in%Nparts))

ALLOCATE(zp(in%Nparts,in%padding), kep(in%Nparts,in%padding), xip(in%Nparts,in%padding))

ALLOCATE(pcount1(in%Nsteps),pcount2(in%Nsteps),pcount3(in%Nsteps),pcount4(in%Nsteps))

ALLOCATE(ecount1(in%Nsteps),ecount2(in%Nsteps),ecount3(in%Nsteps),ecount4(in%Nsteps))
@@ -193,10 +193,6 @@ if (.true.) then 
    CLOSE(unit=8)

end if



! Record start time:

! ==============================================================================

ostart = OMP_GET_WTIME()



! Initialize pseudo random number generator:

! ===========================================================================

CALL random_seed(size=seed_size)
@@ -213,16 +209,18 @@ CALL OMP_SET_NUM_THREADS(in%threads_request) 
! Inititalize zp, kep, xip

! ==============================================================================

kep = 0.; xip = 0.; zp = 0.;

!$OMP PARALLEL DO

DO i = 1,in%Nparts

  CALL loadParticles(zp(i),kep(i),xip(i),in)

  CALL loadParticles(zp(i,1),kep(i,1),xip(i,1),in)

END DO

!$OMP END PARALLEL DO



! Test initial distribution:

! ==========================================================================

fileName = "LoadParticles.dat"

OPEN(unit=8,file=fileName,form="formatted",status="unknown")

do i = 1,in%Nparts

    WRITE(8,*) zp(i), kep(i), xip(i)

    WRITE(8,*) zp(i,1), kep(i,1), xip(i,1)

end do

CLOSE(unit=8)
@@ -235,6 +233,10 @@ pcount1 = 0; pcount2 = 0; pcount3 = 0; pcount4 = 0 
! Energy leak diagnotics:

ecount1 = 0; ecount2 = 0; ecount3 = 0; ecount4 = 0



! Record start time:

! ==============================================================================

ostart = OMP_GET_WTIME()



! Loop over time:

! ==============================================================================

TimeStepping: do j = 1,in%Nsteps
@@ -258,23 +260,24 @@ TimeStepping: do j = 1,in%Nsteps 
            		  WRITE(*,*) ''

            		  WRITE(*,*) '*********************************************************************'

            		  WRITE(*,*) "Number of threads given: ", in%threads_given

            		  WRITE(*,*) "Padding: ", in%padding, " Real(r8)"

            		  WRITE(*,*) '*********************************************************************'

            		  WRITE(*,*) ''

            		end if



                ! Calculate Cyclotron resonance number:

                ! ------------------------------------------------------------------------

                if (in%iHeat) CALL CyclotronResonanceNumber(zp(i),kep(i),xip(i),fcurr(i),in,spline_Bz)

                if (in%iHeat) CALL CyclotronResonanceNumber(zp(i,1),kep(i,1),xip(i,1),fcurr(i),in,spline_Bz)

                ! fcurr and fnew could be declared private



                ! Push particles adiabatically:

                ! ------------------------------------------------------------------------

                if (in%iPush) CALL MoveParticle(zp(i),kep(i),xip(i),in,spline_Bz,spline_Phi)

		if (in%iPush) CALL MoveParticle(zp(i,1),kep(i,1),xip(i,1),in,spline_Bz,spline_Phi)



                ! Re-inject particles:

                ! ------------------------------------------------------------------------

                if (zp(i) .GE. in%zmax) CALL ReinjectParticles(zp(i),kep(i),xip(i),in,ecnt2,pcnt2)

                if (zp(i) .LE. in%zmin) CALL ReinjectParticles(zp(i),kep(i),xip(i),in,ecnt1,pcnt1)

                if (zp(i,1) .GE. in%zmax) CALL ReinjectParticles(zp(i,1),kep(i,1),xip(i,1),in,ecnt2,pcnt2)

                if (zp(i,1) .LE. in%zmin) CALL ReinjectParticles(zp(i,1),kep(i,1),xip(i,1),in,ecnt1,pcnt1)



                ! Apply Coulomb collision operator:

                ! ------------------------------------------------------------------------
@@ -282,18 +285,18 @@ TimeStepping: do j = 1,in%Nsteps 
                    ! "in" needs to be private to avoid race condition. This can be

                    ! fixed by looping over species inside the subroutine "collisionOperator"

                    in%species_b = 1

                    CALL collisionOperator(zp(i),kep(i),xip(i),ecnt4,pcnt4,in)

                    CALL collisionOperator(zp(i,1),kep(i,1),xip(i,1),ecnt4,pcnt4,in)

                    in%species_b = 2

                    CALL collisionOperator(zp(i),kep(i),xip(i),ecnt4,pcnt4,in)

                    CALL collisionOperator(zp(i,1),kep(i,1),xip(i,1),ecnt4,pcnt4,in)

                end if



                ! Apply RF heating operator:

                ! ------------------------------------------------------------------------

                if (in%iHeat) then

                  CALL CyclotronResonanceNumber(zp(i),kep(i),xip(i),fnew(i),in,spline_Bz)

                  CALL CyclotronResonanceNumber(zp(i,1),kep(i,1),xip(i,1),fnew(i),in,spline_Bz)

                  df = dsign(1.d0,fcurr(i)*fnew(i))

                  if (df .LT. 0 .AND. zp(i) .GT. in%zRes1 .AND. zp(i) .LT. in%zRes2)  then

                    CALL RFHeatingOperator(zp(i),kep(i),xip(i),ecnt3,pcnt3,in,spline_Bz,spline_ddBz,spline_Phi)

                  if (df .LT. 0 .AND. zp(i,1) .GT. in%zRes1 .AND. zp(i,1) .LT. in%zRes2)  then

                    CALL RFHeatingOperator(zp(i,1),kep(i,1),xip(i,1),ecnt3,pcnt3,in,spline_Bz,spline_ddBz,spline_Phi)

                  end if

                end if
@@ -327,11 +330,11 @@ TimeStepping: do j = 1,in%Nsteps 
                    !$OMP PARALLEL DO PRIVATE(i)

                    do i = 1,in%Nparts

                            ! Record "ith" particle position at "kth" time

                            zp_hist(i,k) = zp(i)

                            zp_hist(i,k) = zp(i,1)

                            ! Record "ith" particle KE at "kth" time

                            kep_hist(i,k) = kep(i)

                            kep_hist(i,k) = kep(i,1)

                            ! Record "ith" particle pitch angle at "kth" time

                            xip_hist(i,k) = xip(i)

                            xip_hist(i,k) = xip(i,1)

                    end do

                   !$OMP END PARALLEL DO

            endif
@@ -342,7 +345,7 @@ TimeStepping: do j = 1,in%Nsteps 
    ! =====================================================================

    id = OMP_GET_THREAD_NUM()

    if (id .EQ. 0) then

      if (j .EQ. 10) then

      if (j .EQ. 1) then

	       oend_estimate = OMP_GET_WTIME()

         WRITE(*,*) 'Estimated compute time: ', in%Nsteps*(oend_estimate-ostart)/j,' [s]'

      end if

src/Modules.f90

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ TYPE inTYP 
  REAL(r8) :: Aion, Zeff, Zion

  INTEGER(i4) :: Nparts, Nsteps, nz, species_a, species_b

  INTEGER(i4) :: jstart, jend, jincr

  INTEGER(i4) :: threads_request, threads_given, particleBC

  INTEGER(i4) :: padding, threads_request, threads_given, particleBC

  LOGICAL:: iDrag, iPotential, iSave, iPush, iHeat, iColl

  INTEGER(i4) :: zp_InitType

  REAL(r8) :: zp_init, Ep_init, xip_init, zp_init_std, Tp_init

src/runProg.sh

+4 −0
Original line number Diff line number Diff line
@@ -5,6 +5,10 @@ 
INPUT_FILE="xp_IonSlowingDown.in"

#INPUT_FILE="xp_Test.in"



# Set processor binding for openMP:

# ===================================================

OMP_PROC_BIND=true



# Get repo directory:

# ===================================================

REPO_DIR=$(echo $PWD | sed "s|/src||g")