research/incomp-flame-post
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

variable array init & final to m_array

Browse source
This commit is contained in:
ignis 2019-04-19 00:47:04 +09:00
parent 3ffa106f3a
commit e55318038c
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
code/m_arrays.f90
View file

@ -12,12 +12,21 @@ subroutine m_arrays_init
integer :: ierr integer :: ierr
ALLOCATE(u(nxp,nyp,nzp),STAT=ierr) ; u=0. ! Main variables
ALLOCATE(v(nxp,nyp,nzp),STAT=ierr) ; v=0. ! Main variables
ALLOCATE(w(nxp,nyp,nzp),STAT=ierr) ; w=0. ! Main variables
ALLOCATE(y(nxp,nyp,nzp),STAT=ierr) ; y=0.
end subroutine m_arrays_init end subroutine m_arrays_init
subroutine m_arrays_finalize subroutine m_arrays_finalize
DEALLOCATE(u)
DEALLOCATE(v)
DEALLOCATE(w)
DEALLOCATE(y)
end subroutine m_arrays_finalize end subroutine m_arrays_finalize

17
code/post.f90
View file

@ -46,8 +46,6 @@
CALL ALLOCATE_ARRAYS CALL ALLOCATE_ARRAYS
CALL m_terms_init
CALL PRINT_BANNER CALL PRINT_BANNER
countnum=0 countnum=0
@ -116,7 +114,6 @@
CALL SAVE_AVG_RESULTS CALL SAVE_AVG_RESULTS
CALL DEALLOCATES_CLOSE CALL DEALLOCATES_CLOSE
CALL m_terms_finalize
WRITE(*,*) ' Avergaing RAW data is FINISHED' WRITE(*,*) ' Avergaing RAW data is FINISHED'
@ -1496,9 +1493,8 @@
INTEGER :: ierr INTEGER :: ierr
ALLOCATE(u(nxp,nyp,nzp),STAT=ierr) ; u=0. ! Main variables CALL m_arrays_init
ALLOCATE(v(nxp,nyp,nzp),STAT=ierr) ; v=0. ! Main variables CALL m_terms_init
ALLOCATE(w(nxp,nyp,nzp),STAT=ierr) ; w=0. ! Main variables
ALLOCATE(old_scalar(2,nxp,nyp,nzp),STAT=ierr) ; old_scalar=0. ! Main variables ALLOCATE(old_scalar(2,nxp,nyp,nzp),STAT=ierr) ; old_scalar=0. ! Main variables
ALLOCATE(new_scalar(nxp,nyp,nzp,2),STAT=ierr) ; new_scalar=0. ! Main variables ALLOCATE(new_scalar(nxp,nyp,nzp,2),STAT=ierr) ; new_scalar=0. ! Main variables
@ -1512,7 +1508,6 @@
ALLOCATE(c(nxp,nyp,nzp),STAT=ierr) ; c=0. ALLOCATE(c(nxp,nyp,nzp),STAT=ierr) ; c=0.
ALLOCATE(Wc(nxp,nyp,nzp),STAT=ierr) ; Wc=0. ALLOCATE(Wc(nxp,nyp,nzp),STAT=ierr) ; Wc=0.
ALLOCATE(u_dot(3,nxp,(eyp-syp+1),nzp),STAT=ierr) ; u_dot=0. ALLOCATE(u_dot(3,nxp,(eyp-syp+1),nzp),STAT=ierr) ; u_dot=0.
ALLOCATE(y(nxp,nyp,nzp),STAT=ierr) ; y=0.
!ALLOCATE(DivN(nxp,nyp,nzp),STAT=ierr) ; DivN=0. !ALLOCATE(DivN(nxp,nyp,nzp),STAT=ierr) ; DivN=0.
!ALLOCATE(G_V(3,nxp,nyp,nzp),STAT=ierr) ; G_V=0. !ALLOCATE(G_V(3,nxp,nyp,nzp),STAT=ierr) ; G_V=0.
!ALLOCATE(Div_V(nxp,nyp,nzp),STAT=ierr) ; Div_V=0 !ALLOCATE(Div_V(nxp,nyp,nzp),STAT=ierr) ; Div_V=0
@ -1587,9 +1582,10 @@
END SUBROUTINE ALLOCATE_ARRAYS END SUBROUTINE ALLOCATE_ARRAYS
SUBROUTINE DEALLOCATES_CLOSE SUBROUTINE DEALLOCATES_CLOSE
DEALLOCATE(u)
DEALLOCATE(v) CALL m_arrays_finalize
DEALLOCATE(w) CALL m_terms_finalize
DEALLOCATE(old_scalar) DEALLOCATE(old_scalar)
DEALLOCATE(new_scalar) DEALLOCATE(new_scalar)
DEALLOCATE(m_v) DEALLOCATE(m_v)
@ -1600,7 +1596,6 @@
DEALLOCATE(c) DEALLOCATE(c)
DEALLOCATE(Wc) DEALLOCATE(Wc)
DEALLOCATE(u_dot) DEALLOCATE(u_dot)
DEALLOCATE(y)
!DEALLOCATE(DivN) !DEALLOCATE(DivN)
! DEALLOCATE(G_V) ! DEALLOCATE(G_V)
! DEALLOCATE(Div_V) ! DEALLOCATE(Div_V)