extract parameters to m_parameters

This commit is contained in:
ignis 2019-04-11 11:41:05 +09:00
parent 6eb5b4ffbe
commit 2cbd42ee2f
3 changed files with 45 additions and 23 deletions

28
code/m_parameters.f90 Normal file
View file

@ -0,0 +1,28 @@
module m_parameters
implicit none
integer :: nxp,nyp,nzp
real :: l_0
integer :: startnum,endnum,skipnum,shiftnum
real :: scp,prp,lep,vis0p,rod
real :: prof_wr,min_wr,min_fsd,min_c,refwr
real :: pre,ac,bc,c_cut,c_ref
integer :: syp,eyp,twod
real :: SL_u
integer :: omitnum
integer, allocatable :: omit_t(:,:)
contains
end module m_parameters

View file

@ -18,6 +18,7 @@ compiler = gfortran
# Modules
MODULES += \
Compact.o\
m_parameters.o\
post.o
# Objects

View file

@ -1,18 +1,13 @@
MODULE post
USE Compact
USE m_parameters
IMPLICIT NONE
PRIVATE
INTEGER :: nxp,nyp,nzp,startnum,endnum,skipnum,ncyc
INTEGER :: syp,eyp,twod
INTEGER :: omitnum,countnum
INTEGER :: shiftnum ! hybrid
INTEGER :: countnum
INTEGER :: num_, dummyu_ ! hybrid
REAL :: tnow,rod,SL_u
REAL :: hxp,hyp,hzp,l_0
REAL :: scp,prp,lep,vis0p
REAL :: refwr,prof_wr,min_wr,min_fsd
REAL :: pre,ac,bc,c_cut,c_ref
REAL :: min_c
REAL :: tnow
REAL :: hxp,hyp,hzp
REAL, PARAMETER :: pi=3.14159265358979323846
REAL, PARAMETER :: me=1.00e-20
REAL, DIMENSION(:), ALLOCATABLE :: favg_ndata
@ -40,8 +35,6 @@
REAL, DIMENSION(:,:,:,:), ALLOCATABLE :: CM_b_g,CM_u_g,u_g,u_dot_g,ub_dot_g,uu_dot_g
!REAL, DIMENSION(:,:,:,:), ALLOCATABLE :: d2gc
INTEGER, DIMENSION(:,:), ALLOCATABLE :: omit_t
PUBLIC :: main
CONTAINS
@ -50,6 +43,7 @@
LOGICAL :: omitsw
CALL READ_INTRO
CALL PRINT_BANNER
countnum=0
@ -57,6 +51,7 @@
fileloop: DO fread=startnum,endnum,skipnum
omitsw=.false.
filter_omit: DO i=1,omitnum
IF (fread.ge.omit_t(i,1).and.fread.le.omit_t(i,2)) THEN
omitsw=.true.
@ -267,6 +262,7 @@
REAL, DIMENSION(2) :: tmpr
REAL :: tmp1,tmp2
REAL :: dt,dummyu
INTEGER :: ncyc
OPEN(num,FORM='unformatted',STATUS='unknown')
@ -1174,6 +1170,7 @@
REAL, DIMENSION(3) :: rtmp
REAL, DIMENSION(2) :: tmpr
REAL :: dt,dummyu
INTEGER :: ncyc
OPEN(num,FORM='unformatted',STATUS='unknown')
READ (num) tnow,nxp,nyp,nzp,tmpr(1:2)
@ -1213,13 +1210,9 @@
END SUBROUTINE READ_FILE2
SUBROUTINE SECOND_LOOP
INTEGER :: i,j,k,fread
REAL :: ntime,ui,vi,wi
INTEGER :: i,fread
LOGICAL :: omitsw
!-------------------------------------------------------------
! X_DOT_F : fluctuation of X by surface average.
!----------------------------------------------------------------
fileloop: DO fread=startnum,endnum,skipnum
@ -1228,10 +1221,10 @@
filter_omit: DO i=1,omitnum
IF (fread.ge.omit_t(i,1).and.fread.le.omit_t(i,2)) THEN
omitsw=.true.
WRITE(*,'(a40,i7,a4,i4,a3,i4)') ' Current fullsavenum = ',fread,&
' || ',(fread-startnum+1),' / ',(endnum-startnum+1)
WRITE(*,'(a40,i7,a4,i4,a3,i4)') &
' Current fullsavenum = ', fread, ' || ', (fread-startnum+1), ' / ', (endnum-startnum+1)
WRITE(*,'(a12,i6,a20,i6)') &
' Skip. ',omit_t(i,1),' <= fullsavenum <= ',omit_t(i,2)
' Skip. ', omit_t(i,1), ' <= fullsavenum <= ', omit_t(i,2)
ENDIF
ENDDO filter_omit
@ -1240,7 +1233,7 @@
CALL READ_FILE2(fread)
CALL CAL_Yrs
!CALL CAL_CGM_N !dhkim
CALL CAL_FLUCTUATION(fread)
CALL CAL_FLUCTUATION
CALL SAVE_SUM_FLUCTUATION
ENDIF
@ -1251,8 +1244,8 @@
END SUBROUTINE SECOND_LOOP
SUBROUTINE CAL_FLUCTUATION(num)
INTEGER :: i,j,k,jj,num
SUBROUTINE CAL_FLUCTUATION
INTEGER :: i,j,k,jj
DO i=1,nxp
DO j=syp,eyp