JGonzalez/fpakc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixing issue

Browse source 
Fixing an issue with reading tables led me to other issues with
collisions that I think are fixed right now. I am testing with the 1D
ionization model for ALPHIE and things seems to be working properly.
This commit is contained in:
Jorge Gonzalez 2023-11-21 09:53:36 +01:00
commit 4585390b50
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/common/moduleTable.f90
View file

@ -93,7 +93,7 @@ MODULE moduleTable
f = self%fMax f = self%fMax
ELSE ELSE
i = MINLOC(x - self%x, 1) i = MINLOC(ABS(x - self%x), 1)
deltaX = x - self%x(i) deltaX = x - self%x(i)
IF (deltaX < 0 ) THEN IF (deltaX < 0 ) THEN
i = i - 1 i = i - 1

2
src/modules/mesh/moduleMesh.f90
View file

@ -911,7 +911,9 @@ MODULE moduleMesh
!Loop over collisions !Loop over collisions
DO c = 1, interactionMatrix(k)%amount DO c = 1, interactionMatrix(k)%amount
IF (rnd_real <= probabilityColl(c)) THEN IF (rnd_real <= probabilityColl(c)) THEN
!$OMP CRITICAL
CALL interactionMatrix(k)%collisions(c)%obj%collide(part_i, part_j, vRel) CALL interactionMatrix(k)%collisions(c)%obj%collide(part_i, part_j, vRel)
!$OMP END CRITICAL
!If collisions are gonna be output, count the collision !If collisions are gonna be output, count the collision
IF (collOutput) THEN IF (collOutput) THEN

2
src/modules/moduleCollisions.f90
View file

@ -362,7 +362,7 @@ MODULE moduleCollisions
CALL sp%ionize(neutral) CALL sp%ionize(neutral)
CLASS DEFAULT CLASS DEFAULT
! CALL criticalError(sp%name // " is not a neutral", 'collideBinaryIonization') CALL criticalError(sp%name // " is not a neutral", 'collideBinaryIonization')
RETURN RETURN
END SELECT END SELECT