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

second loop update

Browse source
This commit is contained in:
ignis 2019-04-10 17:28:10 +09:00
parent 54397de7bc
commit ca3c80a564
1 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
code/post.f90
View file

@ -81,6 +81,7 @@
ENDDO fileloop ENDDO fileloop
write(*,*) 'After 1st loop' write(*,*) 'After 1st loop'
CALL AVERAGING CALL AVERAGING
CALL SECOND_LOOP CALL SECOND_LOOP
@ -263,12 +264,12 @@
SUBROUTINE READ_FILE(num) SUBROUTINE READ_FILE(num)
INTEGER, INTENT(IN) :: num INTEGER, INTENT(IN) :: num
INTEGER :: ierr,i,j,k
REAL, DIMENSION(2) :: tmpr REAL, DIMENSION(2) :: tmpr
REAL :: tmp1,tmp2 REAL :: tmp1,tmp2
REAL :: dt,dummyu REAL :: dt,dummyu
OPEN(num,FORM='unformatted',STATUS='unknown') OPEN(num,FORM='unformatted',STATUS='unknown')
READ (num) tnow,nxp,nyp,nzp,tmp1,tmp2 READ (num) tnow,nxp,nyp,nzp,tmp1,tmp2
IF (nzp.eq.1) THEN IF (nzp.eq.1) THEN
@ -1212,41 +1213,39 @@
END SUBROUTINE READ_FILE2 END SUBROUTINE READ_FILE2
SUBROUTINE SECOND_LOOP SUBROUTINE SECOND_LOOP
INTEGER :: i,j,k,iv,post_sw INTEGER :: i,j,k,fread
REAL :: ntime,ui,vi,wi REAL :: ntime,ui,vi,wi
LOGICAL :: omitsw
!------------------------------------------------------------- !-------------------------------------------------------------
! X_DOT_F : fluctuation of X by surface average. ! X_DOT_F : fluctuation of X by surface average.
!---------------------------------------------------------------- !----------------------------------------------------------------
DO iv=startnum,endnum,skipnum fileloop: DO fread=startnum,endnum,skipnum
! CALL READ_FILE2(iv) omitsw=.false.
post_sw=1 filter_omit: DO i=1,omitnum
IF (omitnum.gt.0) THEN IF (fread.ge.omit_t(i,1).and.fread.le.omit_t(i,2)) THEN
DO i=1,omitnum omitsw=.true.
IF (iv.ge.omit_t(i,1).and.iv.le.omit_t(i,2)) THEN WRITE(*,'(a40,i7,a4,i4,a3,i4)') ' Current fullsavenum = ',fread,&
post_sw=i*-1 ' || ',(fread-startnum+1),' / ',(endnum-startnum+1)
ENDIF
ENDDO
ENDIF
IF (post_sw.lt.0) THEN
WRITE(*,'(a40,i7,a4,i4,a3,i4)') ' Current fullsavenum = ',iv,&
' || ',(iv-startnum+1),' / ',(endnum-startnum+1)
WRITE(*,'(a12,i6,a20,i6)') & WRITE(*,'(a12,i6,a20,i6)') &
' Skip. ',omit_t((-1*post_sw),1),' <= fullsavenum <= ',omit_t((-1*post_sw),2) ' Skip. ',omit_t(i,1),' <= fullsavenum <= ',omit_t(i,2)
ENDIF
ENDDO filter_omit
ELSEIF (post_sw.eq.1) THEN IF ( .not. omitsw ) THEN
CALL READ_FILE2(iv) CALL READ_FILE2(fread)
CALL CAL_Yrs CALL CAL_Yrs
!CALL CAL_CGM_N !dhkim !CALL CAL_CGM_N !dhkim
CALL CAL_FLUCTUATION(iv) CALL CAL_FLUCTUATION(fread)
CALL SAVE_SUM_FLUCTUATION CALL SAVE_SUM_FLUCTUATION
ENDIF ENDIF
ENDDO ! Time-loop ENDDO fileloop
CALL FLUCTUATION_AVG CALL FLUCTUATION_AVG