From ca3c80a564a890cf0bb2d0d4aff571d456149341 Mon Sep 17 00:00:00 2001
From: ignis <ignis@postech.ac.kr>
Date: Wed, 10 Apr 2019 17:28:10 +0900
Subject: [PATCH] second loop update

---
 code/post.f90 | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/code/post.f90 b/code/post.f90
index cb9f511..b69824f 100644
--- a/code/post.f90
+++ b/code/post.f90
@@ -81,6 +81,7 @@
       ENDDO fileloop
 
       write(*,*) 'After 1st loop'
+
       CALL AVERAGING
       
       CALL SECOND_LOOP
@@ -263,12 +264,12 @@
 
      SUBROUTINE READ_FILE(num)
       INTEGER, INTENT(IN) :: num
-      INTEGER :: ierr,i,j,k
       REAL, DIMENSION(2) :: tmpr
       REAL :: tmp1,tmp2
       REAL :: dt,dummyu
 
       OPEN(num,FORM='unformatted',STATUS='unknown')
+
       READ (num) tnow,nxp,nyp,nzp,tmp1,tmp2
 
        IF (nzp.eq.1) THEN
@@ -1212,41 +1213,39 @@
      END SUBROUTINE READ_FILE2
 
      SUBROUTINE SECOND_LOOP
-      INTEGER :: i,j,k,iv,post_sw
+      INTEGER :: i,j,k,fread
       REAL :: ntime,ui,vi,wi
+
+      LOGICAL :: omitsw
 !-------------------------------------------------------------
 !    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
-       IF (omitnum.gt.0) THEN
-        DO i=1,omitnum
-         IF (iv.ge.omit_t(i,1).and.iv.le.omit_t(i,2)) THEN
-          post_sw=i*-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)
+       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(*,'(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_CGM_N    !dhkim
-         CALL CAL_FLUCTUATION(iv)
+         CALL CAL_FLUCTUATION(fread)
          CALL SAVE_SUM_FLUCTUATION
+
        ENDIF
 
-      ENDDO  ! Time-loop
+      ENDDO fileloop
 
          CALL FLUCTUATION_AVG