From d20a384d0688bb751c770c232a179bc63f48c21f Mon Sep 17 00:00:00 2001 From: ignis Date: Thu, 11 Apr 2019 23:43:52 +0900 Subject: [PATCH] remove duplicate read_file2 --- code/post.f90 | 52 +-------------------------------------------------- 1 file changed, 1 insertion(+), 51 deletions(-) diff --git a/code/post.f90 b/code/post.f90 index c7a0582..8064bf9 100644 --- a/code/post.f90 +++ b/code/post.f90 @@ -93,7 +93,7 @@ ELSE - CALL READ_FILE2(fread) + CALL READ_FILE(fread) CALL CAL_Yrs !CALL CAL_CGM_N !dhkim CALL CAL_FLUCTUATION @@ -1188,56 +1188,6 @@ END SUBROUTINE AVERAGING - SUBROUTINE READ_FILE2(num) - INTEGER, INTENT(IN) :: num - INTEGER, DIMENSION(4) :: itmp - 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) - -! Bgn - DQ version -! READ (num) ncyc,tmpr(1:2) -! READ (num) tmpr(1:4) -! READ (num) tmpr(1:4) -! READ (num) tmpr(1:2) -! End - DQ version ------------------------- - - !READ (num) ncyc,tmpr(1:2) - READ (num) ncyc,dt,dummyu - READ (num) tmpr(1:2) - READ (num) tmpr(1:2) - READ (num) tmpr(1:2) - - WRITE(*,'(a27,f8.3,a1,i6,a4,i5,a3,i5)') ' 2nd LOOP : T & NCYC = ',tnow,',' & - ,itmp(4),' || ',(num-startnum+1),' / ',(endnum-startnum+1) - - m_v(1,:,:,:)=1. - - num_=num - IF(num.le.shiftnum) THEN - WRITE(*,*) ' Reading an old fort data from Nueman-0X' - READ (num) m_v(2,:,:,:),m_v(3,:,:,:),m_v(4,:,:,:),m_v(5:6,:,:,:) - ELSE - WRITE(*,*) ' Reading a new fort data from Comb-Cluster' - READ (num) m_v(2,:,:,:),m_v(3,:,:,:),m_v(4,:,:,:),m_v_new(:,:,:,1:2) - m_v(2,:,:,:) = m_v(2,:,:,:) + dummyu - ENDIF - CLOSE (num) - - - - - END SUBROUTINE READ_FILE2 - - SUBROUTINE SECOND_LOOP - INTEGER :: i,fread - - - END SUBROUTINE SECOND_LOOP SUBROUTINE CAL_FLUCTUATION INTEGER :: i,j,k,jj