fix missing comma, added pass indicator
This commit is contained in:
parent
5ffd7ac4c3
commit
b6210acb01
1 changed files with 19 additions and 4 deletions
|
|
@ -9,6 +9,7 @@
|
|||
PRIVATE
|
||||
INTEGER :: countnum
|
||||
INTEGER :: nprogress
|
||||
INTEGER :: ipass
|
||||
INTEGER :: num_, dummyu_ ! hybrid
|
||||
REAL :: tnow
|
||||
|
||||
|
|
@ -20,6 +21,8 @@
|
|||
SUBROUTINE main
|
||||
INTEGER :: fread,i
|
||||
|
||||
ipass=0
|
||||
|
||||
CALL READ_INTRO
|
||||
|
||||
CALL ALLOCATE_ARRAYS
|
||||
|
|
@ -27,7 +30,8 @@
|
|||
if (iammaster) CALL PRINT_BANNER
|
||||
|
||||
countnum=0
|
||||
|
||||
nprogress=0
|
||||
ipass=1
|
||||
|
||||
firstloop: DO fread=startnum,endnum,skipnum
|
||||
|
||||
|
|
@ -44,6 +48,8 @@
|
|||
|
||||
IF (file_dist(fread).eq.myid) THEN
|
||||
|
||||
nprogress = nprogress + 1
|
||||
|
||||
CALL READ_FILE(fread)
|
||||
|
||||
CALL m_terms_calculate_pass1(fread)
|
||||
|
|
@ -61,6 +67,9 @@
|
|||
|
||||
optional_pass2: IF ( pass2_required ) THEN
|
||||
|
||||
nprogress=0
|
||||
ipass=2
|
||||
|
||||
secondloop: DO fread=startnum,endnum,skipnum
|
||||
|
||||
IF ( to_omit(fread) ) THEN
|
||||
|
|
@ -75,6 +84,8 @@
|
|||
|
||||
IF (file_dist(fread).eq.myid) THEN
|
||||
|
||||
nprogress = nprogress + 1
|
||||
|
||||
CALL READ_FILE(fread)
|
||||
|
||||
CALL m_terms_calculate_pass2(fread)
|
||||
|
|
@ -107,6 +118,8 @@
|
|||
INTEGER :: fread,i
|
||||
INTEGER, PARAMETER :: eofread = -1
|
||||
|
||||
ipass=0
|
||||
|
||||
CALL READ_INTRO
|
||||
|
||||
CALL ALLOCATE_ARRAYS
|
||||
|
|
@ -119,6 +132,7 @@
|
|||
tag = 1
|
||||
countnum = 0
|
||||
nprogress = 0
|
||||
ipass=1
|
||||
|
||||
if (iammaster) then
|
||||
|
||||
|
|
@ -181,6 +195,7 @@
|
|||
|
||||
tag = 2
|
||||
nprogress = 0
|
||||
ipass=2
|
||||
|
||||
if (iammaster) then
|
||||
|
||||
|
|
@ -278,9 +293,9 @@
|
|||
READ (num) tmpr(1:2)
|
||||
READ (num) tmpr(1:2)
|
||||
|
||||
WRITE(*,'(a2,i5,a3,i5,a2,a30,f8.3,a2,i7,a2,i5,a10,i3,a10,i5,a7)') &
|
||||
'( ', (num-startnum+1), ' / ', (endnum-startnum+1), ' )', &
|
||||
' time / NCYC / fullsavenum = ', tnow, ' /', ncyc, ' /', num &
|
||||
WRITE(*,'(i1,a2,i5,a3,i5,a2,a30,f8.3,a2,i7,a2,i5,a10,i3,a10,i5,a7)') &
|
||||
ipass, '( ', (num-startnum+1), ' / ', (endnum-startnum+1), ' )', &
|
||||
' time / NCYC / fullsavenum = ', tnow, ' /', ncyc, ' /', num, &
|
||||
'process ', myid, ' processed ', nprogress, ' files'
|
||||
|
||||
num_=num
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue