inlining subroutine second_loop
This commit is contained in:
parent
1f17dfba0d
commit
62d8a01a09
1 changed files with 31 additions and 27 deletions
|
|
@ -47,7 +47,9 @@
|
|||
|
||||
countnum=0
|
||||
|
||||
fileloop: DO fread=startnum,endnum,skipnum
|
||||
|
||||
|
||||
firstloop: DO fread=startnum,endnum,skipnum
|
||||
|
||||
IF ( to_omit(fread) ) THEN
|
||||
|
||||
|
|
@ -70,13 +72,38 @@
|
|||
CALL SAVE_SUM ! Total sum
|
||||
ENDIF
|
||||
|
||||
ENDDO fileloop
|
||||
ENDDO firstloop
|
||||
|
||||
write(*,*) 'After 1st loop'
|
||||
write(*,*) '1st loop finished'
|
||||
|
||||
CALL AVERAGING
|
||||
|
||||
CALL SECOND_LOOP
|
||||
|
||||
|
||||
|
||||
secondloop: DO fread=startnum,endnum,skipnum
|
||||
|
||||
IF ( to_omit(fread) ) THEN
|
||||
|
||||
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)
|
||||
|
||||
ELSE
|
||||
|
||||
CALL READ_FILE2(fread)
|
||||
CALL CAL_Yrs
|
||||
!CALL CAL_CGM_N !dhkim
|
||||
CALL CAL_FLUCTUATION
|
||||
CALL SAVE_SUM_FLUCTUATION
|
||||
|
||||
ENDIF
|
||||
|
||||
ENDDO secondloop
|
||||
|
||||
CALL FLUCTUATION_AVG
|
||||
|
||||
! CALL FINAL_AVG ! edge-cold-bc-3
|
||||
CALL SAVE_AVG_RESULTS
|
||||
|
|
@ -1209,29 +1236,6 @@
|
|||
SUBROUTINE SECOND_LOOP
|
||||
INTEGER :: i,fread
|
||||
|
||||
fileloop: DO fread=startnum,endnum,skipnum
|
||||
|
||||
IF ( to_omit(fread) ) THEN
|
||||
|
||||
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)
|
||||
|
||||
ELSE
|
||||
|
||||
CALL READ_FILE2(fread)
|
||||
CALL CAL_Yrs
|
||||
!CALL CAL_CGM_N !dhkim
|
||||
CALL CAL_FLUCTUATION
|
||||
CALL SAVE_SUM_FLUCTUATION
|
||||
|
||||
ENDIF
|
||||
|
||||
ENDDO fileloop
|
||||
|
||||
CALL FLUCTUATION_AVG
|
||||
|
||||
END SUBROUTINE SECOND_LOOP
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue