research/dns-hit3d-fdm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OpenMP directives updated

Browse source
This commit is contained in:
ignis 2014-07-15 21:40:14 +09:00
parent 7d86a17130
commit 8c26213ef7
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
m_fdm_calc.f90
View file

@ -230,6 +230,8 @@ module m_fdm_calc
! FDM DNS BGN
!----------------------------------------------------------------
umax=-1.0d300;umin=1.0d300;vmax=-1.0d300;vmin=1.0d300;wmax=-1.0d300;wmin=1.0d300
!$omp parallel do private(i,j,k) reduction(max:umax,vmax,wmax) reduction(min:umin,vmin,wmin) NUM_THREADS(6) schedule(static)
do k=1,nz_all
do j=1,ny
do i=1,nx
@ -258,6 +260,7 @@ module m_fdm_calc
fdmtime=time+fdmdt
write(*,'(a30,3x,4f12.7)')' ** DT, visdt, convdt, fdmdt =' , DT,visdt,convdt,fdmdt
!$omp parallel do private(i,j,k,yr,wrate) reduction(+:sum_wrate,sumc) NUM_THREADS(6) schedule(static)
do k=1,nz_all
do j=1,ny
do i=1,nx
@ -328,7 +331,7 @@ module m_fdm_calc
real*8 :: Ly(yy,zz),Dy
! x-direction
!$omp parallel do private(i,j,k,ux,dux,d2ux,wrate,uy,duy,d2uy) NUM_THREADS(4) schedule(static)
!$omp parallel do private(i,j,k,ux,dux,d2ux,wrate,uy,duy,d2uy) NUM_THREADS(6) schedule(static)
DO k=1,zz
DO j=1,yy
DO i=1,xx
@ -386,7 +389,7 @@ module m_fdm_calc
ENDDO
!! z-direction
!$omp parallel do private(i,j,k,uz,duz,d2uz) NUM_THREADS(4) schedule(static)
!$omp parallel do private(i,j,k,uz,duz,d2uz) NUM_THREADS(6) schedule(static)
DO j=1,yy
DO i=1,xx
DO k=1,zz
@ -412,7 +415,7 @@ module m_fdm_calc
ENDDO
! Boundary condition
!$omp parallel do private(k,j,i) NUM_THREADS(4) schedule(static)
!$omp parallel do private(k,j,i) NUM_THREADS(6) schedule(static)
DO k=1,zz
DO j=1,yy
DO i=1,yrsw
@ -485,7 +488,7 @@ module m_fdm_calc
IF(istage<5) THEN
at=a(istage)*fdmdt
bt=(b(istage)-a(istage))*fdmdt
!$omp parallel do private(k,j,i,nv) NUM_THREADS(4) schedule(static)
!$omp parallel do private(k,j,i,nv) NUM_THREADS(6) schedule(static)
DO k=1,zz
DO j=1,yy
DO i=1,xx
@ -500,7 +503,7 @@ module m_fdm_calc
bt=b(istage)*fdmdt
sumc=0.
sum_wrate=0.
!$omp parallel do private(k,j,i,nv) NUM_THREADS(4) schedule(static)
!$omp parallel do private(k,j,i,nv) NUM_THREADS(6) schedule(static)
DO k=1,zz
DO j=1,yy
DO i=1,xx