Merge branch 'development' into feature/3DCart
This commit is contained in:
commit
3b01099aba
11 changed files with 247 additions and 105 deletions
|
|
@ -506,7 +506,7 @@ MODULE moduleSolver
|
|||
|
||||
INTEGER:: nn, n, e
|
||||
INTEGER, SAVE:: nPartNew
|
||||
INTEGER, SAVE:: nInjIn, nOldIn, nWScheme, nCollisions
|
||||
INTEGER, SAVE:: nInjIn, nOldIn, nWScheme, nCollisions, nSurfaces
|
||||
TYPE(particle), ALLOCATABLE, SAVE:: partTemp(:)
|
||||
TYPE(lNode), POINTER:: partCurr, partNext
|
||||
|
||||
|
|
@ -527,13 +527,15 @@ MODULE moduleSolver
|
|||
nWScheme = partWScheme%amount
|
||||
!$OMP SECTION
|
||||
nCollisions = partCollisions%amount
|
||||
!$OMP SECTION
|
||||
nSurfaces = partSurfaces%amount
|
||||
!$OMP END SECTIONS
|
||||
|
||||
!$OMP BARRIER
|
||||
|
||||
!$OMP SINGLE
|
||||
CALL MOVE_ALLOC(partOld, partTemp)
|
||||
nPartNew = nInjIn + nOldIn + nWScheme + nCollisions
|
||||
nPartNew = nInjIn + nOldIn + nWScheme + nCollisions + nSurfaces
|
||||
ALLOCATE(partOld(1:nPartNew))
|
||||
!$OMP END SINGLE
|
||||
|
||||
|
|
@ -591,6 +593,21 @@ MODULE moduleSolver
|
|||
IF (ASSOCIATED(partCollisions%tail)) NULLIFY(partCollisions%tail)
|
||||
partCollisions%amount = 0
|
||||
|
||||
!$OMP SECTION
|
||||
!Reset particles from surface process
|
||||
nn = nInjIn + nOldIn + nWScheme + nCollisions
|
||||
partCurr => partSurfaces%head
|
||||
DO n = 1, nSurfaces
|
||||
partNext => partCurr%next
|
||||
partOld(nn+n) = partCurr%part
|
||||
DEALLOCATE(partCurr)
|
||||
partCurr => partNext
|
||||
|
||||
END DO
|
||||
IF (ASSOCIATED(partSurfaces%head)) NULLIFY(partSurfaces%head)
|
||||
IF (ASSOCIATED(partSurfaces%tail)) NULLIFY(partSurfaces%tail)
|
||||
partSurfaces%amount = 0
|
||||
|
||||
!$OMP SECTION
|
||||
!Reset output in nodes
|
||||
DO e = 1, mesh%numNodes
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue